From 3b2b500665f00de2078394eec66d1cceec462bc9 Mon Sep 17 00:00:00 2001
From: Andrew Kvapil <viluon@espiv.net>
Date: Wed, 15 Jun 2016 15:42:37 +0200
Subject: [PATCH] Disable Snippets and Completions in Strings

Fixes #1
---
 Snippets/++.sublime-snippet                     | 2 +-
 Snippets/+=.sublime-snippet                     | 2 +-
 Snippets/-=.sublime-snippet                     | 2 +-
 Snippets/asterisk=.sublime-snippet              | 2 +-
 Snippets/else.sublime-snippet                   | 2 +-
 Snippets/elseif.sublime-snippet                 | 2 +-
 Snippets/elseif=.sublime-snippet                | 2 +-
 Snippets/elseif~.sublime-snippet                | 2 +-
 Snippets/for-i-v-in-ipairs().sublime-snippet    | 2 +-
 Snippets/for-i=1-10.sublime-snippet             | 2 +-
 Snippets/for-k-v-in-pairs().sublime-snippet     | 2 +-
 Snippets/function-(fun).sublime-snippet         | 2 +-
 Snippets/function-(function).sublime-snippet    | 2 +-
 Snippets/function-with-comments.sublime-snippet | 2 +-
 Snippets/if.sublime-snippet                     | 2 +-
 Snippets/if=.sublime-snippet                    | 2 +-
 Snippets/if~.sublime-snippet                    | 2 +-
 Snippets/local-x-=-1.sublime-snippet            | 2 +-
 Snippets/percent=.sublime-snippet               | 2 +-
 Snippets/repeat.sublime-snippet                 | 2 +-
 Snippets/slash=.sublime-snippet                 | 2 +-
 Snippets/while.sublime-snippet                  | 2 +-
 keywords.sublime-completions                    | 2 +-
 stdlib.sublime-completions                      | 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/Snippets/++.sublime-snippet b/Snippets/++.sublime-snippet
index 2b31817..82d866e 100644
--- a/Snippets/++.sublime-snippet
+++ b/Snippets/++.sublime-snippet
@@ -1,6 +1,6 @@
 <snippet>
 	<content><![CDATA[ = ${TM_CURRENT_LINE/(\s*|--.*)//g} + 1]]></content>
 	<tabTrigger>++</tabTrigger>
-	<scope>source.luae</scope>
+	<scope>source.luae - string</scope>
 	<description>x = x + 1</description>
 </snippet>
diff --git a/Snippets/+=.sublime-snippet b/Snippets/+=.sublime-snippet
index 6410075..ab99dcb 100644
--- a/Snippets/+=.sublime-snippet
+++ b/Snippets/+=.sublime-snippet
@@ -1,6 +1,6 @@
 <snippet>
 	<content><![CDATA[${1:foo} = $1 + ${2:1}]]></content>
 	<tabTrigger>+=</tabTrigger>
-	<scope>source.luae</scope>
+	<scope>source.luae - string</scope>
 	<description>x = x + y</description>
 </snippet>
diff --git a/Snippets/-=.sublime-snippet b/Snippets/-=.sublime-snippet
index f5d9f42..9ad70c0 100644
--- a/Snippets/-=.sublime-snippet
+++ b/Snippets/-=.sublime-snippet
@@ -1,6 +1,6 @@
 <snippet>
 	<content><![CDATA[${1:foo} = $1 - ${2:1}]]></content>
 	<tabTrigger>-=</tabTrigger>
-	<scope>source.luae</scope>
+	<scope>source.luae - string</scope>
 	<description>x = x - y</description>
 </snippet>
diff --git a/Snippets/asterisk=.sublime-snippet b/Snippets/asterisk=.sublime-snippet
index 4558558..a867d0e 100644
--- a/Snippets/asterisk=.sublime-snippet
+++ b/Snippets/asterisk=.sublime-snippet
@@ -1,6 +1,6 @@
 <snippet>
 	<content><![CDATA[${1:foo} = $1 * ${2:2}]]></content>
 	<tabTrigger>*=</tabTrigger>
-	<scope>source.luae</scope>
+	<scope>source.luae - string</scope>
 	<description>x = x * y</description>
 </snippet>
diff --git a/Snippets/else.sublime-snippet b/Snippets/else.sublime-snippet
index b4ab1dd..774b36b 100644
--- a/Snippets/else.sublime-snippet
+++ b/Snippets/else.sublime-snippet
@@ -3,6 +3,6 @@
 	${0:$SELECTION}
 end]]></content>
 	<tabTrigger>else</tabTrigger>
-	<scope>source.luae</scope>
+	<scope>source.luae - string</scope>
 	<description>else ... end</description>
 </snippet>
diff --git a/Snippets/elseif.sublime-snippet b/Snippets/elseif.sublime-snippet
index de8e138..db40358 100644
--- a/Snippets/elseif.sublime-snippet
+++ b/Snippets/elseif.sublime-snippet
@@ -3,6 +3,6 @@
 	${0:$SELECTION}
 ${2:end}]]></content>
 	<tabTrigger>elseif</tabTrigger>
