Require terminator before function definition

mkhl · mkhl · commit ba95d7b742ca · 2017-03-15T17:51:02.000+01:00
The current grammar assumes it found a function whenever it encounters the keyword `function` followed by any word, which is too aggressive and can lead to false positives. This change requires that the function definition is preceded by a terminator (`^|;|&`) and (optional) whitespace. This approach can still produce false positives (it doesn’t recognise when the line break was escaped, for example) but should work well enough. It also now includes the preceding whitespace in the `meta.function.shell` scope (due to the limitations on variable-width look-behinds), which I don’t like but also don’t see a way around. We might want to consider doing something similar for loop constructs. Closes #36
diff --git a/Syntaxes/Shell-Unix-Bash.tmLanguage b/Syntaxes/Shell-Unix-Bash.tmLanguage
@@ -336,7 +336,7 @@
 			<array>
 				<dict>
 					<key>begin</key>
-					<string>(?&lt;=^|;|&amp;|\s)(function)\s+([^\s&lt;&gt;;'"\\|$&amp;()]+)(?:\s*(\(\)))?</string>
+					<string>(?&lt;=^|;|&amp;)\s*(function)\s+([^\s&lt;&gt;;'"\\|$&amp;()]+)(?:\s*(\(\)))?</string>
 					<key>beginCaptures</key>
 					<dict>
 						<key>1</key>
@@ -377,7 +377,7 @@
 				</dict>
 				<dict>
 					<key>begin</key>
-					<string>(?&lt;=^|;|&amp;|\s)([^\s&lt;&gt;;'"\\|$&amp;()]+)\s*(\(\))</string>
+					<string>(?&lt;=^|;|&amp;)\s*([^\s&lt;&gt;;'"\\|$&amp;()]+)\s*(\(\))</string>
 					<key>beginCaptures</key>
 					<dict>
 						<key>1</key>
