Detect comments after variable values

Author: electrikmilk

parser.go

@@ -188,6 +188,8 @@ func parse() {
 	switch {
 	case char == ' ' || char == '\t' || char == '\n':
 		advance()
+	case isChar('/'):
+		collectComment()
 	case tokenAhead(Question):
 		collectQuestion()
 	case tokenAhead(Definition):
@@ -199,8 +201,6 @@ func parse() {
 	case tokenAhead(Constant):
 		advance()
 		collectVariable(true)
-	case isChar('/'):
-		collectComment()
 	case tokenAhead(Repeat):
 		collectRepeat()
 	case tokenAhead(RepeatWithEach):
@@ -293,18 +293,21 @@ func lookAheadUntil(until rune) string {
 
 func collectVariableValue(constant bool, valueType *tokenType, value *any) {
 	collectValue(valueType, value, '\n')
-
-	var aheadOfValue = lookAheadUntil('\n')
-	if containsExpressionTokens(aheadOfValue) {
-		collectExpression(valueType, value)
-		return
-	}
 	if constant && (*valueType == Arr || *valueType == Variable) {
 		parserError(fmt.Sprintf("Type %v values cannot be constants.", *valueType))
 	}
 	if *valueType == Question {
 		parserError(fmt.Sprintf("Illegal reference to import question '%s'. Shortcuts does not support import questions as variable values.", *value))
 	}
+
+	var aheadOfValue = lookAheadUntil('\n')
+	if strings.Contains(aheadOfValue, "//") || strings.Contains(aheadOfValue, "/*") {
+		return
+	}
+	if containsExpressionTokens(aheadOfValue) {
+		collectExpression(valueType, value)
+		return
+	}
 }
 
 func collectExpression(valueType *tokenType, value *any) {