From 98660d19e8bd43f21ab36eabe2b8c230bc933338 Mon Sep 17 00:00:00 2001 From: Ryan Vandersmith Date: Tue, 6 Jan 2026 20:51:08 +0000 Subject: [PATCH 1/5] Run 'script/add-grammar --replace vscode-motoko https://github.com/caffeinelabs/vscode-motoko' --- .gitmodules | 2 +- grammars.yml | 2 -- vendor/README.md | 3 +-- vendor/grammars/vscode-motoko | 2 +- vendor/licenses/git_submodule/ArkTS.dep.yml | 10 ---------- vendor/licenses/git_submodule/vscode-motoko.dep.yml | 4 ++-- 6 files changed, 5 insertions(+), 18 deletions(-) delete mode 100644 vendor/licenses/git_submodule/ArkTS.dep.yml diff --git a/.gitmodules b/.gitmodules index f2c90a1cad..fdb1da5b1f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1430,7 +1430,7 @@ url = https://github.com/ghisguth/vscode-monkey-c [submodule "vendor/grammars/vscode-motoko"] path = vendor/grammars/vscode-motoko - url = https://github.com/dfinity/vscode-motoko.git + url = https://github.com/caffeinelabs/vscode-motoko.git [submodule "vendor/grammars/vscode-move-syntax"] path = vendor/grammars/vscode-move-syntax url = https://github.com/damirka/vscode-move-syntax.git diff --git a/grammars.yml b/grammars.yml index 9da8a9b6a2..bde776dfca 100644 --- a/grammars.yml +++ b/grammars.yml @@ -4,8 +4,6 @@ vendor/grammars/AL: - source.al vendor/grammars/Alloy.tmbundle: - source.alloy -vendor/grammars/ArkTS: -- source.ets vendor/grammars/Assembly-Syntax-Definition: - source.x86 vendor/grammars/Atom-PostScript: diff --git a/vendor/README.md b/vendor/README.md index a0ceb6b4e5..d08b07cdfb 100644 --- a/vendor/README.md +++ b/vendor/README.md @@ -40,7 +40,6 @@ This is a list of grammars that Linguist selects to provide syntax highlighting - **Apex:** [forcedotcom/apex-tmLanguage](https://github.com/forcedotcom/apex-tmLanguage) - **Apollo Guidance Computer:** [Alhadis/language-agc](https://github.com/Alhadis/language-agc) - **AppleScript:** [textmate/applescript.tmbundle](https://github.com/textmate/applescript.tmbundle) -- **ArkTS:** [ohosvscode/arkTS](https://github.com/ohosvscode/arkTS) - **AsciiDoc:** [zuckschwerdt/asciidoc.tmbundle](https://github.com/zuckschwerdt/asciidoc.tmbundle) - **AspectJ:** [pchaigno/sublime-aspectj](https://github.com/pchaigno/sublime-aspectj) - **Assembly:** [Nessphoro/sublimeassembly](https://github.com/Nessphoro/sublimeassembly) @@ -389,7 +388,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting - **Monkey C:** [ghisguth/vscode-monkey-c](https://github.com/ghisguth/vscode-monkey-c) - **MoonBit:** [moonbitlang/moonbit-tmLanguage](https://github.com/moonbitlang/moonbit-tmLanguage) - **MoonScript:** [leafo/moonscript-tmbundle](https://github.com/leafo/moonscript-tmbundle) -- **Motoko:** [dfinity/vscode-motoko](https://github.com/dfinity/vscode-motoko) +- **Motoko:** [caffeinelabs/vscode-motoko](https://github.com/caffeinelabs/vscode-motoko) - **Motorola 68K Assembly:** [zerkman/language-m68k](https://github.com/zerkman/language-m68k) - **Move:** [damirka/vscode-move-syntax](https://github.com/damirka/vscode-move-syntax) - **Muse:** [Alhadis/language-emacs-lisp](https://github.com/Alhadis/language-emacs-lisp) diff --git a/vendor/grammars/vscode-motoko b/vendor/grammars/vscode-motoko index ac7ccd6bea..d3d182763c 160000 --- a/vendor/grammars/vscode-motoko +++ b/vendor/grammars/vscode-motoko @@ -1 +1 @@ -Subproject commit ac7ccd6bea4914d11921cd40a7f3dad41f7c9c80 +Subproject commit d3d182763cadfd212ccba98306b0ad661c56a7a6 diff --git a/vendor/licenses/git_submodule/ArkTS.dep.yml b/vendor/licenses/git_submodule/ArkTS.dep.yml deleted file mode 100644 index 831f8da602..0000000000 --- a/vendor/licenses/git_submodule/ArkTS.dep.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -name: ArkTS -version: 107a21c78819540405549c9e65d9447d313c165a -type: git_submodule -homepage: https://github.com/ohosvscode/arkTS -license: mit -licenses: -- sources: LICENSE - text: "MIT License\n\nCopyright (c) 2025 Naily Zero\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE." -notices: [] diff --git a/vendor/licenses/git_submodule/vscode-motoko.dep.yml b/vendor/licenses/git_submodule/vscode-motoko.dep.yml index 5726819471..7374c604d4 100644 --- a/vendor/licenses/git_submodule/vscode-motoko.dep.yml +++ b/vendor/licenses/git_submodule/vscode-motoko.dep.yml @@ -1,8 +1,8 @@ --- name: vscode-motoko -version: ac7ccd6bea4914d11921cd40a7f3dad41f7c9c80 +version: d3d182763cadfd212ccba98306b0ad661c56a7a6 type: git_submodule -homepage: https://github.com/dfinity/vscode-motoko.git +homepage: https://github.com/caffeinelabs/vscode-motoko.git license: apache-2.0 licenses: - sources: LICENSE From 7f4010573a15391b168a33e38e601ea7007e2934 Mon Sep 17 00:00:00 2001 From: Ryan Vandersmith Date: Wed, 7 Jan 2026 14:00:26 +0000 Subject: [PATCH 2/5] Run 'script/add-grammar --replace vscode-motoko https://github.com/caffeinelabs/vscode-motoko' --- .gitmodules | 2 +- vendor/README.md | 3 +-- vendor/grammars/vscode-motoko | 2 +- vendor/licenses/git_submodule/vscode-motoko.dep.yml | 4 ++-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index f2c90a1cad..fdb1da5b1f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1430,7 +1430,7 @@ url = https://github.com/ghisguth/vscode-monkey-c [submodule "vendor/grammars/vscode-motoko"] path = vendor/grammars/vscode-motoko - url = https://github.com/dfinity/vscode-motoko.git + url = https://github.com/caffeinelabs/vscode-motoko.git [submodule "vendor/grammars/vscode-move-syntax"] path = vendor/grammars/vscode-move-syntax url = https://github.com/damirka/vscode-move-syntax.git diff --git a/vendor/README.md b/vendor/README.md index a0ceb6b4e5..d08b07cdfb 100644 --- a/vendor/README.md +++ b/vendor/README.md @@ -40,7 +40,6 @@ This is a list of grammars that Linguist selects to provide syntax highlighting - **Apex:** [forcedotcom/apex-tmLanguage](https://github.com/forcedotcom/apex-tmLanguage) - **Apollo Guidance Computer:** [Alhadis/language-agc](https://github.com/Alhadis/language-agc) - **AppleScript:** [textmate/applescript.tmbundle](https://github.com/textmate/applescript.tmbundle) -- **ArkTS:** [ohosvscode/arkTS](https://github.com/ohosvscode/arkTS) - **AsciiDoc:** [zuckschwerdt/asciidoc.tmbundle](https://github.com/zuckschwerdt/asciidoc.tmbundle) - **AspectJ:** [pchaigno/sublime-aspectj](https://github.com/pchaigno/sublime-aspectj) - **Assembly:** [Nessphoro/sublimeassembly](https://github.com/Nessphoro/sublimeassembly) @@ -389,7 +388,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting - **Monkey C:** [ghisguth/vscode-monkey-c](https://github.com/ghisguth/vscode-monkey-c) - **MoonBit:** [moonbitlang/moonbit-tmLanguage](https://github.com/moonbitlang/moonbit-tmLanguage) - **MoonScript:** [leafo/moonscript-tmbundle](https://github.com/leafo/moonscript-tmbundle) -- **Motoko:** [dfinity/vscode-motoko](https://github.com/dfinity/vscode-motoko) +- **Motoko:** [caffeinelabs/vscode-motoko](https://github.com/caffeinelabs/vscode-motoko) - **Motorola 68K Assembly:** [zerkman/language-m68k](https://github.com/zerkman/language-m68k) - **Move:** [damirka/vscode-move-syntax](https://github.com/damirka/vscode-move-syntax) - **Muse:** [Alhadis/language-emacs-lisp](https://github.com/Alhadis/language-emacs-lisp) diff --git a/vendor/grammars/vscode-motoko b/vendor/grammars/vscode-motoko index ac7ccd6bea..d3d182763c 160000 --- a/vendor/grammars/vscode-motoko +++ b/vendor/grammars/vscode-motoko @@ -1 +1 @@ -Subproject commit ac7ccd6bea4914d11921cd40a7f3dad41f7c9c80 +Subproject commit d3d182763cadfd212ccba98306b0ad661c56a7a6 diff --git a/vendor/licenses/git_submodule/vscode-motoko.dep.yml b/vendor/licenses/git_submodule/vscode-motoko.dep.yml index 5726819471..7374c604d4 100644 --- a/vendor/licenses/git_submodule/vscode-motoko.dep.yml +++ b/vendor/licenses/git_submodule/vscode-motoko.dep.yml @@ -1,8 +1,8 @@ --- name: vscode-motoko -version: ac7ccd6bea4914d11921cd40a7f3dad41f7c9c80 +version: d3d182763cadfd212ccba98306b0ad661c56a7a6 type: git_submodule -homepage: https://github.com/dfinity/vscode-motoko.git +homepage: https://github.com/caffeinelabs/vscode-motoko.git license: apache-2.0 licenses: - sources: LICENSE From f78e286aed874c04084eb091c28ba8d4ab17cbb4 Mon Sep 17 00:00:00 2001 From: rvanasa Date: Wed, 7 Jan 2026 09:07:10 -0500 Subject: [PATCH 3/5] Revert --- grammars.yml | 2 ++ vendor/README.md | 1 + 2 files changed, 3 insertions(+) diff --git a/grammars.yml b/grammars.yml index 47b51e34dd..ab48c83f3a 100644 --- a/grammars.yml +++ b/grammars.yml @@ -4,6 +4,8 @@ vendor/grammars/AL: - source.al vendor/grammars/Alloy.tmbundle: - source.alloy +vendor/grammars/ArkTS: +- source.ets vendor/grammars/Assembly-Syntax-Definition: - source.x86 vendor/grammars/Atom-PostScript: diff --git a/vendor/README.md b/vendor/README.md index 96977d6e44..668f8ca363 100644 --- a/vendor/README.md +++ b/vendor/README.md @@ -39,6 +39,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting - **ApacheConf:** [mrmlnc/vscode-apache](https://github.com/mrmlnc/vscode-apache) - **Apex:** [forcedotcom/apex-tmLanguage](https://github.com/forcedotcom/apex-tmLanguage) - **Apollo Guidance Computer:** [Alhadis/language-agc](https://github.com/Alhadis/language-agc) +- **ArkTS:** [ohosvscode/arkTS](https://github.com/ohosvscode/arkTS) - **AppleScript:** [textmate/applescript.tmbundle](https://github.com/textmate/applescript.tmbundle) - **AsciiDoc:** [zuckschwerdt/asciidoc.tmbundle](https://github.com/zuckschwerdt/asciidoc.tmbundle) - **AspectJ:** [pchaigno/sublime-aspectj](https://github.com/pchaigno/sublime-aspectj) From 5dee42f4508de8f54f11e87f6e8459d7e17fddf3 Mon Sep 17 00:00:00 2001 From: rvanasa Date: Wed, 7 Jan 2026 09:07:32 -0500 Subject: [PATCH 4/5] Fix --- vendor/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/README.md b/vendor/README.md index 668f8ca363..ccc1ab0d45 100644 --- a/vendor/README.md +++ b/vendor/README.md @@ -39,8 +39,8 @@ This is a list of grammars that Linguist selects to provide syntax highlighting - **ApacheConf:** [mrmlnc/vscode-apache](https://github.com/mrmlnc/vscode-apache) - **Apex:** [forcedotcom/apex-tmLanguage](https://github.com/forcedotcom/apex-tmLanguage) - **Apollo Guidance Computer:** [Alhadis/language-agc](https://github.com/Alhadis/language-agc) -- **ArkTS:** [ohosvscode/arkTS](https://github.com/ohosvscode/arkTS) - **AppleScript:** [textmate/applescript.tmbundle](https://github.com/textmate/applescript.tmbundle) +- **ArkTS:** [ohosvscode/arkTS](https://github.com/ohosvscode/arkTS) - **AsciiDoc:** [zuckschwerdt/asciidoc.tmbundle](https://github.com/zuckschwerdt/asciidoc.tmbundle) - **AspectJ:** [pchaigno/sublime-aspectj](https://github.com/pchaigno/sublime-aspectj) - **Assembly:** [Nessphoro/sublimeassembly](https://github.com/Nessphoro/sublimeassembly) From d576b703f0cfc2fa51603c6c3304329ee9d49fdf Mon Sep 17 00:00:00 2001 From: rvanasa Date: Wed, 7 Jan 2026 09:08:21 -0500 Subject: [PATCH 5/5] Revert dep.yml file --- vendor/licenses/git_submodule/ArkTS.dep.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 vendor/licenses/git_submodule/ArkTS.dep.yml diff --git a/vendor/licenses/git_submodule/ArkTS.dep.yml b/vendor/licenses/git_submodule/ArkTS.dep.yml new file mode 100644 index 0000000000..831f8da602 --- /dev/null +++ b/vendor/licenses/git_submodule/ArkTS.dep.yml @@ -0,0 +1,10 @@ +--- +name: ArkTS +version: 107a21c78819540405549c9e65d9447d313c165a +type: git_submodule +homepage: https://github.com/ohosvscode/arkTS +license: mit +licenses: +- sources: LICENSE + text: "MIT License\n\nCopyright (c) 2025 Naily Zero\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE." +notices: []