Merge branch 'master' into master

.gitmodules

@@ -323,9 +323,6 @@
 [submodule "vendor/grammars/atom-salt"]
 	path = vendor/grammars/atom-salt
 	url = https://github.com/saltstack/atom-salt
-[submodule "vendor/grammars/atomic-dreams"]
-	path = vendor/grammars/atomic-dreams
-	url = https://github.com/PJB3005/atomic-dreams
 [submodule "vendor/grammars/ats"]
 	path = vendor/grammars/ats
 	url = https://github.com/steinwaywhw/ats-mode-sublimetext
@@ -425,6 +422,9 @@
 [submodule "vendor/grammars/diff.tmbundle"]
 	path = vendor/grammars/diff.tmbundle
 	url = https://github.com/textmate/diff.tmbundle
+[submodule "vendor/grammars/dm-syntax"]
+	path = vendor/grammars/dm-syntax
+	url = https://github.com/spacestation13/dm-syntax.git
 [submodule "vendor/grammars/dylan.tmbundle"]
 	path = vendor/grammars/dylan.tmbundle
 	url = https://github.com/textmate/dylan.tmbundle
@@ -1148,9 +1148,9 @@
 [submodule "vendor/grammars/sweave.tmbundle"]
 	path = vendor/grammars/sweave.tmbundle
 	url = https://github.com/textmate/sweave.tmbundle.git
-[submodule "vendor/grammars/swift.tmbundle"]
-	path = vendor/grammars/swift.tmbundle
-	url = https://github.com/textmate/swift.tmbundle
+[submodule "vendor/grammars/swift-tmlanguage"]
+	path = vendor/grammars/swift-tmlanguage
+	url = https://github.com/jtbandes/swift-tmlanguage.git
 [submodule "vendor/grammars/tcl.tmbundle"]
 	path = vendor/grammars/tcl.tmbundle
 	url = https://github.com/textmate/tcl.tmbundle
@@ -1259,7 +1259,7 @@
 	url = https://github.com/noir-lang/vscode-noir.git
 [submodule "vendor/grammars/vscode-opa"]
 	path = vendor/grammars/vscode-opa
-	url = https://github.com/tsandall/vscode-opa
+	url = https://github.com/open-policy-agent/vscode-opa.git
 [submodule "vendor/grammars/vscode-pddl"]
 	path = vendor/grammars/vscode-pddl
 	url = https://github.com/jan-dolejsi/vscode-pddl.git

grammars.yml

@@ -267,9 +267,6 @@ vendor/grammars/atom-miniyaml:
 vendor/grammars/atom-salt:
 - source.python.salt
 - source.yaml.salt
-vendor/grammars/atomic-dreams:
-- source.dm
-- source.dmf
 vendor/grammars/ats:
 - source.ats
 vendor/grammars/avro.tmLanguage:
@@ -345,6 +342,8 @@ vendor/grammars/desktop.tmbundle:
 - source.desktop
 vendor/grammars/diff.tmbundle:
 - source.diff
+vendor/grammars/dm-syntax:
+- source.dm
 vendor/grammars/dylan.tmbundle:
 - source.dylan
 - source.lid
@@ -1030,7 +1029,7 @@ vendor/grammars/sway-vscode-plugin:
 - source.sway
 vendor/grammars/sweave.tmbundle:
 - text.tex.latex.sweave
-vendor/grammars/swift.tmbundle:
+vendor/grammars/swift-tmlanguage:
 - source.swift
 vendor/grammars/tcl.tmbundle:
 - source.tcl

lib/linguist/languages.yml

@@ -1661,7 +1661,7 @@ ECL:
 ECLiPSe:
   type: programming
   color: "#001d9d"
-  group: prolog
+  group: Prolog
   extensions:
   - ".ecl"
   tm_scope: source.prolog.eclipse
@@ -2371,7 +2371,6 @@ Gherkin:
 Git Attributes:
   type: data
   color: "#F44D27"
-  group: INI
   aliases:
   - gitattributes
   filenames:
@@ -2976,7 +2975,6 @@ Idris:
 Ignore List:
   type: data
   color: "#000000"
-  group: INI
   aliases:
   - ignore
   - gitignore
@@ -3170,6 +3168,7 @@ JSON:
   - ".watchmanconfig"
   - Pipfile.lock
   - composer.lock
+  - deno.lock
   - flake.lock
   - mcmod.info
   language_id: 174
@@ -4441,7 +4440,7 @@ Nasal:
   extensions:
   - ".nas"
   tm_scope: source.nasal