-	<scope>source.luae</scope>
+	<scope>source.luae - string</scope>
 	<description>elseif x then</description>
 </snippet>
diff --git a/Snippets/elseif=.sublime-snippet b/Snippets/elseif=.sublime-snippet
index 957e786..568f0ae 100644
--- a/Snippets/elseif=.sublime-snippet
+++ b/Snippets/elseif=.sublime-snippet
@@ -3,6 +3,6 @@
 	${0:$SELECTION}
 ${3:end}]]></content>
 	<tabTrigger>elseif=</tabTrigger>
-	<scope>source.luae</scope>
+	<scope>source.luae - string</scope>
 	<description>elseif a == b then</description>
 </snippet>
diff --git a/Snippets/elseif~.sublime-snippet b/Snippets/elseif~.sublime-snippet
index 1637a33..076ca28 100644
--- a/Snippets/elseif~.sublime-snippet
+++ b/Snippets/elseif~.sublime-snippet
@@ -3,6 +3,6 @@
 	${0:$SELECTION}
 end]]></content>
 	<tabTrigger>elseif~</tabTrigger>
-	<scope>source.luae</scope>
+	<scope>source.luae - string</scope>
 	<description>elseif a ~= b then</description>
 </snippet>
diff --git a/Snippets/for-i-v-in-ipairs().sublime-snippet b/Snippets/for-i-v-in-ipairs().sublime-snippet
index 413b0e4..27d8bff 100644
--- a/Snippets/for-i-v-in-ipairs().sublime-snippet
+++ b/Snippets/for-i-v-in-ipairs().sublime-snippet
@@ -3,6 +3,6 @@
 	${0:print( $1, $2 )}
 end]]></content>
 	<tabTrigger>fori</tabTrigger>
-	<scope>source.luae</scope>
+	<scope>source.luae - string</scope>
 	<description>for i, v in ipairs()</description>
 </snippet>
diff --git a/Snippets/for-i=1-10.sublime-snippet b/Snippets/for-i=1-10.sublime-snippet
index 981be97..d910c0d 100644
--- a/Snippets/for-i=1-10.sublime-snippet
+++ b/Snippets/for-i=1-10.sublime-snippet
@@ -3,6 +3,6 @@
 	${0:print( $1 )}
 end]]></content>
 	<tabTrigger>for</tabTrigger>
-	<scope>source.luae</scope>
+	<scope>source.luae - string</scope>
 	<description>for i = 1, 10</description>
 </snippet>
diff --git a/Snippets/for-k-v-in-pairs().sublime-snippet b/Snippets/for-k-v-in-pairs().sublime-snippet
index f6c0eff..0b1fc43 100644
--- a/Snippets/for-k-v-in-pairs().sublime-snippet
+++ b/Snippets/for-k-v-in-pairs().sublime-snippet
@@ -3,6 +3,6 @@
 	${0:print( $1, $2 )}
 end]]></content>
 	<tabTrigger>forp</tabTrigger>
-	<scope>source.luae</scope>
+	<scope>source.luae - string</scope>
 	<description>for k, v in pairs()</description>
 </snippet>
diff --git a/Snippets/function-(fun).sublime-snippet b/Snippets/function-(fun).sublime-snippet
index e9d1689..8a99b76 100644
--- a/Snippets/function-(fun).sublime-snippet
+++ b/Snippets/function-(fun).sublime-snippet
@@ -3,6 +3,6 @@
 	${0:-- body}
 end]]></content>
 	<tabTrigger>fun</tabTrigger>
-	<scope>source.luae</scope>
+	<scope>source.luae - string</scope>
 	<description>function</description>
 </snippet>
diff --git a/Snippets/function-(function).sublime-snippet b/Snippets/function-(function).sublime-snippet
index c2cec8f..89e5a2c 100644
--- a/Snippets/function-(function).sublime-snippet
+++ b/Snippets/function-(function).sublime-snippet
@@ -3,6 +3,6 @@
 	${0:-- body}
 end]]></content>
 	<tabTrigger>function</tabTrigger>
-	<scope>source.luae</scope>
+	<scope>source.luae - string</scope>
 	<description>function</description>
 </snippet>
diff --git a/Snippets/function-with-comments.sublime-snippet b/Snippets/function-with-comments.sublime-snippet
index 7de8311..0827458 100644
--- a/Snippets/function-with-comments.sublime-snippet
+++ b/Snippets/function-with-comments.sublime-snippet
@@ -6,6 +6,6 @@ ${1:local }function ${2:function_name}( ${3:...} )
 	${0:-- body}
 end]]></content>
 	<tabTrigger>dfun</tabTrigger>
-	<scope>source.luae</scope>
+	<scope>source.luae - string</scope>
 	<description>LDoc function</description>
 </snippet>
