redcar 0.3.5 → 0.3.6

data/plugins/redcar/redcar.rb

@@ -170,7 +170,7 @@ module Redcar
 
     class PrintScopeCommand < Command
       def execute
-        Application::Dialog.tool_tip(tab.edit_view.document.cursor_scope.gsub(" ", "\n"))
+        Application::Dialog.tool_tip(tab.edit_view.document.cursor_scope.gsub(" ", "\n"), :cursor)
       end
     end
     
@@ -193,19 +193,30 @@ module Redcar
             case result
             when :yes
               tab.edit_view.document.save!
-              tab.close
+              close_tab
             when :no
-              tab.close
+              close_tab
             when :cancel
             end
           else
-            tab.close
+            close_tab
           end
         else
-          tab.close
+          close_tab
         end
         @tab = nil
       end
+      
+      private
+      
+      def close_tab
+        win = tab.notebook.window
+        tab.close
+        # this will break a lot of features:
+        #if win.all_tabs.empty? and not Project::Manager.in_window(win)
+        #  win.close
+        #end
+      end
     end
     
     class SwitchTabDownCommand < Command
@@ -241,13 +252,35 @@ module Redcar
     class MoveHomeCommand < EditTabCommand
       
       def execute
-        doc = tab.edit_view.document
+        doc     = tab.edit_view.document
         line_ix = doc.line_at_offset(doc.cursor_offset)
-        doc.cursor_offset = doc.offset_at_line(line_ix)
+        line    = doc.get_line(line_ix)
+        prefix  = line[0...doc.cursor_line_offset]
+        
+        if prefix =~ /^\s*$/
+          # move to start of line
+          new_offset = doc.offset_at_line(line_ix)
+        else
+          # move to start of text
+          new_offset = doc.offset_at_line(line_ix)
+          prefix =~ /^(\s*)[^\s].*$/
+          whitespace_prefix_length = $1 ? $1.length : 0
+          new_offset += whitespace_prefix_length
+        end
+        doc.cursor_offset = new_offset
         doc.ensure_visible(doc.cursor_offset)
       end
     end
     
+    class MoveTopCommand < EditTabCommand
+      
+      def execute
+        doc = tab.edit_view.document
+        doc.cursor_offset = 0
+        doc.ensure_visible(0)
+      end
+    end
+    
     class MoveEndCommand < EditTabCommand
       
       def execute
@@ -262,6 +295,15 @@ module Redcar
       end
     end
     
+    class MoveBottomCommand < EditTabCommand
+      
+      def execute
+        doc = tab.edit_view.document
+        doc.cursor_offset = doc.length
+        doc.ensure_visible(doc.length)
+      end
+    end
+    
     class ChangeIndentCommand < EditTabCommand
       def execute
         doc = tab.edit_view.document
@@ -615,7 +657,43 @@ module Redcar
         EditView.show_invisibles = !EditView.show_invisibles?
       end
     end
+    
+    class ToggleLineNumbers < Redcar::EditTabCommand
+      def execute
+        EditView.show_line_numbers = !EditView.show_line_numbers?
+      end
+    end
+    
+    class ToggleAnnotations < Redcar::EditTabCommand
+      def execute
+        EditView.show_annotations = !EditView.show_annotations?
+      end
+    end
+    
+    class SelectNewFont < Command
+      def execute
+        Redcar::EditView::SelectFontDialog.new.open
+      end
+    end
 
+    class SelectTheme < Command
+      def execute
+        Redcar::EditView::SelectThemeDialog.new.open
+      end
+    end
+    
+    class SelectFontSize < Command
+      def execute
+        result = Application::Dialog.input("Font Size", "Please enter new font size", Redcar::EditView.font_size.to_s) do |text|
+          if text.to_i  > 1 and text.to_i < 25
+            nil
+          else
+            "the font size must be > 1 and < 25"
+          end
+      	end
+        Redcar::EditView.font_size = result[:value].to_i if result[:button ] == :ok
+      end
+    end
     
     def self.keymaps
       osx = Redcar::Keymap.build("main", :osx) do
@@ -637,8 +715,12 @@ module Redcar
         link "Cmd+C",       CopyCommand
         link "Cmd+V",       PasteCommand
         link "Cmd+D",       DuplicateCommand        
