fix comment inside interpolation

RelationalAI · Dec 22, 2023 · 1b6ee40 · 1b6ee40
1 parent 57a5064
commit 1b6ee40
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 13 deletions.
diff --git a/dist/index.cjs b/dist/index.cjs
diff --git a/dist/index.js b/dist/index.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@relationalai/codemirror-lang-rel",
- "version": "0.3.1",
+ "version": "0.3.2",
  "description": "CodeMirror 6 language support for Rel",
  "scripts": {
  "test": "mocha test/test.js",

diff --git a/src/parser.js b/src/parser.js
diff --git a/src/syntax.grammar b/src/syntax.grammar
@@ -500,8 +500,8 @@ formalsParen { "(" Formals? ")" }
  LineComment { "//" ![\n]* }
  BlockComment { "/*" ( ![*] | "*"+ ![/*] )* "*"+ "/" }
 
- @precedence { spaces newLine BlockComment LineComment DocstringLiteral staticStringPart }
- @precedence { spaces newLine BlockComment LineComment MultilineDocstringLiteral staticMultilineStringPart }
+ @precedence { spaces newLine staticStringPart BlockComment LineComment DocstringLiteral }
+ @precedence { spaces newLine staticMultilineStringPart BlockComment LineComment MultilineDocstringLiteral }
  @precedence { DateTimeLiteral DateLiteral FloatLiteral IntLiteral }
  @precedence { BooleanLiteral BasicId }
  @precedence { ConstructorId Operator }

diff --git a/test/Expressions.test.txt b/test/Expressions.test.txt
@@ -29,9 +29,14 @@ Rel(
 
 # Interpolation
 def output = """
+ // A single comment
+ /***
+ A block comment
+ ***/
  %(
  string_join["\n", {
  """
+ // Comment in a string
  def n[x] = %(
  x + 1
  )

diff --git a/test/Literals.test.txt b/test/Literals.test.txt
@@ -46,7 +46,7 @@ Rel(
 
 def a = "A string with \"double\" and 'single' quotes"
 def b = """A Multi-line string
-New line
+New line // with a comment in a string
 """
 def c = 'A'
 def d = raw"""""""

diff --git a/test/Prelude.test.txt b/test/Prelude.test.txt
@@ -23,7 +23,7 @@ Rel(
 # DocStrings
 
 
-doc"A single-line docstring"
+doc"A single-line docstring // with a comment"
 def a = 1
 
 doc"""