From 14a7cb2d1b3d6f822701bccf36666303509c7621 Mon Sep 17 00:00:00 2001
From: Theodore Dubois <tblodt@icloud.com>
Date: Wed, 18 Apr 2018 06:29:33 -0700
Subject: [PATCH] Add calculuswhiz/Assembly-Syntax-Definition grammar and use
 it for Unix Assembly (#4096)

---
 .gitmodules                                   |  3 +++
 grammars.yml                                  |  2 ++
 lib/linguist/languages.yml                    |  2 +-
 vendor/README.md                              |  2 +-
 vendor/grammars/Assembly-Syntax-Definition    |  1 +
 .../grammar/Assembly-Syntax-Definition.txt    | 26 +++++++++++++++++++
 6 files changed, 34 insertions(+), 2 deletions(-)
 create mode 160000 vendor/grammars/Assembly-Syntax-Definition
 create mode 100644 vendor/licenses/grammar/Assembly-Syntax-Definition.txt

diff --git a/.gitmodules b/.gitmodules
index 86efdb31..5818bd28 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,6 +10,9 @@
 [submodule "vendor/grammars/Alloy.tmbundle"]
 	path = vendor/grammars/Alloy.tmbundle
 	url = https://github.com/macekond/Alloy.tmbundle
+[submodule "vendor/grammars/Assembly-Syntax-Definition"]
+	path = vendor/grammars/Assembly-Syntax-Definition
+	url = https://github.com/calculuswhiz/Assembly-Syntax-Definition
 [submodule "vendor/grammars/AutoHotkey"]
 	path = vendor/grammars/AutoHotkey
 	url = https://github.com/ahkscript/SublimeAutoHotkey
diff --git a/grammars.yml b/grammars.yml
index 38848e25..57eef147 100755
--- a/grammars.yml
+++ b/grammars.yml
@@ -9,6 +9,8 @@ vendor/grammars/Agda.tmbundle:
 - source.agda
 vendor/grammars/Alloy.tmbundle:
 - source.alloy
+vendor/grammars/Assembly-Syntax-Definition:
+- source.assembly.unix
 vendor/grammars/AutoHotkey:
 - source.ahk
 vendor/grammars/BrightScript.tmbundle:
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index c4b64a97..7be511b7 100755
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -4810,7 +4810,7 @@ Unix Assembly:
   extensions:
   - ".s"
   - ".ms"
-  tm_scope: source.assembly
+  tm_scope: source.assembly.unix
   ace_mode: assembly_x86
   language_id: 120
 Uno:
diff --git a/vendor/README.md b/vendor/README.md
index 6ade77f0..ce73aa73 100644
--- a/vendor/README.md
+++ b/vendor/README.md
@@ -377,7 +377,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting
 - **TypeScript:** [Microsoft/TypeScript-TmLanguage](https://github.com/Microsoft/TypeScript-TmLanguage)
 - **Unified Parallel C:** [textmate/c.tmbundle](https://github.com/textmate/c.tmbundle)
 - **Unity3D Asset:** [atom/language-yaml](https://github.com/atom/language-yaml)
-- **Unix Assembly:** [Nessphoro/sublimeassembly](https://github.com/Nessphoro/sublimeassembly)
+- **Unix Assembly:** [calculuswhiz/Assembly-Syntax-Definition](https://github.com/calculuswhiz/Assembly-Syntax-Definition)
 - **Uno:** [atom/language-csharp](https://github.com/atom/language-csharp)
 - **UnrealScript:** [textmate/java.tmbundle](https://github.com/textmate/java.tmbundle)
 - **UrWeb:** [gwalborn/UrWeb-Language-Definition](https://github.com/gwalborn/UrWeb-Language-Definition)
diff --git a/vendor/grammars/Assembly-Syntax-Definition b/vendor/grammars/Assembly-Syntax-Definition
new file mode 160000
index 00000000..3d82aa78
--- /dev/null
+++ b/vendor/grammars/Assembly-Syntax-Definition
@@ -0,0 +1 @@
+Subproject commit 3d82aa7847b04d39a8f6a6e2fcc8e7c702265b76
diff --git a/vendor/licenses/grammar/Assembly-Syntax-Definition.txt b/vendor/licenses/grammar/Assembly-Syntax-Definition.txt
new file mode 100644
index 00000000..5faba7ef
--- /dev/null
+++ b/vendor/licenses/grammar/Assembly-Syntax-Definition.txt
@@ -0,0 +1,26 @@
+---
+type: grammar
+name: Assembly-Syntax-Definition
+license: mit
+---
+The MIT License (MIT)
+
+Copyright (c) 2016 calculuswhiz
+
+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.