+        
+        link "Home",        MoveTopCommand
         link "Ctrl+A",      MoveHomeCommand
         link "Ctrl+E",      MoveEndCommand
+        link "End",         MoveBottomCommand
+        
         link "Cmd+[",       DecreaseIndentCommand
         link "Cmd+]",       IncreaseIndentCommand
         link "Cmd+Shift+I", AutoIndenter::IndentCommand
@@ -689,8 +771,12 @@ module Redcar
         link "Ctrl+C",       CopyCommand
         link "Ctrl+V",       PasteCommand
         link "Ctrl+D",       DuplicateCommand
-        link "Ctrl+A",       MoveHomeCommand
-        link "Ctrl+E",       MoveEndCommand
+        
+        link "Shift+Home",   MoveTopCommand
+        link "Home",         MoveHomeCommand
+        link "End",          MoveEndCommand
+        link "Shift+End",    MoveBottomCommand
+        
         link "Ctrl+[",       DecreaseIndentCommand
         link "Ctrl+]",       IncreaseIndentCommand
         link "Ctrl+Shift+[", AutoIndenter::IndentCommand
@@ -730,7 +816,6 @@ module Redcar
       Menu::Builder.build do
         sub_menu "File" do
           item "New", NewCommand
-          item "New Notebook", NewNotebookCommand
           item "New Window", NewWindowCommand
           item "Open", Project::FileOpenCommand
           item "Open Directory", Project::DirectoryOpenCommand
@@ -743,12 +828,6 @@ module Redcar
           item "Save As", Project::FileSaveAsCommand
           separator
           item "Close Tab", CloseTabCommand
-          sub_menu "Switch Tab" do
-             (1..9).each do |num|
-               item "Tab #{num}", Top.const_get("SelectTab#{num}Command")
-             end
-          end
-          item "Close Notebook", CloseNotebookCommand
           item "Close Window", CloseWindowCommand
           item "Close Directory", Project::DirectoryCloseCommand
           separator
@@ -765,8 +844,10 @@ module Redcar
           item "Paste", PasteCommand
           item "Duplicate Region", DuplicateCommand
           separator
-          item "Home", MoveHomeCommand
-          item "End", MoveEndCommand
+          item "Top",     MoveTopCommand
+          item "Home",    MoveHomeCommand
+          item "End",     MoveEndCommand
+          item "Bottom",  MoveBottomCommand
           separator
           item "Increase Indent", IncreaseIndentCommand
           item "Decrease Indent", DecreaseIndentCommand
@@ -795,14 +876,29 @@ module Redcar
           item "Print Scope at Cursor", PrintScopeCommand
         end
         sub_menu "View" do
+          sub_menu "Appearance" do
+            item "Font", SelectNewFont
+            item "Font Size", SelectFontSize
+            item "Theme", SelectTheme
+          end
+          separator
+          item "New Notebook", NewNotebookCommand
+          item "Close Notebook", CloseNotebookCommand
           item "Rotate Notebooks", RotateNotebooksCommand
           item "Move Tab To Other Notebook", MoveTabToOtherNotebookCommand
           item "Switch Notebooks", SwitchNotebookCommand
           separator
           item "Previous Tab", SwitchTabDownCommand
           item "Next Tab", SwitchTabUpCommand
+          sub_menu "Switch Tab" do
+             (1..9).each do |num|
+               item "Tab #{num}", Top.const_get("SelectTab#{num}Command")
+             end
+          end
           separator
-          item "Show/Hide Invisibles", ToggleInvisibles
+          item "Toggle Invisibles", ToggleInvisibles
+          item "Toggle Line Numbers", ToggleLineNumbers
+          item "Toggle Annotations", ToggleAnnotations
         end
         sub_menu "Plugins" do
           item "Plugin Manager", PluginManagerUi::OpenCommand

data/plugins/tree_view_swt/lib/tree_view_swt.rb

@@ -21,6 +21,7 @@ module Redcar
       
       if @model.tree_controller
         @viewer.add_tree_listener(@viewer.getControl, TreeListener.new)
+        @viewer.add_double_click_listener(DoubleClickListener.new)
         @viewer.add_open_listener(OpenListener.new(@model.tree_controller))
       end
       
