Cleaning up various syntax

mikepack · Mar 24, 2010 · 6a28d0f · 6a28d0f
1 parent 163f929
commit 6a28d0f
Show file tree

Hide file tree

Showing 23 changed files with 86 additions and 191 deletions.
diff --git a/Commands/Alternate File.tmCommand b/Commands/Alternate File.tmCommand
@@ -27,7 +27,7 @@ ${TM_RUBY:-ruby} /tmp/cucumber-$$.rb; exit_status=$?; rm /tmp/cucumber-$$.rb; ex
 	<key>output</key>
 	<string>showAsTooltip</string>
 	<key>scope</key>
-	<string>text.cucumber.feature, source.ruby.rspec.cucumber.steps</string>
+	<string>text.gherkin.feature, source.ruby.rspec.cucumber.steps</string>
 	<key>uuid</key>
 	<string>6AD6154B-3EE8-43D1-B87F-6261C859AD07</string>
 </dict>

diff --git a/Commands/Autocomplete Step.tmCommand b/Commands/Autocomplete Step.tmCommand
@@ -25,7 +25,7 @@ end</string>
 	<key>output</key>
 	<string>insertAsSnippet</string>
 	<key>scope</key>
-	<string>text.cucumber.feature</string>
+	<string>text.gherkin.feature</string>
 	<key>uuid</key>
 	<string>46204E4A-2DA4-4107-9742-60F13EED58B8</string>
 </dict>

diff --git a/Commands/Autoformat Feature (using Cucumber).tmCommand b/Commands/Autoformat Feature (using Cucumber).tmCommand
@@ -22,7 +22,7 @@ runner.autoformat_feature
 	<key>output</key>
 	<string>discard</string>
 	<key>scope</key>
-	<string>text.cucumber.feature, source.ruby.rspec.cucumber.steps</string>
+	<string>text.gherkin.feature, source.ruby.rspec.cucumber.steps</string>
 	<key>uuid</key>
 	<string>47E22DF4-07E4-4B15-9BDC-6DB1AE434609</string>
 </dict>

diff --git a/Commands/Create Unimplemented Steps.tmCommand b/Commands/Create Unimplemented Steps.tmCommand
@@ -23,7 +23,7 @@ ${TM_RUBY:-ruby} /tmp/cucumber-$$.rb; exit_status=$?; rm /tmp/cucumber-$$.rb; ex
 	<key>output</key>
 	<string>showAsTooltip</string>
 	<key>scope</key>
-	<string>text.cucumber.feature, source.ruby.cucumber.steps</string>
+	<string>text.gherkin.feature, source.ruby.cucumber.steps</string>
 	<key>uuid</key>
 	<string>A165BB7A-E147-499B-8DF2-CA1FC9049298</string>
 </dict>

diff --git a/Commands/Goto Current Step.tmCommand b/Commands/Goto Current Step.tmCommand
@@ -25,7 +25,7 @@ ${TM_RUBY:-ruby} /tmp/cucumber-$$.rb; exit_status=$?; rm /tmp/cucumber-$$.rb; ex
 	<key>output</key>
 	<string>showAsTooltip</string>
 	<key>scope</key>
-	<string>text.cucumber.feature, source.ruby.cucumber.steps</string>
+	<string>text.gherkin.feature, source.ruby.cucumber.steps</string>
 	<key>uuid</key>
 	<string>8E156A1E-AF51-4CFB-949F-47B6BCE6E6EC</string>
 </dict>

diff --git a/Commands/List included step files.tmCommand b/Commands/List included step files.tmCommand
@@ -27,7 +27,7 @@ ${TM_RUBY:-ruby} /tmp/cucumber-$$.rb; exit_status=$?; rm /tmp/cucumber-$$.rb; ex
 	<key>output</key>
 	<string>showAsTooltip</string>
 	<key>scope</key>
-	<string>text.cucumber.feature, source.ruby.rspec.cucumber.steps</string>
+	<string>text.gherkin.feature, source.ruby.rspec.cucumber.steps</string>
 	<key>uuid</key>
 	<string>2BCE4864-D70A-4C51-B49D-FB3220130B74</string>
 </dict>

diff --git a/Commands/Run Single Scenario.tmCommand b/Commands/Run Single Scenario.tmCommand
@@ -27,7 +27,7 @@ ${TM_RUBY:-ruby} /tmp/cucumber-$$.rb; exit_status=$?; rm /tmp/cucumber-$$.rb; ex
 	<key>output</key>
 	<string>showAsHTML</string>
 	<key>scope</key>
