From c6625b1b8a9a6dc3c5a526faba974b604bc124e2 Mon Sep 17 00:00:00 2001
From: Arfon Smith <arfon@users.noreply.github.com>
Date: Sun, 20 Mar 2016 08:34:05 -0600
Subject: [PATCH] Merge pull request #2898 from github/sourcepawn

Adding back sourcepawn
---
 .gitmodules                            |  3 +++
 grammars.yml                           |  2 ++
 lib/linguist/languages.yml             |  2 +-
 vendor/grammars/sourcepawn             |  1 +
 vendor/licenses/grammar/sourcepawn.txt | 12 ++++++++++++
 5 files changed, 19 insertions(+), 1 deletion(-)
 create mode 160000 vendor/grammars/sourcepawn
 create mode 100644 vendor/licenses/grammar/sourcepawn.txt

diff --git a/.gitmodules b/.gitmodules
index cc0843d4..1e5c07a5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -683,3 +683,6 @@
 [submodule "vendor/grammars/pig-latin"]
 	path = vendor/grammars/pig-latin
 	url = https://github.com/goblindegook/sublime-text-pig-latin
+[submodule "vendor/grammars/sourcepawn"]
+	path = vendor/grammars/sourcepawn
+	url = https://github.com/austinwagner/sublime-sourcepawn
diff --git a/grammars.yml b/grammars.yml
index 1f478d13..b0599853 100755
--- a/grammars.yml
+++ b/grammars.yml
@@ -480,6 +480,8 @@ vendor/grammars/smali-sublime/smali.tmLanguage:
 - source.smali
 vendor/grammars/smalltalk-tmbundle:
 - source.smalltalk
+vendor/grammars/sourcepawn/:
+- source.sp
 vendor/grammars/sql.tmbundle:
 - source.sql
 vendor/grammars/st2-zonefile:
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 80d82285..af12e2f9 100755
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -3425,7 +3425,7 @@ SourcePawn:
   - .sp
   - .inc
   - .sma
-  tm_scope: none
+  tm_scope: source.sp
   ace_mode: text
 
 Squirrel:
diff --git a/vendor/grammars/sourcepawn b/vendor/grammars/sourcepawn
new file mode 160000
index 00000000..294d3ba0
--- /dev/null
+++ b/vendor/grammars/sourcepawn
@@ -0,0 +1 @@
+Subproject commit 294d3ba0972f0456d9d3f554dcd8f97b51aa4d40
diff --git a/vendor/licenses/grammar/sourcepawn.txt b/vendor/licenses/grammar/sourcepawn.txt
new file mode 100644
index 00000000..5a200c9f
--- /dev/null
+++ b/vendor/licenses/grammar/sourcepawn.txt
@@ -0,0 +1,12 @@
+---
+type: grammar
+name: sourcepawn
+license: mit
+---
+Copyright (c) 2013-2016 Austin Wagner
+
+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.