Merge pull request #111 from jesslin02/merge-main

Compatibility with Linguist
lf-lang · May 16, 2023 · fac5d5d · fac5d5d
2 parents 7b422a5 + 1941acf
commit fac5d5d
Show file tree

Hide file tree

Showing 821 changed files with 4,463 additions and 5,010 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -50,7 +50,7 @@
             {
                 "language": "lflang",
                 "scopeName": "source.lf",
-                "path": "./syntax/lflang.tmLanguage.json",
+                "path": "./syntaxes/lflang.tmLanguage.json",
                 "embeddedLanguages": {
                     "meta.embedded.block.c": "c",
                     "meta.embedded.block.cpp": "cpp",
@@ -151,7 +151,7 @@
         "rimraf": "^4.1.2",
         "simple-git": "^3.16.1",
         "ts-node": "^10.9.1",
-        "typescript": "^4.6.5",
+        "typescript": "^4.9.5",
         "url-exist": "^3.0.1",
         "vscode-oniguruma": "^1.7.0",
         "vscode-textmate": "^9.0.0",

diff --git a/src/test/check_highlighting.test.ts b/src/test/check_highlighting.test.ts
@@ -24,7 +24,7 @@ const registry = new vsctm.Registry({
     onigLib: vscodeOnigurumaLib,
     loadGrammar: async (_: string) => {
         const grammarFile = path.join(
-          root, "syntax", "lflang.tmLanguage.json"
+          root, "syntaxes", "lflang.tmLanguage.json"
         )
         const data: any = fs.readFileSync(grammarFile)
         return vsctm.parseRawGrammar(data.toString(), grammarFile)

diff --git a/syntax/lflang.tmLanguage.json → syntaxes/lflang.tmLanguage.json b/syntax/lflang.tmLanguage.json → syntaxes/lflang.tmLanguage.json
@@ -43,6 +43,9 @@
                 },
                 {
                     "include": "#context-insensitive"
+                },
+                {
+                    "include": "#type"
                 }
             ]
         },
@@ -75,9 +78,6 @@
                 {
                     "include": "#timer"
                 },
-                {
-                    "include": "#type"
-                },
                 {
                     "include": "#number"
                 },
@@ -118,10 +118,22 @@
         },
         "c-target": {
             "begin": "(?=\\btarget\\s+C\\b)",
+            "patterns": [{
+                "include": "#c-or-cpp-target"
+            }]
+        },
+        "cpp-target": {
+            "begin": "(?=\\btarget\\s+C?Cpp\\b)",
+            "patterns": [{
+                "include": "#c-or-cpp-target"
+            }]
+        },
+        "c-or-cpp-target": {
             "patterns": [
                 {
-                    "begin": "(?<=(input|output|action|state).*:)",
-                    "end": "[\\(;\\n]",
+                    "begin": "(?<=(input|state))\\s+\\w+\\s*:",
+                    "end": "[\\(;\\n]|(?=\\{=)",
+                    "name": "meta.embedded.block.cpp",
                     "patterns": [
                         {
                             "include": "source.cpp"
@@ -132,24 +144,9 @@
                     ]
                 },
                 {
-                    "include": "#post-targetspec"
-                },
-                {
-                    "begin": "\\{=(?!=\\})",
-                    "end": "([<>]?[<>+\\-*/%&\\^|]?=\\})",
-                    "name": "meta.embedded.block.c",
-                    "patterns": [{
-                        "include": "source.cpp"
-                    }]
-                }
-            ]
-        },
-        "cpp-target": {
-            "begin": "(?=\\btarget\\s+C?Cpp\\b)",
-            "patterns": [
-                {
-                    "begin": "(?<=(input|output|action|state).*:)",
-                    "end": "[\\(;\\n]",
+                    "begin": "(?<=(output|action))\\s+\\w+\\s*:",
+                    "end": "[\\(;\\n]|(?=\\{=)",
+                    "name": "meta.embedded.block.cpp",
                     "patterns": [
                         {
                             "include": "source.cpp"
@@ -163,8 +160,8 @@
                     "include": "#post-targetspec"
                 },
                 {
-                    "begin": "\\{=(?!=\\})",
-                    "end": "([<>]?[<>+\\-*/%&\\^|]?=\\})",
+                    "begin": "\\{=",
+                    "end": "(([<>]?[<>+\\-*/%&\\^|]?=\\}))",
                     "name": "meta.embedded.block.cpp",
                     "patterns": [{
                         "include": "source.cpp"
@@ -217,10 +214,6 @@
         "rs-target": {
             "begin": "(?=\\btarget\\s+Rust\\b)",
             "patterns": [
-                {
-                    "name": "entity.name.type.lflang",
-                    "match": "(?<=(input|output|action|state).*:(\\s*))(\\b(\\w+)\\b)"
-                },
                 {
                     "include": "#post-targetspec"
                 },
@@ -237,7 +230,7 @@
         "target-specification": {
             "name": "meta.targetspec.lflang",
             "begin": "(?=\\btarget\\b)",
-            "end": ";|(?<=}.*)$|(?<=target[^\\{]*)$",
+            "end": "(?<=;)\\s*$|(?<=})\\s*$|(?<=Python)\\s*$|(?<=(CCpp|Rust))\\s*$|(?<=C)\\s*$|(?<=Cpp)\\s*$|(?<=TypeScript)\\s*$",
             "patterns": [
                 {
                     "include": "#context-insensitive"
@@ -252,17 +245,20 @@
                 },
                 {
                     "name": "variable.parameter.lflang",
-                    "match": "(?<=(^|,|\\{)(\\s)*)\\b([\\w\\-]+)\\b(?=(\\s)*:)"
+                    "match": "(^|(?<=(,|\\{)))\\s*\\b([\\w\\-]+)\\b(?=\\s*:)"
                 }
             ]
         },
         "import-statement": {
             "begin": "(?=^\\s*import\\b)",
-            "end": ";|(?<=}.*)$|(?<=import[^\\{]*)$",
+            "end": ";|(?<=\")\\s*$",
             "patterns": [
                 {
                     "include": "#context-insensitive"
                 },
+                {
+                    "include": "#type"
+                },
                 {
                     "name": "keyword.control.import.lflang",
                     "match": "\\b(import)\\b|\\b(as)\\b|\\b(from)\\b"
@@ -301,7 +297,7 @@
                 },
                 {
                     "name": "entity.name.type.lflang",
-                    "match": "(?<=\\breactor\\b\\s*)(?!at)(?!extends)(\\w+)\\b"
+                    "match": "(?<=\\breactor\\b\\s)\\s*(?!at)(?!extends)(\\w+)\\b"
                 }
             ]
         },
@@ -325,7 +321,7 @@
                 },
                 {
                     "name": "entity.name.function.member.lflang",
-                    "match": "(?<=\\bmethod\\b\\s+)\\w+\\b"
+                    "match": "(?<=\\bmethod\\b)\\s+(\\w+)\\b"
                 }
             ]
         },
@@ -381,11 +377,11 @@
             "patterns": [
                 {
                     "name": "entity.name.type.lflang",
-                    "match": "(?<=(input|output|action|state).*:(\\s*))(\\b([A-Z]\\w*)\\b)"
+                    "match": "(?<=:)\\s*(\\b([A-Z]\\w*)\\b)"
                 },
                 {
                     "name": "storage.type.lflang",
-                    "match": "(?<=(input|output|action|state).*:(\\s*))(\\b(\\w+)\\b)"
+                    "match": "(?<=:)\\s*(\\b(\\w+)\\b)"
                 }
             ]
         },
@@ -422,15 +418,15 @@
                 {
                     "name": "string.quoted.double.lflang",
                     "begin": "\"",
-                    "end": "(?<=(\\\\.|[^\"\\\\])*)(\"|$)",
+                    "end": "(\"|$)",
                     "patterns": [{
                         "include": "#string-helper"
                     }]
                 },
                 {
                     "name": "string.quoted.single.lflang",
                     "begin": "'",
-                    "end": "(?<=(\\\\.|[^'\\\\])*)('|$)",
+                    "end": "('|$)",
                     "patterns": [{
                         "include": "#string-helper"
                     }]
@@ -477,7 +473,7 @@
                 },
                 {
                     "name": "entity.name.type.lflang",
-                    "match": "(?<=\\s*=\\s*new\\s*(\\[[^\\]]*\\])?\\s+)\\w+\\b"
+                    "match": "(?<=new\\s)\\s*(\\[[^\\]]*\\])?\\s*(\\w+)\\b"
                 }
             ]
         },
@@ -493,7 +489,7 @@
                 },
                 {
                     "name": "variable.other.lflang",
-                    "match": "(?<=\\w+((\\.)|(::)))(\\b\\w+\\b)"
+                    "match": "(?<=((\\w\\.)|(::)))(\\b\\w+\\b)"
                 }
             ]
         },

diff --git a/test/known-good/C/src/ActionDelay.txt b/test/known-good/C/src/ActionDelay.txt
@@ -2,9 +2,9 @@
 <span class="source-lf meta-targetspec-lflang keyword-control-lflang">target</span><span class="source-lf meta-targetspec-lflang"> </span><span class="source-lf meta-targetspec-lflang constant-language-lflang">C</span>
 <span class="source-lf"></span>
 <span class="source-lf storage-modifier-lflang">reactor</span><span class="source-lf"> </span><span class="source-lf entity-name-type-lflang">GeneratedDelay</span><span class="source-lf"> {</span>
-<span class="source-lf">    </span><span class="source-lf storage-modifier-lflang">input</span><span class="source-lf"> y_in:</span><span class="source-lf"> </span><span class="source-lf storage-type-lflang">int</span>
-<span class="source-lf">    </span><span class="source-lf storage-modifier-lflang">output</span><span class="source-lf"> y_out:</span><span class="source-lf"> </span><span class="source-lf storage-type-lflang">int</span>
-<span class="source-lf">    </span><span class="source-lf storage-modifier-lflang">state</span><span class="source-lf"> y_state:</span><span class="source-lf"> </span><span class="source-lf storage-type-lflang">int</span><span class="source-lf">(</span><span class="source-lf constant-numeric-int-lflang">0</span><span class="source-lf">)</span>
+<span class="source-lf">    </span><span class="source-lf storage-modifier-lflang">input</span><span class="source-lf meta-embedded-block-cpp"> y_in:</span><span class="source-lf meta-embedded-block-cpp storage-type-lflang"> int</span>
+<span class="source-lf">    </span><span class="source-lf storage-modifier-lflang">output</span><span class="source-lf meta-embedded-block-cpp"> y_out:</span><span class="source-lf meta-embedded-block-cpp storage-type-lflang"> int</span>
+<span class="source-lf">    </span><span class="source-lf storage-modifier-lflang">state</span><span class="source-lf meta-embedded-block-cpp"> y_state:</span><span class="source-lf meta-embedded-block-cpp storage-type-lflang"> int</span><span class="source-lf meta-embedded-block-cpp">(</span><span class="source-lf constant-numeric-int-lflang">0</span><span class="source-lf">)</span>
 <span class="source-lf">    </span><span class="source-lf storage-modifier-lflang">logical</span><span class="source-lf"> </span><span class="source-lf storage-modifier-lflang">action</span><span class="source-lf"> act(</span><span class="source-lf constant-numeric-int-lflang">100</span><span class="source-lf"> </span><span class="source-lf constant-numeric-lflang">msec</span><span class="source-lf">)</span>
 <span class="source-lf"></span>
 <span class="source-lf">    </span><span class="source-lf keyword-control-lflang">reaction</span><span class="source-lf">(y_in) </span><span class="source-lf keyword-operator-lflang">-></span><span class="source-lf"> act {</span><span class="source-lf keyword-operator-lflang">=</span>
@@ -16,13 +16,13 @@
 <span class="source-lf">}</span>
 <span class="source-lf"></span>
 <span class="source-lf storage-modifier-lflang">reactor</span><span class="source-lf"> </span><span class="source-lf entity-name-type-lflang">Source</span><span class="source-lf"> {</span>
-<span class="source-lf">    </span><span class="source-lf storage-modifier-lflang">output</span><span class="source-lf"> out:</span><span class="source-lf"> </span><span class="source-lf storage-type-lflang">int</span>
+<span class="source-lf">    </span><span class="source-lf storage-modifier-lflang">output</span><span class="source-lf meta-embedded-block-cpp"> out:</span><span class="source-lf meta-embedded-block-cpp storage-type-lflang"> int</span>
 <span class="source-lf"></span>
 <span class="source-lf">    </span><span class="source-lf keyword-control-lflang">reaction</span><span class="source-lf">(</span><span class="source-lf support-variable-lflang">startup</span><span class="source-lf">) </span><span class="source-lf keyword-operator-lflang">-></span><span class="source-lf"> out {</span><span class="source-lf keyword-operator-lflang">=</span><span class="source-lf"> lf_set(out, </span><span class="source-lf constant-numeric-int-lflang">1</span><span class="source-lf">); </span><span class="source-lf keyword-operator-lflang">=</span><span class="source-lf">}</span>
 <span class="source-lf">}</span>
 <span class="source-lf"></span>
 <span class="source-lf storage-modifier-lflang">reactor</span><span class="source-lf"> </span><span class="source-lf entity-name-type-lflang">Sink</span><span class="source-lf"> {</span>
-<span class="source-lf">    </span><span class="source-lf storage-modifier-lflang">input</span><span class="source-lf"> in:</span><span class="source-lf"> </span><span class="source-lf storage-type-lflang">int</span>
+<span class="source-lf">    </span><span class="source-lf storage-modifier-lflang">input</span><span class="source-lf meta-embedded-block-cpp"> in:</span><span class="source-lf meta-embedded-block-cpp storage-type-lflang"> int</span>
 <span class="source-lf"></span>
 <span class="source-lf">    </span><span class="source-lf keyword-control-lflang">reaction</span><span class="source-lf">(in) {</span><span class="source-lf keyword-operator-lflang">=</span>
 <span class="source-lf">        interval_t elapsed_logical </span><span class="source-lf keyword-operator-lflang">=</span><span class="source-lf"> lf_time_logical_elapsed();</span>

diff --git a/test/known-good/C/src/ActionIsPresent.txt b/test/known-good/C/src/ActionIsPresent.txt
@@ -1,9 +1,9 @@
 <span class="source-lf comment-line-double-dash-lflang">// Tests the is_present variable for actions.</span>
 <span class="source-lf meta-targetspec-lflang keyword-control-lflang">target</span><span class="source-lf meta-targetspec-lflang"> </span><span class="source-lf meta-targetspec-lflang constant-language-lflang">C</span>
 <span class="source-lf"></span>
-<span class="source-lf storage-modifier-lflang">main</span><span class="source-lf"> </span><span class="source-lf storage-modifier-lflang">reactor</span><span class="source-lf"> </span><span class="source-lf entity-name-type-lflang">ActionIsPresent</span><span class="source-lf">(offset: </span><span class="source-lf storage-type-lflang">time</span><span class="source-lf">(</span><span class="source-lf constant-numeric-int-lflang">1</span><span class="source-lf"> </span><span class="source-lf constant-numeric-lflang">nsec</span><span class="source-lf">), period: </span><span class="source-lf storage-type-lflang">time</span><span class="source-lf">(</span><span class="source-lf constant-numeric-int-lflang">500</span><span class="source-lf"> </span><span class="source-lf constant-numeric-lflang">msec</span><span class="source-lf">)) {</span>
+<span class="source-lf storage-modifier-lflang">main</span><span class="source-lf"> </span><span class="source-lf storage-modifier-lflang">reactor</span><span class="source-lf"> </span><span class="source-lf entity-name-type-lflang">ActionIsPresent</span><span class="source-lf">(offset:</span><span class="source-lf storage-type-lflang"> time</span><span class="source-lf">(</span><span class="source-lf constant-numeric-int-lflang">1</span><span class="source-lf"> </span><span class="source-lf constant-numeric-lflang">nsec</span><span class="source-lf">), period:</span><span class="source-lf storage-type-lflang"> time</span><span class="source-lf">(</span><span class="source-lf constant-numeric-int-lflang">500</span><span class="source-lf"> </span><span class="source-lf constant-numeric-lflang">msec</span><span class="source-lf">)) {</span>
 <span class="source-lf">    </span><span class="source-lf storage-modifier-lflang">logical</span><span class="source-lf"> </span><span class="source-lf storage-modifier-lflang">action</span><span class="source-lf"> a</span>
-<span class="source-lf">    </span><span class="source-lf storage-modifier-lflang">state</span><span class="source-lf"> success:</span><span class="source-lf"> </span><span class="source-lf storage-type-lflang">bool</span><span class="source-lf">(</span><span class="source-lf constant-language-lflang">false</span><span class="source-lf">)</span>
+<span class="source-lf">    </span><span class="source-lf storage-modifier-lflang">state</span><span class="source-lf meta-embedded-block-cpp"> success:</span><span class="source-lf meta-embedded-block-cpp storage-type-lflang"> bool</span><span class="source-lf meta-embedded-block-cpp">(</span><span class="source-lf constant-language-lflang">false</span><span class="source-lf">)</span>
 <span class="source-lf"></span>
 <span class="source-lf">    </span><span class="source-lf keyword-control-lflang">reaction</span><span class="source-lf">(</span><span class="source-lf support-variable-lflang">startup</span><span class="source-lf">, a) </span><span class="source-lf keyword-operator-lflang">-></span><span class="source-lf"> a {</span><span class="source-lf keyword-operator-lflang">=</span>
 <span class="source-lf">        if (!a</span><span class="source-lf keyword-operator-lflang">-></span><span class="source-lf">is_present) {</span>