-	<string>text.cucumber.feature</string>
+	<string>text.gherkin.feature</string>
 	<key>uuid</key>
 	<string>7B92D0E5-FCF2-4CE0-A900-821E7EA000C7</string>
 </dict>

diff --git a/Commands/Run Story.tmCommand b/Commands/Run Story.tmCommand
@@ -27,7 +27,7 @@ ${TM_RUBY:-ruby} /tmp/cucumber-$$.rb; exit_status=$?; rm /tmp/cucumber-$$.rb; ex
 	<key>output</key>
 	<string>showAsHTML</string>
 	<key>scope</key>
-	<string>text.cucumber.feature, source.ruby.rspec.cucumber.steps</string>
+	<string>text.gherkin.feature, source.ruby.rspec.cucumber.steps</string>
 	<key>uuid</key>
 	<string>1531D367-DCDF-4F89-8BDB-896FAA16830E</string>
 </dict>

diff --git a/Preferences/Comments.tmPreferences b/Preferences/Comments.tmPreferences
@@ -5,7 +5,7 @@
 	<key>name</key>
 	<string>Comments</string>
 	<key>scope</key>
-	<string>text.cucumber.feature</string>
+	<string>text.gherkin.feature</string>
 	<key>settings</key>
 	<dict>
 		<key>shellVariables</key>

diff --git a/Preferences/Cucumber Plain Text Feature Completions.tmPreferences b/Preferences/Cucumber Plain Text Feature Completions.tmPreferences
@@ -3,9 +3,9 @@
 <plist version="1.0">
 <dict>
 	<key>name</key>
-	<string>Cucumber Plain Text Feature Completions</string>
+	<string>Gherkin Completions</string>
 	<key>scope</key>
-	<string>text.cucumber.feature</string>
+	<string>text.gherkin.feature</string>
 	<key>settings</key>
 	<dict>
 		<key>completions</key>
@@ -21,6 +21,7 @@
 			<string>Then</string>
 			<string>When</string>
 			<string>And</string>
+			<string>But</string>
 		</array>
 	</dict>
 	<key>uuid</key>

diff --git a/Preferences/Symbol list: Scenario.tmPreferences b/Preferences/Symbol list: Scenario.tmPreferences
@@ -5,7 +5,7 @@
 	<key>name</key>
 	<string>Symbol list: Scenario</string>
 	<key>scope</key>
-	<string>text.cucumber.feature string.language.cucumber.feature.scenario.title</string>
+	<string>text.gherkin.feature string.language.gherkin.scenario.title</string>
 	<key>settings</key>
 	<dict>
 		<key>showInSymbolList</key>

diff --git a/Snippets/Scenario (heading only).tmSnippet b/Snippets/Scenario (heading only).tmSnippet
@@ -9,7 +9,7 @@ $0
 	<key>name</key>
 	<string>Scenario (heading only)</string>
 	<key>scope</key>
-	<string>text.cucumber.feature</string>
+	<string>text.gherkin.feature</string>
 	<key>tabTrigger</key>
 	<string>sc</string>
 	<key>uuid</key>

diff --git a/Snippets/Scenario Outline.tmSnippet b/Snippets/Scenario Outline.tmSnippet
@@ -11,7 +11,7 @@
 	<key>name</key>
 	<string>Scenario Outline</string>
 	<key>scope</key>
-	<string>text.cucumber.feature</string>
+	<string>text.gherkin.feature</string>
 	<key>tabTrigger</key>
 	<string>sco</string>
 	<key>uuid</key>

diff --git a/Snippets/Scenario.tmSnippet b/Snippets/Scenario.tmSnippet
@@ -13,7 +13,7 @@ $0
 	<key>name</key>
 	<string>Scenario</string>
 	<key>scope</key>
-	<string>text.cucumber.feature</string>
+	<string>text.gherkin.feature</string>
 	<key>tabTrigger</key>
 	<string>sce</string>
 	<key>uuid</key>

diff --git a/Snippets/Story.tmSnippet b/Snippets/Story.tmSnippet
@@ -16,7 +16,7 @@
 	<key>name</key>
 	<string>Feature</string>
 	<key>scope</key>
-	<string>text.cucumber.feature</string>
+	<string>text.gherkin.feature</string>
 	<key>tabTrigger</key>
 	<string>fea</string>
 	<key>uuid</key>

