Merge pull request #322 from julia-vscode/sp/fix-string-type-interpolation

fix bare interpolation of "type" in strings

Author: pfitzseb

.github/workflows/jlpkgbutler-ci-master-workflow.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        julia-version: ['1.0', '1.1', '1.2', '1.3', '1.4', '1.5', '1.6']
+        julia-version: ['1.0', '1.1', '1.2', '1.3', '1.4', '1.5', '1.6', '1.7']
         julia-arch: [x64, x86]
         os: [ubuntu-latest, windows-latest, macOS-latest]
         exclude:
@@ -37,4 +37,3 @@ jobs:
           name: codecov-umbrella
           fail_ci_if_error: false
           token: ${{ secrets.CODECOV_TOKEN }}
-                    

.github/workflows/jlpkgbutler-ci-pr-workflow.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        julia-version: ['1.0', '1.1', '1.2', '1.3', '1.4', '1.5', '1.6']
+        julia-version: ['1.0', '1.1', '1.2', '1.3', '1.4', '1.5', '1.6', '1.7']
         julia-arch: [x64, x86]
         os: [ubuntu-latest, windows-latest, macOS-latest]
         exclude:

.github/workflows/jlpkgbutler-codeformat-pr-workflow.yml

@@ -189,7 +189,9 @@ function parse_string_or_cmd(ps::ParseState, prefixed=false)
                     if kindof(ps1.t) === Tokens.WHITESPACE
                         error("Unexpected whitespace after \$ in String")
                     else
-                        t = INSTANCE(ps1)
+                        # foo in $foo is always parsed as an identifier by Julia,
+                        # no matter whether it actually is a keyword
+                        t = EXPR(:IDENTIFIER, ps1)
                     end
                     # Attribute trailing whitespace to the string
                     t = adjustspan(t)

src/components/strings.jl

@@ -1335,4 +1335,12 @@ end
     @testset "#311" begin
         @test test_expr(raw"import a.$b.c")
     end
+
+    @testset "kw interpolation" begin
+        @test test_expr(raw""""foo $bar" """)
+        @test test_expr(raw""""foo $type" """)
+        @test test_expr(raw""""foo $function" """)
+        @test test_expr(raw""""foo $begin" """)
+        @test test_expr(raw""""foo $quote" """)
+    end
 end