-  ace_mode: text
+  ace_mode: nasal
   language_id: 178322513
 Nearley:
   type: programming
@@ -6831,7 +6830,7 @@ Svelte:
   language_id: 928734530
 Sway:
   type: programming
-  color: "#dea584"
+  color: "#00F58C"
   extensions:
   - ".sw"
   tm_scope: source.sway

vendor/README.md

@@ -128,7 +128,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting
 - **D:** [textmate/d.tmbundle](https://github.com/textmate/d.tmbundle)
 - **D-ObjDump:** [nanoant/assembly.tmbundle](https://github.com/nanoant/assembly.tmbundle)
 - **D2:** [terrastruct/d2-vscode](https://github.com/terrastruct/d2-vscode)
-- **DM:** [PJB3005/atomic-dreams](https://github.com/PJB3005/atomic-dreams)
+- **DM:** [spacestation13/dm-syntax](https://github.com/spacestation13/dm-syntax)
 - **DNS Zone:** [sixty4k/st2-zonefile](https://github.com/sixty4k/st2-zonefile)
 - **DTrace:** [textmate/c.tmbundle](https://github.com/textmate/c.tmbundle)
 - **Dafny:** [DafnyVSCode/Dafny-VSCode](https://github.com/DafnyVSCode/Dafny-VSCode)
@@ -387,7 +387,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting
 - **Odin:** [odin-lang/sublime-odin](https://github.com/odin-lang/sublime-odin)
 - **Opa:** [mads379/opa.tmbundle](https://github.com/mads379/opa.tmbundle)
 - **Opal:** [artifactz/sublime-opal](https://github.com/artifactz/sublime-opal)
-- **Open Policy Agent:** [tsandall/vscode-opa](https://github.com/tsandall/vscode-opa)
+- **Open Policy Agent:** [open-policy-agent/vscode-opa](https://github.com/open-policy-agent/vscode-opa)
 - **OpenCL:** [textmate/c.tmbundle](https://github.com/textmate/c.tmbundle)
 - **OpenEdge ABL:** [chriscamicas/abl-tmlanguage](https://github.com/chriscamicas/abl-tmlanguage)
 - **OpenQASM:** [tareqdandachi/language-qasm](https://github.com/tareqdandachi/language-qasm)
@@ -536,7 +536,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting
 - **Svelte:** [sebastinez/svelte-atom](https://github.com/sebastinez/svelte-atom)
 - **Sway:** [FuelLabs/sway-vscode-plugin](https://github.com/FuelLabs/sway-vscode-plugin)
 - **Sweave:** [textmate/sweave.tmbundle](https://github.com/textmate/sweave.tmbundle)
-- **Swift:** [textmate/swift.tmbundle](https://github.com/textmate/swift.tmbundle)
+- **Swift:** [jtbandes/swift-tmlanguage](https://github.com/jtbandes/swift-tmlanguage)
 - **SystemVerilog:** [TheClams/SystemVerilog](https://github.com/TheClams/SystemVerilog)
 - **TL-Verilog:** [adamint/tlv-vscode](https://github.com/adamint/tlv-vscode)
 - **TLA:** [tlaplus-community/tree-sitter-tlaplus](https://github.com/tlaplus-community/tree-sitter-tlaplus) 🐌

vendor/licenses/git_submodule/atomic-dreams.dep.yml → vendor/licenses/git_submodule/dm-syntax.dep.yml

@@ -1,8 +1,8 @@
 ---
-name: atomic-dreams
-version: 14891385ac0110cdcdb22f2dc1a8930cdf501c91
+name: dm-syntax
+version: a63b4388d0df050d40f2c6c6afd85637174abbb5
 type: git_submodule
-homepage: https://github.com/PJB3005/atomic-dreams
+homepage: https://github.com/spacestation13/dm-syntax.git
 license: mit
 licenses:
 - sources: LICENSE

vendor/licenses/git_submodule/swift-tmlanguage.dep.yml

@@ -0,0 +1,19 @@
+---
+name: swift-tmlanguage
+version: 62239f3ff29224c7317ab2fbcc769e3c61beb2a8
+type: git_submodule
+homepage: https://github.com/jtbandes/swift-tmlanguage.git
+license: mit
+licenses:
+- sources: LICENSE.md
+  text: |
+    Copyright 2023 Jacob Bandes-Storch
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+- sources: README.md
+  text: This project is licensed under the terms of the [MIT license](LICENSE.md).
+notices: []