diff --git a/Snippets/if.sublime-snippet b/Snippets/if.sublime-snippet
index 23c9b33..7f8dd9b 100644
--- a/Snippets/if.sublime-snippet
+++ b/Snippets/if.sublime-snippet
@@ -3,6 +3,6 @@
 	${0:$SELECTION}
 ${2:end}]]></content>
 	<tabTrigger>if</tabTrigger>
-	<scope>source.luae</scope>
+	<scope>source.luae - string</scope>
 	<description>if x then</description>
 </snippet>
diff --git a/Snippets/if=.sublime-snippet b/Snippets/if=.sublime-snippet
index 255a0a1..3a74510 100644
--- a/Snippets/if=.sublime-snippet
+++ b/Snippets/if=.sublime-snippet
@@ -3,6 +3,6 @@
 	${0:$SELECTION}
 ${3:end}]]></content>
 	<tabTrigger>if=</tabTrigger>
-	<scope>source.luae</scope>
+	<scope>source.luae - string</scope>
 	<description>if a == b then</description>
 </snippet>
diff --git a/Snippets/if~.sublime-snippet b/Snippets/if~.sublime-snippet
index 7d884a7..5295c28 100644
--- a/Snippets/if~.sublime-snippet
+++ b/Snippets/if~.sublime-snippet
@@ -3,6 +3,6 @@
 	${0:$SELECTION}
 ${3:end}]]></content>
 	<tabTrigger>if~</tabTrigger>
-	<scope>source.luae</scope>
+	<scope>source.luae - string</scope>
 	<description>if a ~= b then</description>
 </snippet>
diff --git a/Snippets/local-x-=-1.sublime-snippet b/Snippets/local-x-=-1.sublime-snippet
index 74141cf..7273262 100644
--- a/Snippets/local-x-=-1.sublime-snippet
+++ b/Snippets/local-x-=-1.sublime-snippet
@@ -1,6 +1,6 @@
 <snippet>
 	<content><![CDATA[local ${1:x} = ${0:$SELECTION}]]></content>
 	<tabTrigger>local</tabTrigger>
-	<scope>source.luae</scope>
+	<scope>source.luae - string</scope>
 	<description>local x = 1</description>
 </snippet>
diff --git a/Snippets/percent=.sublime-snippet b/Snippets/percent=.sublime-snippet
index 627d17c..47641bc 100644
--- a/Snippets/percent=.sublime-snippet
+++ b/Snippets/percent=.sublime-snippet
@@ -1,6 +1,6 @@
 <snippet>
 	<content><![CDATA[${1:foo} = $1 % ${2:2}]]></content>
 	<tabTrigger>%=</tabTrigger>
-	<scope>source.luae</scope>
+	<scope>source.luae - string</scope>
 	<description>x = x % y</description>
 </snippet>
diff --git a/Snippets/repeat.sublime-snippet b/Snippets/repeat.sublime-snippet
index b2d6fa1..e1a448e 100644
--- a/Snippets/repeat.sublime-snippet
+++ b/Snippets/repeat.sublime-snippet
@@ -3,6 +3,6 @@
 	${0:$SELECTION}
 until ${1:false}]]></content>
 	<tabTrigger>repeat</tabTrigger>
-	<scope>source.luae</scope>
+	<scope>source.luae - string</scope>
 	<description>repeat until false</description>
 </snippet>
diff --git a/Snippets/slash=.sublime-snippet b/Snippets/slash=.sublime-snippet
index afff52b..c230f90 100644
--- a/Snippets/slash=.sublime-snippet
+++ b/Snippets/slash=.sublime-snippet
@@ -1,6 +1,6 @@
 <snippet>
 	<content><![CDATA[${1:foo} = $1 / ${2:2}]]></content>
 	<tabTrigger>/=</tabTrigger>
-	<scope>source.luae</scope>
+	<scope>source.luae - string</scope>
 	<description>x = x / y</description>
 </snippet>
diff --git a/Snippets/while.sublime-snippet b/Snippets/while.sublime-snippet
index 187f566..45f1f73 100644
--- a/Snippets/while.sublime-snippet
+++ b/Snippets/while.sublime-snippet
@@ -3,6 +3,6 @@
 	${0:$SELECTION}
 end]]></content>
 	<tabTrigger>while</tabTrigger>
-	<scope>source.luae</scope>
+	<scope>source.luae - string</scope>
 	<description>while true do</description>
 </snippet>
diff --git a/keywords.sublime-completions b/keywords.sublime-completions
index 4f451ca..a8f614c 100644
--- a/keywords.sublime-completions
+++ b/keywords.sublime-completions
@@ -1,5 +1,5 @@
 {
-	"scope" : "source.luae",
+	"scope" : "source.luae - string",
 	"completions":
 	[
 		"and",
diff --git a/stdlib.sublime-completions b/stdlib.sublime-completions
index e2ca1ec..629c7de 100644
--- a/stdlib.sublime-completions
+++ b/stdlib.sublime-completions
@@ -1,5 +1,5 @@
 {
-	"scope" : "source.luae",
+	"scope" : "source.luae - string",
 	"completions":
 	[
 		// Constants