Quick Fix

Closes #1 and #2
AyhamAl-Ali · Dec 15, 2018 · 6889937 · 6889937
1 parent 6f0c474
commit 6889937
Showing 1 changed file with 19 additions and 17 deletions.
diff --git a/sources/Sk-ST3.tmLanguage b/sources/Sk-ST3.tmLanguage
@@ -20,12 +20,6 @@
 			<string>skript.everything</string>
 			<key>patterns</key>
 			<array>
-				<dict>
-					<key>match</key>
-					<string>\%.*\%</string>
-					<key>name</key>
-					<string>skript.percent</string>
-				</dict>
 				<dict>
 					<key>match</key>
 					<string>(game( |)mode|(|all )player(s|)|victim|attacker|sender|loop-player|loop-value|loop-index|loop-number|uuid|location|world|entit(y|ies))</string>
@@ -215,14 +209,6 @@
 							<key>name</key>
 							<string>skript.text.newline</string>
 						</dict>
-						<dict>
-							<key>begin</key>
-							<string>\%</string>
-							<key>end</key>
-							<string>(\%)</string>
-							<key>name</key>
-							<string>skript.text.variable</string>
-						</dict>
 						<dict>
 							<key>match</key>
 							<string>((&amp;|§)0|\&lt;black\&gt;)</string>
@@ -355,6 +341,14 @@
 							<key>name</key>
 							<string>skript.color.r</string>
 						</dict>
+						<dict>
+							<key>match</key>
+							<string>\%</string>
+							<key>end</key>
+							<string>(\%)</string>
+							<key>name</key>
+							<string>skript.text.variable</string>
+						</dict>
 					</array>
 				</dict>
 				<dict>
@@ -1571,13 +1565,13 @@
 				</dict>
 				<dict>
 					<key>match</key>
-					<string>^(\s*|\t*)(get|patterns|check|set|return(| type)|loop of|parse)\:</string>
+					<string>^(\s*|\t*)(get|patterns|check|set|return(| type)|loop of|parse)(?=\:)</string>
 					<key>name</key>
 					<string>skript.skriptmirror.method</string>
 				</dict>
 				<dict>
 					<key>match</key>
-					<string>(?i)( |\s*|\t*)(if|else if|else|while|loop|function|return|continue)</string>
+					<string>(?i)( |\s*|\t*)\b(if|else if|else|while|loop|function|return|continue)\b</string>
 					<key>name</key>
 					<string>skript.operator</string>
 				</dict>
@@ -1587,6 +1581,14 @@
 					<key>name</key>
 					<string>skript.command</string>
 				</dict>
+				<dict>
+					<key>begin</key>
+					<string>\%</string>
+					<key>end</key>
+					<string>\%</string>
+					<key>name</key>
+					<string>skript.percent</string>
+				</dict>
 			</array>
 		</dict>
 	</array>
@@ -1595,4 +1597,4 @@
 	<key>uuid</key>
 	<string>bdf45b93-232e-475f-8783-cad8f0a82773</string>
 </dict>
-</plist>
+</plist>