diff --git a/Snippets/Then Step Plaintext.tmSnippet b/Snippets/Then Step Plaintext.tmSnippet
@@ -7,7 +7,7 @@
 	<key>name</key>
 	<string>Then Step Plaintext</string>
 	<key>scope</key>
-	<string>text.cucumber.feature</string>
+	<string>text.gherkin.feature</string>
 	<key>tabTrigger</key>
 	<string>the</string>
 	<key>uuid</key>

diff --git a/Snippets/When Step Plaintext.tmSnippet b/Snippets/When Step Plaintext.tmSnippet
@@ -7,7 +7,7 @@
 	<key>name</key>
 	<string>When Step Plaintext</string>
 	<key>scope</key>
-	<string>text.cucumber.feature</string>
+	<string>text.gherkin.feature</string>
 	<key>tabTrigger</key>
 	<string>whe</string>
 	<key>uuid</key>

diff --git a/Syntaxes/Cucumber Plain Text Feature.tmLanguage b/Syntaxes/Cucumber Plain Text Feature.tmLanguage
@@ -20,7 +20,7 @@
 	<array>
 		<dict>
 			<key>include</key>
-			<string>#scenario_keyword</string>
+			<string>#feature_element_keyword</string>
 		</dict>
 		<dict>
 			<key>include</key>
@@ -60,7 +60,7 @@
 		</dict>
 		<dict>
 			<key>include</key>
-			<string>#cucumber_table</string>
+			<string>#table</string>
 		</dict>
 	</array>
 	<key>repository</key>