@@ -65,6 +66,20 @@ module Redcar
     
     class DoubleClickListener
       def double_click(e)
+
+        double_clicked_element = e.get_viewer.get_selection.get_first_element
+
+        #do nothing for leaves
+        return if double_clicked_element.leaf?
+
+        viewer = e.get_viewer
+        node_is_expanded = viewer.getExpandedState(double_clicked_element) 
+
+        if node_is_expanded
+          viewer.collapseToLevel(double_clicked_element, 1)
+        else
+          viewer.expandToLevel(double_clicked_element, 1)
+        end
       end
     end
     

data/textmate/Bundles/Cucumber.tmbundle/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>
@@ -18,10 +18,10 @@
 			<string>Scenario:</string>
 			<string>Scenario Outline:</string>
 			<string>Given</string>
-			<string>GivenScenario</string>
 			<string>Then</string>
 			<string>When</string>
 			<string>And</string>
+			<string>But</string>
 		</array>
 	</dict>
 	<key>uuid</key>

data/textmate/Bundles/Cucumber.tmbundle/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>

data/textmate/Bundles/Cucumber.tmbundle/Syntaxes/Cucumber_Plain_Text_Feature.tmLanguage

@@ -7,9 +7,9 @@
 		<string>feature</string>
 	</array>
 	<key>firstLineMatch</key>
-	<string>Arwedd|Característica|Crikey|Egenskab|Egenskap|Feature|Fitur|Fonctionnalité|Funcionalidade|Functionalitate|Functionaliteit|Funcționalitate|Funkcionalitāte|Fīča|Funktionalität|Funzionalità|Jellemző|OH HAI|Omadus|Ominaisuus|Požadavek|Požiadavka|Savybė|Tính năng|Właściwość|Функционал|Функционалност|תכונה|خاصية|フィーチャ|機能|功能|기능(.*)</string>
+	<string>기능|機能|功能|フィーチャ|خاصية|תכונה|Функционалност|Функционал|Особина|Могућност|Özellik|Właściwość|Tính năng|Savybė|Požiadavka|Požadavek|Osobina|Ominaisuus|Omadus|OH HAI|Mogućnost|Mogucnost|Jellemző|Fīča|Funzionalità|Funktionalität|Funkcionalnost|Funkcionalitāte|Funcționalitate|Functionaliteit|Functionalitate|Funcionalitat|Funcionalidade|Fonctionnalité|Fitur|Feature|Egenskap|Egenskab|Crikey|Característica|Arwedd(.*)</string>
 	<key>foldingStartMarker</key>
-	<string>^\s*\b(Cenário|Cenario|Escenari|Escenario|Forgatókönyv|MISHUN|Mate|Scenarie|Scenarijus|Scenario|Scenariu|Scenariusz|Scenár|Scenārijs|Scénario|Scénář|Skenario|Stsenaarium|Szenario|Tapaus|Tình huống|Kịch bản|Сценарий|תרחיש|سيناريو|シナリオ|场景|場景|劇本|시나리오:)</string>
+	<string>^\s*\b(예|시나리오 개요|시나리오|배경|背景|場景大綱|場景|场景大纲|场景|劇本大綱|劇本|例子|例|テンプレ|シナリオテンプレート|シナリオテンプレ|シナリオアウトライン|シナリオ|サンプル|سيناريو مخطط|سيناريو|امثلة|الخلفية|תרחיש|תבנית תרחיש|רקע|דוגמאות|Тарих|Сценарији|Сценарио|Сценарий структураси|Сценарий|Структура сценарија|Структура сценария|Скица|Рамка на сценарий|Примери|Пример|Предыстория|Предистория|Позадина|Основа|Мисоллар|Концепт|Контекст|Значения|Örnekler|Założenia|Voorbeelden|Variantai|Tình huống|Tausta|Taust|Tapausaihio|Tapaus|Tapaukset|Szenariogrundriss|Szenario|Szablon scenariusza|Stsenaarium|Struktura scenarija|Skica|Skenario konsep|Skenario|Situācija|Senaryo taslağı|Senaryo|Scénář|Scénario|Schema dello scenario|Scenārijs pēc parauga|Scenārijs|Scenár|Scenariusz|Scenariul de şablon|Scenariul de sablon|Scenariu|Scenarios|Scenario Outline|Scenario Amlinellol|Scenario|Scenarijus|Scenariji|Scenarijaus šablonas|Scenarijai|Scenarij|Scenarie|Rerefons|Raamstsenaarium|Příklady|Példák|Príklady|Przykłady|Primjeri|Primeri|Primer|Pozadí|Pozadina|Pozadie|Plan du scénario|Plan du Scénario|Piemēri|Pavyzdžiai|Paraugs|Osnova scénáře|Osnova|Náčrt Scénáře|Náčrt Scenáru|Mate|MISHUN SRSLY|MISHUN|Kịch bản|Kontext|Konteksts|Kontekstas|Kontekst|Koncept|Khung tình huống|Khung kịch bản|Juhtumid|Háttér|Grundlage|Geçmiş|Forgatókönyv vázlat|Forgatókönyv|Exemplos|Exemples|Exemplele|Exempel|Examples|Esquema do Cenário|Esquema do Cenario|Esquema del escenario|Esquema de l\'escenari|Esempi|Escenario|Escenari|Enghreifftiau|Eksempler|Ejemplos|EXAMPLZ|Dữ liệu|Dasar|Contoh|Contexto|Contexte|Contesto|Condiţii|Conditii|Cobber|Cenário|Cenario|Cefndir|Bối cảnh|Blokes|Beispiele|Bakgrunn|Bakgrund|Baggrund|Background|B4|Antecedents|Antecedentes|All y\'all|Achtergrond|Abstrakt Scenario|Abstract Scenario)</string>
 	<key>foldingStopMarker</key>
 	<string>^\s*$</string>
 	<key>keyEquivalent</key>
@@ -20,7 +20,7 @@
 	<array>
 		<dict>
 			<key>include</key>
-			<string>#scenario_keyword</string>
+			<string>#feature_element_keyword</string>
 		</dict>
 		<dict>
 			<key>include</key>
@@ -32,11 +32,7 @@
 		</dict>
 		<dict>
 			<key>include</key>
-			<string>#line_keyword</string>
-		</dict>
-		<dict>
-			<key>include</key>
-			<string>#pending_keyword</string>
+			<string>#step_keyword</string>
 		</dict>
 		<dict>
 			<key>include</key>
@@ -64,7 +60,7 @@
 		</dict>
 		<dict>
 			<key>include</key>
-			<string>#cucumber_table</string>
+			<string>#table</string>
 		</dict>
 	</array>
 	<key>repository</key>
@@ -82,7 +78,7 @@
 			<key>match</key>
 			<string>\s*(#.*)</string>
 		</dict>
-		<key>cucumber_table</key>
+		<key>table</key>
 		<dict>
 			<key>begin</key>
 			<string>^\s*\|</string>
@@ -100,24 +96,6 @@
 				</dict>
 			</array>
 		</dict>
-		<key>description</key>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.language.cucumber.feature.description</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>string.language.cucumber.feature.description</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>^\s*(As an|As a|I want|So that|In order)(.*)</string>
-		</dict>
 		<key>feature_keyword</key>
 		<dict>
 			<key>captures</key>
@@ -125,83 +103,47 @@
 				<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>
-			<string>^\s*(Arwedd|Característica|Crikey|Egenskab|Egenskap|Feature|Fitur|Fonctionnalité|Funcionalidade|Functionalitate|Functionaliteit|Funcționalitate|Funkcionalitāte|Fīča|Funktionalität|Funzionalità|Jellemző|OH HAI|Omadus|Ominaisuus|Požadavek|Požiadavka|Savybė|Tính năng|Właściwość|Функционал|Функционалност|תכונה|خاصية|フィーチャ|機能|功能|기능:)(.*)\b</string>
+			<string>^\s*(기능|機能|功能|フィーチャ|خاصية|תכונה|Функционалност|Функционал|Особина|Могућност|Özellik|Właściwość|Tính năng|Savybė|Požiadavka|Požadavek|Osobina|Ominaisuus|Omadus|OH HAI|Mogućnost|Mogucnost|Jellemző|Fīča|Funzionalità|Funktionalität|Funkcionalnost|Funkcionalitāte|Funcționalitate|Functionaliteit|Functionalitate|Funcionalitat|Funcionalidade|Fonctionnalité|Fitur|Feature|Egenskap|Egenskab|Crikey|Característica|Arwedd):(.*)\b</string>
 		</dict>
-		<key>line_keyword</key>
+		<key>step_keyword</key>
 		<dict>
 			<key>captures</key>
 			<dict>
 				<key>1</key>
 				<dict>
 					<key>name</key>
-					<string>keyword.language.cucumber.feature.scenario.line</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>^\s*(A|AN|Aber|Achtergrond|Akkor|Ale|Aleshores|Allora|Alors|Als|And|And y'all|Antecedentes|Atunci|B4|BUT|Background|Baggrund|Bakgrund|Bakgrunn|Beispiele|Bet|Biết|Cho|But|But y'all|Bối cảnh|Cand|Cept|Cobber|Contesto|Contexte|Contexto|Contoh|Cuando|Când|DEN|Daca|Dacă|Dado|Dan|Dann|Dar|Dasar|Dato|De|Dengan|Donat|Duota|Dữ liệu|E|EXAMPLZ|Eeldades|Ejemplos|Eksempler|En|Enghreifftiau|Entonces|Então|Entao|Esempi|Et|Examples|Examples|Scenarios|Exempel|Exemples|Exemplos|Gegeben sei|Gegeven|Gitt|Given|Given y'all|Givet|Grundlage|Ha|Háttér|I|I CAN HAZ|Ir|Ja|Jeżeli|Juhtumid|Kad|Kai|Když|Ketika|Keď|Khi|Kontekstas|Konteksts|Situācija|Kui|Kuid|Kun|Lorsque|Ma|Maar|Mais|Majd|Maka|Mas|Men|Mutta|N|Nhưng|Niin|När|Når|Och|Og|Oletetaan|Ond|Oraz|Pak|Pavyzdžiai|Scenarijai|Variantai|Pero|Però|Piemēri|Paraugs|Pokiaľ|Pokud|Pozadie|Pozadí|Pryd|Przykłady|Príklady|Példák|Příklady|Quan|Quando|Rerefons|Si|Siis|Soit|Så|Tad|Tada|Tak|Tapaukset|Tapi|Taust|Tausta|Then|Then y'all|Thì|Un|Und|Voorbeelden|Và|WEN|Wenn|When|When y'all|Wtedy|Y|Ya gotta|Ya know how|Yna|Zakładając|Założenia|anrhegedig a|És|Și|Дадено|Допустим|Если|Значения|И|И|К тому же|Когато|Но|Но|А|Предистория|Предыстория|Примери|То|אבל|אז|אזי|בהינתן|דוגמאות|וגם|כאשר|רקע|اذاً|ثم|الخلفية|امثلة|بفرض|لكن|متى|عندما|و|かつ|しかし|但し|ならば|もし|但是|例|サンプル|例子|假如|假設|前提|当|當|而且|而且|並且|背景|那么|那麼|그러면|그리고|만일|배경|예|조건|하지만)\b</string>
-		</dict>
-		<key>pending_keyword</key>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.language.cucumber.feature.scenario.pending.line</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>string.language.cucumber.feature.scenario.pending.line</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>^\s*(Pending)(.*)\b</string>
-		</dict>
-		<key>scenario_keyword</key>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.language.cucumber.feature.scenario</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>string.language.cucumber.feature.scenario.title</string>
+					<string>keyword.language.gherkin.feature.step</string>
 				</dict>
 			</dict>
 			<key>match</key>
-			<string>^\s*(Cenário|Cenario|Escenari|Escenario|Forgatókönyv|MISHUN|Mate|Scenarie|Scenarijus|Scenario|Scenariu|Scenariusz|Scenár|Scenārijs|Scénario|Scénář|Skenario|Stsenaarium|Szenario|Tapaus|Tình huống|Kịch bản|Сценарий|תרחיש|سيناريو|シナリオ|场景|場景|劇本|시나리오:)(.*)</string>
+			<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_outline_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_outline</string>
+					<string>keyword.language.gherkin.feature.scenario</string>
 				</dict>
 				<key>2</key>
 				<dict>
 					<key>name</key>
-					<string>string.language.cucumber.feature.scenario_outline.title</string>
+					<string>string.language.gherkin.scenario.title.title</string>
 				</dict>
 			</dict>
 			<key>match</key>
-			<string>^\s*(Abstract Scenario|Abstrakt Scenario|All y'all|Blokes|Esquema de l\'escenari|Esquema del escenario|Esquema do Cenário|Esquema do Cenario|Forgatókönyv vázlat|Khung tình huống|Khung kịch bản|MISHUN SRSLY|Náčrt Scenáru|Náčrt Scénáře|Plan du Scénario|Raamstsenaarium|Scenarijaus šablonas|Scenario Outline|Scenārijs pēc parauga|Schema dello scenario|Skenario konsep|Szablon scenariusza|Szenariogrundriss|Tapausaihio|Рамка на сценарий|Структура сценария|תבנית תרחיש|سيناريو مخطط|シナリオアウトライン|シナリオテンプレート|テンプレ|シナリオテンプレ|场景大纲|場景大綱|劇本大綱|시나리오 개요)(.*)</string>
+			<string>^\s*(예|시나리오 개요|시나리오|배경|背景|場景大綱|場景|场景大纲|场景|劇本大綱|劇本|例子|例|テンプレ|シナリオテンプレート|シナリオテンプレ|シナリオアウトライン|シナリオ|サンプル|سيناريو مخطط|سيناريو|امثلة|الخلفية|תרחיש|תבנית תרחיש|רקע|דוגמאות|Тарих|Сценарији|Сценарио|Сценарий структураси|Сценарий|Структура сценарија|Структура сценария|Скица|Рамка на сценарий|Примери|Пример|Предыстория|Предистория|Позадина|Основа|Мисоллар|Концепт|Контекст|Значения|Örnekler|Założenia|Voorbeelden|Variantai|Tình huống|Tausta|Taust|Tapausaihio|Tapaus|Tapaukset|Szenariogrundriss|Szenario|Szablon scenariusza|Stsenaarium|Struktura scenarija|Skica|Skenario konsep|Skenario|Situācija|Senaryo taslağı|Senaryo|Scénář|Scénario|Schema dello scenario|Scenārijs pēc parauga|Scenārijs|Scenár|Scenariusz|Scenariul de şablon|Scenariul de sablon|Scenariu|Scenarios|Scenario Outline|Scenario Amlinellol|Scenario|Scenarijus|Scenariji|Scenarijaus šablonas|Scenarijai|Scenarij|Scenarie|Rerefons|Raamstsenaarium|Příklady|Példák|Príklady|Przykłady|Primjeri|Primeri|Primer|Pozadí|Pozadina|Pozadie|Plan du scénario|Plan du Scénario|Piemēri|Pavyzdžiai|Paraugs|Osnova scénáře|Osnova|Náčrt Scénáře|Náčrt Scenáru|Mate|MISHUN SRSLY|MISHUN|Kịch bản|Kontext|Konteksts|Kontekstas|Kontekst|Koncept|Khung tình huống|Khung kịch bản|Juhtumid|Háttér|Grundlage|Geçmiş|Forgatókönyv vázlat|Forgatókönyv|Exemplos|Exemples|Exemplele|Exempel|Examples|Esquema do Cenário|Esquema do Cenario|Esquema del escenario|Esquema de l\'escenari|Esempi|Escenario|Escenari|Enghreifftiau|Eksempler|Ejemplos|EXAMPLZ|Dữ liệu|Dasar|Contoh|Contexto|Contexte|Contesto|Condiţii|Conditii|Cobber|Cenário|Cenario|Cefndir|Bối cảnh|Blokes|Beispiele|Bakgrunn|Bakgrund|Baggrund|Background|B4|Antecedents|Antecedentes|All y\'all|Achtergrond|Abstrakt Scenario|Abstract Scenario):(.*)</string>
 		</dict>
 		<key>scenario_outline_variable</key>
 		<dict>
@@ -268,11 +210,11 @@
 				</dict>
 			</dict>
 			<key>match</key>
-			<string>(@[^@]+?)\b</string>
+			<string>(@[^@\r\n\t ]+)</string>
 		</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>