@@ -78,7 +78,7 @@
 			<key>match</key>
 			<string>\s*(#.*)</string>
 		</dict>
-		<key>cucumber_table</key>
+		<key>table</key>
 		<dict>
 			<key>begin</key>
 			<string>^\s*\|</string>
@@ -103,12 +103,12 @@
 				<key>1</key>
 				<dict>
 					<key>name</key>
-					<string>keyword.language.cucumber.feature</string>
+					<string>keyword.language.gherkin.feature</string>
 				</dict>
 				<key>2</key>
 				<dict>
 					<key>name</key>
-					<string>string.language.cucumber.feature.title</string>
+					<string>string.language.gherkin.feature.title</string>
 				</dict>
 			</dict>
 			<key>match</key>
@@ -121,25 +121,25 @@
 				<key>1</key>
 				<dict>
 					<key>name</key>
-					<string>keyword.language.cucumber.feature.scenario.line</string>
+					<string>keyword.language.gherkin.feature.step</string>
 				</dict>
 			</dict>
 			<key>match</key>
 			<string>^\s*(하지만|조건|먼저|만일|만약|단|그리고|그러면|那麼|那么|而且|當|当|前提|假設|假如|但是|但し|並且|もし|ならば|ただし|しかし|かつ|و |متى |لكن |عندما |ثم |بفرض |اذاً |כאשר |וגם |בהינתן |אזי |אז |אבל |Унда |То |Онда |Но |Лекин |Когато |Када |Кад |К тому же |И |Задато |Задати |Задате |Если |Допустим |Дадено |Ва |Бирок |Аммо |Али |Агар |А |Și |És |anrhegedig a |Zatati |Zakładając |Zadato |Zadate |Zadano |Zadani |Zadan |Yna |Ya know how |Ya gotta |Y |Wtedy |When y\'all |When |Wenn |WEN |Và |Ve |Und |Un |Thì |Then y\'all |Then |Tapi |Tak |Tada |Tad |Så |Stel |Soit |Siis |Si |Quando |Quand |Quan |Pryd |Pokud |Pokiaľ |Però |Pero |Pak |Oraz |Onda |Ond |Oletetaan |Og |Och |O zaman |Når |När |Niin |Nhưng |N |Mutta |Men |Mas |Maka |Majd |Mais |Maar |Ma |Lorsque |Lorsqu\'|Kun |Kuid |Kui |Khi |Keď |Ketika |Když |Kai |Kada |Kad |Jeżeli |Ja |Ir |I CAN HAZ |I |Ha |Givet |Given y\'all |Given |Gitt |Gegeven |Gegeben sei |Fakat |Eğer ki |Etant donné |Et |Então |Entonces |Entao |En |Eeldades |E |Duota |Donat |Donada |Diyelim ki |Dengan |De |Dato |Dar |Dann |Dan |Dado |Dacă |Daca |DEN |Când |Cuando |Cho |Cept |Cand |Cal |But y\'all |But |Biết |Bet |BUT |Atès |Atunci |Atesa |Angenommen |And y\'all |And |Ama |Als |Alors |Allora |Ali |Aleshores |Ale |Akkor |Aber |AN |A také |A |\* )</string>
 		</dict>
-		<key>scenario_keyword</key>
+		<key>feature_element_keyword</key>
 		<dict>
 			<key>captures</key>
 			<dict>
 				<key>1</key>
 				<dict>
 					<key>name</key>
-					<string>keyword.language.cucumber.feature.scenario</string>
+					<string>keyword.language.gherkin.feature.scenario</string>
 				</dict>
 				<key>2</key>
 				<dict>
 					<key>name</key>
-					<string>string.language.cucumber.feature.scenario.title</string>
+					<string>string.language.gherkin.scenario.title.title</string>
 				</dict>
 			</dict>
 			<key>match</key>
@@ -214,7 +214,7 @@
 		</dict>
 	</dict>
 	<key>scopeName</key>
-	<string>text.cucumber.feature</string>
+	<string>text.gherkin.feature</string>
 	<key>uuid</key>
 	<string>85E2C52C-9B16-4A54-81E7-6D8D3ADAEFA8</string>
 </dict>

diff --git a/Syntaxes/Cucumber Steps.tmLanguage b/Syntaxes/Cucumber Steps.tmLanguage
@@ -177,7 +177,7 @@
 			<array>
 				<dict>
 					<key>include</key>
-					<string>text.cucumber.feature</string>
+					<string>text.gherkin.feature</string>
 				</dict>
 			</array>
 		</dict>

diff --git a/Syntaxes/plaintext_template.erb b/Syntaxes/plaintext_template.erb
@@ -15,12 +15,12 @@
 	<key>keyEquivalent</key>
 	<string>^~C</string>
 	<key>name</key>
-	<string>Cucumber Plain Text Feature</string>
+	<string>Gherkin</string>
 	<key>patterns</key>
 	<array>
 		<dict>
 			<key>include</key>
-			<string>#scenario_keyword</string>
+			<string>#feature_element_keyword</string>
 		</dict>
 		<dict>
 			<key>include</key>
@@ -60,7 +60,7 @@
 		</dict>
 		<dict>
 			<key>include</key>
-			<string>#cucumber_table</string>
+			<string>#table</string>
 		</dict>
 	</array>
 	<key>repository</key>
@@ -78,7 +78,7 @@
 			<key>match</key>
 			<string>\s*(#.*)</string>
 		</dict>
-		<key>cucumber_table</key>
+		<key>table</key>
 		<dict>
 			<key>begin</key>
 			<string>^\s*\|</string>
@@ -103,12 +103,12 @@
 				<key>1</key>
 				<dict>
 					<key>name</key>
-					<string>keyword.language.cucumber.feature</string>
+					<string>keyword.language.gherkin.feature</string>
 				</dict>
 				<key>2</key>
 				<dict>
 					<key>name</key>
-					<string>string.language.cucumber.feature.title</string>
+					<string>string.language.gherkin.feature.title</string>
 				</dict>
 			</dict>
 			<key>match</key>
@@ -121,25 +121,25 @@
 				<key>1</key>
 				<dict>
 					<key>name</key>
-					<string>keyword.language.cucumber.feature.scenario.line</string>
+					<string>keyword.language.gherkin.feature.step</string>
 				</dict>
 			</dict>
 			<key>match</key>
 			<string>^\s*(<%= Gherkin::I18n.keyword_regexp(:step) %>)</string>
 		</dict>
-		<key>scenario_keyword</key>
+		<key>feature_element_keyword</key>
 		<dict>
 			<key>captures</key>
 			<dict>
 				<key>1</key>
 				<dict>
 					<key>name</key>
-					<string>keyword.language.cucumber.feature.scenario</string>
+					<string>keyword.language.gherkin.feature.scenario</string>
 				</dict>
 				<key>2</key>
 				<dict>
 					<key>name</key>
-					<string>string.language.cucumber.feature.scenario.title</string>
+					<string>string.language.gherkin.scenario.title.title</string>
 				</dict>
 			</dict>
 			<key>match</key>
@@ -214,7 +214,7 @@
 		</dict>
 	</dict>
 	<key>scopeName</key>
-	<string>text.cucumber.feature</string>
+	<string>text.gherkin.feature</string>
 	<key>uuid</key>
 	<string>85E2C52C-9B16-4A54-81E7-6D8D3ADAEFA8</string>
 </dict>