ver 2010.02 → 2010.08

data/config/plugin/autosave.rb

@@ -11,12 +11,9 @@
 
 VER.startup_hook do
   VER.when_inactive_for 1000 do
-    VER.buffers.each do |name, buffer|
-      text = buffer.text
-
-      next if text.pristine? || text.persisted?
-
-      VER::Methods::Save.file_save(text)
+    VER.buffers.each do |buffer|
+      next if !buffer.filename || buffer.pristine? || buffer.persisted?
+      buffer.save
     end
   end
 end

data/config/plugin/git.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2009 Michael Fellinger <m.fellinger@gmail.com>
+# Copyright (c) 2010 Michael Fellinger <m.fellinger@gmail.com>
 #
 # Description:
 #
@@ -15,13 +15,17 @@ module VER
   module Methods
     module Git
       def self.git_blame(text, count = 1)
-        line = text.index(:insert).y
+        line = text.index(:insert).line
         from, to = line - count, line + count
-        open_rxvt(text, "git blame #{text.filename} -L#{from},#{to}")
+        spawn_rxvt(text, "git blame #{text.filename} -L#{from},#{to}")
       end
 
-      def self.open_rxvt(text, command)
-        Preview.open_rxvt(text, command)
+      def self.spawn_rxvt(text, command)
+        Preview.spawn_rxvt(command)
+      end
+
+      def self.spawn_cmd(text, command)
+        `#{command} &`
       end
     end
   end
@@ -34,13 +38,15 @@ module VER
     minor_mode :git do
       handler Methods::Git
 
-      map :git_blame,                        %w[g i t b]
-      map [:open_rxvt, 'git add -p'],        %w[g i t a]
-      map [:open_rxvt, 'git commit'],        %w[g i t c]
-      map [:open_rxvt, 'git diff'  ],        %w[g i t d]
-      map [:open_rxvt, 'git pull'  ],        %w[g i t p u l]
-      map [:open_rxvt, 'git push'  ],        %w[g i t p u s]
-      map [:open_rxvt, 'git status | less'], %w[g i t s]
+      map :git_blame,                  'gitb'
+      map [:spawn_rxvt, 'git add -p'], 'gita'
+      map [:spawn_rxvt, 'git commit'], 'gitc'
+      map [:spawn_rxvt, 'git diff'  ], 'gitd'
+      map [:spawn_rxvt, 'git pull'  ], 'gitpul'
+      map [:spawn_rxvt, 'git push'  ], 'gitpus'
+      map [:spawn_rxvt, 'git status'], 'gitst'
+      map [:spawn_rxvt, 'tig'],        'gitt'
+      map [:spawn_cmd,  'gitk --all'], 'gitk'
     end
   end
 end

data/config/plugin/soma.rb

@@ -40,7 +40,7 @@ module VER
   when 'vim'
     minor_mode :soma do
       handler Methods::Soma
-      map :soma_buffer, %w[Control-c Control-c]
+      map :soma_buffer, '<Control-c><Control-c>'
     end
 
     minor_mode :control do

data/config/preferences/Apache.rb

@@ -1,6 +1,10 @@
 # Encoding: UTF-8
 
-[{name: "Completions: Directives",
+[{name: "Comments",
+  scope: "source.apache-config",
+  settings: {shellVariables: [{name: "TM_COMMENT_START", value: "# "}]},
+  uuid: "A65C8C91-5513-4A4A-94C2-DE914861BF1C"},
+ {name: "Completions: Directives",
   scope: "source.apache-config",
   settings: 
    {completions: 
@@ -391,21 +395,6 @@
       "Win32DisableAcceptEx",
       "XBitHack"]},
   uuid: "3A110F9B-69C1-4FEA-8B5A-B6CA9ED8F25B"},
- {name: "Miscellaneous",
-  scope: "source.apache-config",
-  settings: 
-   {shellVariables: [{name: "TM_DEFAULT_TAG", value: "VirtualHost"}],
-    smartTypingPairs: [["<", ">"]]},
-  uuid: "3FFEAB5C-E41D-466A-B253-98952059DC3B"},
- {name: "Symbol List: Virtual Host",
-  scope: "meta.toc-list.virtual-host.apache-config",
-  settings: 
-   {showInSymbolList: 1, symbolTransformation: "s/^\\s*/Host: /; s/\\s+/ /g"},
-  uuid: "2722AC57-58BC-4B78-9DA7-889D007D6EE7"},
- {name: "Comments",
-  scope: "source.apache-config",
-  settings: {shellVariables: [{name: "TM_COMMENT_START", value: "# "}]},
-  uuid: "A65C8C91-5513-4A4A-94C2-DE914861BF1C"},
  {name: "Completions: Module Identifiers",
   scope: "source.apache-config",
   settings: 
@@ -559,6 +548,12 @@
   scope: "meta.vhost.apache-config",
   settings: {shellVariables: [{name: "TM_DEFAULT_TAG", value: "Directory"}]},
   uuid: "3B71D5D6-E87D-4D12-B9D9-4D615C7A3072"},
+ {name: "Miscellaneous",
+  scope: "source.apache-config",
+  settings: 
+   {shellVariables: [{name: "TM_DEFAULT_TAG", value: "VirtualHost"}],
+    smartTypingPairs: [["<", ">"]]},
+  uuid: "3FFEAB5C-E41D-466A-B253-98952059DC3B"},
  {name: "Symbol List: Directory",
   scope: "meta.toc-list.directory.apache-config",
   settings: 
@@ -582,4 +577,9 @@
   settings: 
    {showInSymbolList: 1,
     symbolTransformation: "s/^\\s*//; s/\\s+/ /g; s/['\"]//g; s/^/   Loc: /"},
-  uuid: "368BB45D-F7FE-4F22-A07E-9B57304CCCE4"}]
+  uuid: "368BB45D-F7FE-4F22-A07E-9B57304CCCE4"},
+ {name: "Symbol List: Virtual Host",
+  scope: "meta.toc-list.virtual-host.apache-config",
+  settings: 
+   {showInSymbolList: 1, symbolTransformation: "s/^\\s*/Host: /; s/\\s+/ /g"},
+  uuid: "2722AC57-58BC-4B78-9DA7-889D007D6EE7"}]

data/config/preferences/AppleScript.rb

@@ -8,6 +8,11 @@
       {name: "TM_COMMENT_START_2", value: "(* "},
       {name: "TM_COMMENT_END_2", value: " *)"}]},
   uuid: "C293E159-C4ED-4757-AD60-82E068A13962"},
+ {name: "Completion: Application Name",
+  scope: "string.quoted.double.application-name.applescript",
+  settings: 
+   {completionCommand: "ps -xco command|grep \"^$TM_CURRENT_WORD\"|sort|uniq"},
+  uuid: "F4324AFF-97E6-4D2D-B425-B24E99383AA3"},
  {name: "Indent",
   scope: "source.applescript",
   settings: 
@@ -16,11 +21,6 @@
      "(?x)\n\t\t^\\s*\n\t\t(\n\t\t tell \\s+ (?! .* \\b(to)\\b) .*\n\t\t|tell\\b.*?\\bto\\ tell \\s+ (?! .* \\b(to)\\b) .*\n\t\t|using\\ terms\\ from\\b.*\n\t\t|if\\b .* \\bthen\\b\n\t\t|else\\b .*\n\t\t|repeat\\b .*\n\t\t|( on | to ) \\b .*\n\t\t|try\n\t\t|with \\s+ timeout\\b .*\n\t\t|ignoring\\b .*\n\t\t)\\s*(--.*?)?$\n\t",
     indentNextLinePattern: "¬$"},
   uuid: "8F2DBD25-3DED-44CE-A902-05DCBC185A99"},
- {name: "Completion: Application Name",
-  scope: "string.quoted.double.application-name.applescript",
-  settings: 
-   {completionCommand: "ps -xco command|grep \"^$TM_CURRENT_WORD\"|sort|uniq"},
-  uuid: "F4324AFF-97E6-4D2D-B425-B24E99383AA3"},
  {name: "Smart Typing Pairs / Highlight Pairs",
   scope: "source.applescript",
   settings: 

data/config/preferences/Bundle Development.rb

@@ -1,12 +1,12 @@
 # Encoding: UTF-8
 
-[{name: "Symbol List (Repository Separator)",
-  scope: "support.constant.repository.tm-grammar",
+[{name: "Symbol List",
+  scope: 
+   "source.plist.tm-grammar constant.other.scope - (meta.dictionary.repository|meta.value-pair.scopename)",
   settings: 
    {showInSymbolList: 1,
-    symbolTransformation: 
-     "\n\t\ts/^repository$/-/;\t\t\t\t# repository = separator\n\t"},
-  uuid: "1515233D-64A7-48B3-A032-895A2A2E9789"},
+    symbolTransformation: "\n\t\ts/^punctuation.*$//;\n\t"},
+  uuid: "985E70CD-0539-4E00-B0B9-F38D9789B8F3"},
  {name: "Symbol List (Repository Item Scopes)",
   scope: 
    "source.plist.tm-grammar meta.value-pair.repository-item constant.other.scope - meta.dictionary.captures",
@@ -21,10 +21,10 @@
    {showInSymbolList: 1,
     symbolTransformation: "\n\t\ts/^/#/;\t\t\t\t# start with \"#\"\n\t"},
   uuid: "6F3A4873-C006-471C-BC7E-7EF289C685B4"},
- {name: "Symbol List",
-  scope: 
-   "source.plist.tm-grammar constant.other.scope - (meta.dictionary.repository|meta.value-pair.scopename)",
+ {name: "Symbol List (Repository Separator)",
+  scope: "support.constant.repository.tm-grammar",
   settings: 
    {showInSymbolList: 1,
-    symbolTransformation: "\n\t\ts/^punctuation.*$//;\n\t"},
-  uuid: "985E70CD-0539-4E00-B0B9-F38D9789B8F3"}]
+    symbolTransformation: 
+     "\n\t\ts/^repository$/-/;\t\t\t\t# repository = separator\n\t"},
+  uuid: "1515233D-64A7-48B3-A032-895A2A2E9789"}]

data/config/preferences/C.rb

@@ -1,9 +1,21 @@
 # Encoding: UTF-8
 
-[{name: "Spell Checking: Disable for Include Strings",
-  scope: "meta.preprocessor.c.include string.quoted",
-  settings: {spellChecking: 0},
-  uuid: "DC32505E-226B-409A-B3C3-8FC88BF4A131"},
+[{name: "Comments",
+  scope: "source.c, source.c++, source.objc, source.objc++",
+  settings: 
+   {shellVariables: 
+     [{name: "TM_COMMENT_START", value: "// "},
+      {name: "TM_COMMENT_START_2", value: "/*"},
+      {name: "TM_COMMENT_END_2", value: "*/"},
+      {name: "TM_COMMENT_DISABLE_INDENT_2", value: "yes"}]},
+  uuid: "38DBCCE5-2005-410C-B7D7-013097751AC8"},
+ {name: "Header Completion (System)",
+  scope: "meta.preprocessor.c.include string.quoted.other.lt-gt.include",
+  settings: 
+   {completionCommand: 
+     "#!/usr/bin/env ruby -wKU\n\nUSR_HEAD  = Regexp.escape \"#include \\\"...\\\" search starts here:\\n\"\nSYS_HEAD  = Regexp.escape \"#include <...> search starts here:\\n\"\nFOOTER    = Regexp.escape \"End of search list.\"\n\nCOMPILER  = {\n  \"source.c\"      => \"gcc 2>&1 >/dev/null -E -v -x c /dev/null\",\n  \"source.c++\"    => \"g++ 2>&1 >/dev/null -E -v -x c++ /dev/null\",\n  \"source.objc\"   => \"gcc 2>&1 >/dev/null -E -v -x objective-c /dev/null\",\n  \"source.objc++\" => \"g++ 2>&1 >/dev/null -E -v -x objective-c++ /dev/null\",\n}\n\ndef compiler_search_path(domain = :system)\n  scope        = \"source.c\"\n  scope        = $& if ENV[\"TM_SCOPE\"] =~ /source.(obj)?c(\\+\\+)?/\n\n  res = IO.popen(COMPILER[scope]) { |io| io.read }\n  if res =~ /\#{USR_HEAD}(.*)\#{SYS_HEAD}(.*)\#{FOOTER}/m\n\tcase domain\n\t  when :system  then $2\n\t  when :user    then $1 + \" .\\n\"\n\t  when :all     then $1 + \" .\\n\" + $2\n\tend.scan(/ (\\S*)(?: \\(framework directory\\)$)?/).flatten\n  else\n\tabort \"Failed to parse compiler output.\\nCommand: \" + COMPILER[scope]\n  end\nend\n\ndef user_search_path(domain = :system)\n  usr = ENV[\"TM_USR_HEADER_PATH\"].to_s\n  sys = ENV[\"TM_SYS_HEADER_PATH\"].to_s\n\n  res = case domain\n\twhen :system  then sys\n\twhen :user    then usr\n\twhen :all     then \"\#{usr}:\#{sys}\"\n  end.split(\":\")\n  res.delete(\"\")\n\n  res.empty? ? nil : res\nend\n\ndef expand_dirs(entries)\n\tentries.map do |entry|\n\t\tif entry =~ /(.*)\\.framework$/\n\t\t\tif File.exists? \"\#$1.framework/Headers/\#$1.h\"\n\t\t\t\t\"\#$1/\#$1.h\"\n\t\t\telsif File.exists? \"\#$1.framework/Headers\"\n\t\t\t\tDir[\"\#$1.framework/Headers/[A-Za-z]*.h\"].sort.map do |e|\n\t\t\t\t\te.sub(/\\.framework\\/Headers\\//, \"/\")\n\t\t\t\tend\n\t\t\telse\n\t\t\t\t[ ]\n\t\t\tend\n\t\telsif File.directory? entry\n\t\t\tDir[entry + \"/[A-Za-z]*.h\"].sort\n\t\telse\n\t\t\tentry\n\t\tend\n\tend\nend\n\npartial_word = ENV[\"TM_CURRENT_WORD\"]\n\ndirs = user_search_path(:system) || compiler_search_path(:system)\nres = [ ] \ndirs.each do |dir|\n\tDir.chdir(dir) { res << expand_dirs(Dir[partial_word + \"*\"].sort) }\nend\nputs res.flatten.join(\"\\n\")",
+    disableDefaultCompletion: 1},
+  uuid: "9136716A-CE06-4801-ABC9-3D64300869F8"},
  {name: "Header Completion (User)",
   scope: "meta.preprocessor.c.include string.quoted.double",
   settings: 
@@ -11,12 +23,6 @@
      "find \"$TM_DIRECTORY\" -name \"$TM_CURRENT_WORD*.h\" -maxdepth 2 -exec basename \"{}\" \\;|sort",
     disableDefaultCompletion: 1},
   uuid: "66EE7D45-6AA0-4AB9-9699-A3DF4E2B9AE7"},
- {name: "Typing Pairs: Include Statements",
-  scope: "meta.preprocessor.c.include",
-  settings: 
-   {highlightPairs: [["\"", "\""], ["<", ">"]],
-    smartTypingPairs: [["\"", "\""], ["<", ">"]]},
-  uuid: "1EACF554-A30C-44B0-B97A-11E3FA995045"},
  {name: "Indentation Rules",
   scope: "source.c, source.c++, source.objc, source.objc++",
   settings: 
@@ -29,26 +35,18 @@
     unIndentedLinePattern: 
      "^\\s*((/\\*|\\*/|//|#|template\\b.*?>(?!\\(.*\\))|@protocol|@optional|@interface(?!.*\\{)|@implementation|@end).*)?$"},
   uuid: "02EB44C6-9203-4F4C-BFCB-7E3360B12812"},
- {name: "Typing Pairs: Template/Cast",
-  scope: "storage.type.c++.template, keyword.operator.c++.cast",
-  settings: {highlightPairs: [["<", ">"]], smartTypingPairs: [["<", ">"]]},
-  uuid: "47DD44E6-B4F5-4C2E-BC62-C6ACEBC02A0D"},
- {name: "Comments",
-  scope: "source.c, source.c++, source.objc, source.objc++",
+ {name: "Indentation Rules (Comments)",
+  scope: "comment.block",
   settings: 
-   {shellVariables: 
-     [{name: "TM_COMMENT_START", value: "// "},
-      {name: "TM_COMMENT_START_2", value: "/*"},
-      {name: "TM_COMMENT_END_2", value: "*/"},
-      {name: "TM_COMMENT_DISABLE_INDENT_2", value: "yes"}]},
-  uuid: "38DBCCE5-2005-410C-B7D7-013097751AC8"},
- {name: "Header Completion (System)",
-  scope: "meta.preprocessor.c.include string.quoted.other.lt-gt.include",
-  settings: 
-   {completionCommand: 
-     "#!/usr/bin/env ruby -wKU\n\nUSR_HEAD  = Regexp.escape \"#include \\\"...\\\" search starts here:\\n\"\nSYS_HEAD  = Regexp.escape \"#include <...> search starts here:\\n\"\nFOOTER    = Regexp.escape \"End of search list.\"\n\nCOMPILER  = {\n  \"source.c\"      => \"gcc 2>&1 >/dev/null -E -v -x c /dev/null\",\n  \"source.c++\"    => \"g++ 2>&1 >/dev/null -E -v -x c++ /dev/null\",\n  \"source.objc\"   => \"gcc 2>&1 >/dev/null -E -v -x objective-c /dev/null\",\n  \"source.objc++\" => \"g++ 2>&1 >/dev/null -E -v -x objective-c++ /dev/null\",\n}\n\ndef compiler_search_path(domain = :system)\n  scope        = \"source.c\"\n  scope        = $& if ENV[\"TM_SCOPE\"] =~ /source.(obj)?c(\\+\\+)?/\n\n  res = IO.popen(COMPILER[scope]) { |io| io.read }\n  if res =~ /\#{USR_HEAD}(.*)\#{SYS_HEAD}(.*)\#{FOOTER}/m\n\tcase domain\n\t  when :system  then $2\n\t  when :user    then $1 + \" .\\n\"\n\t  when :all     then $1 + \" .\\n\" + $2\n\tend.scan(/ (\\S*)(?: \\(framework directory\\)$)?/).flatten\n  else\n\tabort \"Failed to parse compiler output.\\nCommand: \" + COMPILER[scope]\n  end\nend\n\ndef user_search_path(domain = :system)\n  usr = ENV[\"TM_USR_HEADER_PATH\"].to_s\n  sys = ENV[\"TM_SYS_HEADER_PATH\"].to_s\n\n  res = case domain\n\twhen :system  then sys\n\twhen :user    then usr\n\twhen :all     then \"\#{usr}:\#{sys}\"\n  end.split(\":\")\n  res.delete(\"\")\n\n  res.empty? ? nil : res\nend\n\ndef expand_dirs(entries)\n\tentries.map do |entry|\n\t\tif entry =~ /(.*)\\.framework$/\n\t\t\tif File.exists? \"\#$1.framework/Headers/\#$1.h\"\n\t\t\t\t\"\#$1/\#$1.h\"\n\t\t\telsif File.exists? \"\#$1.framework/Headers\"\n\t\t\t\tDir[\"\#$1.framework/Headers/[A-Za-z]*.h\"].sort.map do |e|\n\t\t\t\t\te.sub(/\\.framework\\/Headers\\//, \"/\")\n\t\t\t\tend\n\t\t\telse\n\t\t\t\t[ ]\n\t\t\tend\n\t\telsif File.directory? entry\n\t\t\tDir[entry + \"/[A-Za-z]*.h\"].sort\n\t\telse\n\t\t\tentry\n\t\tend\n\tend\nend\n\npartial_word = ENV[\"TM_CURRENT_WORD\"]\n\ndirs = user_search_path(:system) || compiler_search_path(:system)\nres = [ ] \ndirs.each do |dir|\n\tDir.chdir(dir) { res << expand_dirs(Dir[partial_word + \"*\"].sort) }\nend\nputs res.flatten.join(\"\\n\")",
-    disableDefaultCompletion: 1},
-  uuid: "9136716A-CE06-4801-ABC9-3D64300869F8"},
+   {decreaseIndentPattern: "(?=not)possible",
+    increaseIndentPattern: "(?=not)possible",
+    indentNextLinePattern: "(?=not)possible",
+    unIndentedLinePattern: "(?=not)possible"},
+  uuid: "56BF3367-130A-4AA1-A136-755CB3702503"},
+ {name: "Spell Checking: Disable for Include Strings",
+  scope: "meta.preprocessor.c.include string.quoted",
+  settings: {spellChecking: 0},
+  uuid: "DC32505E-226B-409A-B3C3-8FC88BF4A131"},
  {bundleUUID: "4675A940-6227-11D9-BFB1-000D93589AF6",
   name: "Symbol List: Indent Class Methods",
   scope: "meta.class-struct-block.c++ entity.name.function",
@@ -57,4 +55,14 @@
  {name: "Symbol List: Prefix Banner Items",
   scope: "meta.toc-list.banner",
   settings: {symbolTransformation: "\n   s/^\\s+/# /;\n   s/^=+$/-/;\n   "},
-  uuid: "A8E4E48A-81F3-4DB7-A7A2-88662C06E011"}]
+  uuid: "A8E4E48A-81F3-4DB7-A7A2-88662C06E011"},
+ {name: "Typing Pairs: Include Statements",
+  scope: "meta.preprocessor.c.include",
+  settings: 
+   {highlightPairs: [["\"", "\""], ["<", ">"]],
+    smartTypingPairs: [["\"", "\""], ["<", ">"]]},
+  uuid: "1EACF554-A30C-44B0-B97A-11E3FA995045"},
+ {name: "Typing Pairs: Template/Cast",
+  scope: "storage.type.c++.template, keyword.operator.c++.cast",
+  settings: {highlightPairs: [["<", ">"]], smartTypingPairs: [["<", ">"]]},
+  uuid: "47DD44E6-B4F5-4C2E-BC62-C6ACEBC02A0D"}]

data/config/preferences/CoffeeScript.rb

@@ -0,0 +1,28 @@
+# Encoding: UTF-8
+
+[{name: "Comments",
+  scope: "source.coffee",
+  settings: 
+   {shellVariables: 
+     [{name: "TM_COMMENT_START", value: "# "},
+      {name: "TM_COMMENT_START_2", value: "###"},
+      {name: "TM_COMMENT_END_2", value: "###"}]},
+  uuid: "0A92C6F6-4D73-4859-B38C-4CC19CBC191F"},
+ {name: "Indent",
+  scope: "source.coffee",
+  settings: 
+   {decreaseIndentPattern: "^\\s*(\\}|\\])$",
+    increaseIndentPattern: 
+     "(?x)\n\t\t^\\s*\n\t\t(.*class\n\t\t|[a-zA-Z\\$_](\\w|\\$|:|\\.)*\\s*(?=\\:(\\s*\\(.*\\))?\\s*((=|-)>\\s*$)) # function that is not one line\n\t\t|[a-zA-Z\\$_](\\w|\\$|\\.)*\\s*(?=(?!\\::)\\:(?!(\\s*\\(.*\\))?\\s*((=|-)>))):\\s*((if|while)(?!.*?then)|for|$) # assignment using multiline if/while/for\n\t\t|(if|while)(?!.*?then)|for\n\t\t|.*\\{$\n\t\t|.*\\[$)"},
+  uuid: "C5D6C716-12FE-4CE8-A916-6CABEDE8AFE7"},
+ {name: "Symbol List: Method",
+  scope: "source.coffee meta.function",
+  settings: 
+   {showInSymbolList: 1,
+    symbolTransformation: 
+     "s/^(\\s*)([a-zA-Z\\$_](\\w|\\$|:|\\.))*\\s*:/$1$2/"},
+  uuid: "419D24D8-0DD6-4D9A-8CA0-6D9CD740BEEC"},
+ {name: "Symbol List: Method Instance",
+  scope: "source.coffee entity.name.type.instance",
+  settings: {showInSymbolList: 0},
+  uuid: "B087AF2F-8946-4EA9-8409-49E7C4A2EEF0"}]

data/config/preferences/ColdFusion.rb

@@ -1,13 +1,13 @@
 # Encoding: UTF-8
 
-[{name: "Smart Typing Pairs",
-  scope: "meta.scope.output.cfm, string.quoted.double.cfm",
-  settings: {smartTypingPairs: [["#", "#"]]},
-  uuid: "862EDD04-D606-4EDB-8D01-425D8024CF1B"},
- {name: "Comments",
+[{name: "Comments",
   scope: "text.html.cfm",
   settings: 
    {shellVariables: 
      [{name: "TM_COMMENT_START", value: "<!--- "},
       {name: "TM_COMMENT_END", value: " --->"}]},
-  uuid: "904C79F1-5730-4D8D-986A-0D71587B2C1F"}]
+  uuid: "904C79F1-5730-4D8D-986A-0D71587B2C1F"},
+ {name: "Smart Typing Pairs",
+  scope: "meta.scope.output.cfm, string.quoted.double.cfm",
+  settings: {smartTypingPairs: [["#", "#"]]},
+  uuid: "862EDD04-D606-4EDB-8D01-425D8024CF1B"}]

data/config/preferences/Cucumber.rb

@@ -0,0 +1,40 @@
+# Encoding: UTF-8
+
+[{name: "Comments",
+  scope: "text.gherkin.feature",
+  settings: 
+   {shellVariables: 
+     [{name: "TM_COMMENT_START", value: "# "},
+      {name: "TM_COMMENT_START_2", value: "=begin\n"},
+      {name: "TM_COMMENT_END_2", value: "=end\n"}]},
+  uuid: "75E08730-A1D7-4D0F-B594-EAFD9DD49B4D"},
+ {name: "Gherkin Completions",
+  scope: "text.gherkin.feature",
+  settings: 
+   {completions: 
+     ["As a",
+      "As an",
+      "I want to",
+      "So that",
+      "Story:",
+      "Scenario:",
+      "Scenario Outline:",
+      "Given",
+      "Then",
+      "When",
+      "And",
+      "But"]},
+  uuid: "8B547854-6A6A-4E45-B51E-9324F0E9D364"},
+ {name: "Symbol list: Scenario",
+  scope: "text.gherkin.feature string.language.gherkin.scenario.title",
+  settings: {showInSymbolList: 1, symbolTransformation: "s/^\\s*:\\s*/ /"},
+  uuid: "90F0D309-13C4-4286-88DE-60F61DDEF094"},
+ {name: "Symbol list: Steps with Regexp",
+  scope: "source.ruby.rspec.cucumber.steps string.regexp.step.cucumber",
+  settings: {showInSymbolList: 1},
+  uuid: "0843B907-3EC2-4F51-A1F6-85EFDB88464B"},
+ {name: "Symbol list: Steps with String",
+  scope: 
+   "source.ruby.rspec.cucumber.steps string.quoted.step.cucumber.classic.ruby",
+  settings: {showInSymbolList: 1},
+  uuid: "41A25845-3142-47FE-A225-FDF453C1D59D"}]

data/config/preferences/Diff.rb

@@ -8,15 +8,15 @@
   scope: "markup.deleted",
   settings: {background: "#FF3D3D", foreground: "#FFFFFF"},
   uuid: "FFF345C5-D3B4-4975-A610-69CC645FEE7C"},
+ {name: "Style: Header",
+  scope: "meta.diff.header",
+  settings: {background: "#5685E3", foreground: "#FFFFFF"},
+  uuid: "ED5636AE-09EF-46C4-A4F8-B88F701763E2"},
  {name: "Style: Index",
   scope: "meta.diff.index",
   settings: 
    {background: "#3467D1", fontStyle: "italic", foreground: "#FFFFFF"},
   uuid: "F9C2B477-B6F7-4951-953B-32BFEF121F7C"},
- {name: "Style: Header",
-  scope: "meta.diff.header",
-  settings: {background: "#5685E3", foreground: "#FFFFFF"},
-  uuid: "ED5636AE-09EF-46C4-A4F8-B88F701763E2"},
  {name: "Style: Inserted",
   scope: "markup.inserted",
   settings: {background: "#73FF65", foreground: "#000000"},

data/config/preferences/Eiffel.rb

@@ -1,6 +1,10 @@
 # Encoding: UTF-8
 
-[{name: "Typing pairs",
+[{name: "Comments",
+  scope: "source.eiffel",
+  settings: {shellVariables: [{name: "TM_COMMENT_START", value: "-- "}]},
+  uuid: "9D16332B-96F7-4631-92CD-B981ABC180E9"},
+ {name: "Typing pairs",
   scope: "source.eiffel",
   settings: 
    {highlightPairs: [["\"", "\""], ["<", ">"], ["(", ")"]],
@@ -13,8 +17,4 @@
      "^\\s*(index|class|inherit|end|else|elseif|when|require|ensure|invariant|rescue|export|undefine|redefine|select|variant|until|loop)",
     increaseIndentPattern: 
      "^\\s*(index|class|inherit|do|if\\s.*\\sthen|else|elseif\\s.*\\sthen|inspect|when\\s.*\\sthen|require|ensure|invariant|rescue|check|debug|rename|export|undefine|redefine|select|local|from|variant|until|loop)\\s*$"},
-  uuid: "F2662AB4-3EF8-4282-A485-7138F1486B8E"},
- {name: "Comments",
-  scope: "source.eiffel",
-  settings: {shellVariables: [{name: "TM_COMMENT_START", value: "-- "}]},
-  uuid: "9D16332B-96F7-4631-92CD-B981ABC180E9"}]
+  uuid: "F2662AB4-3EF8-4282-A485-7138F1486B8E"}]

data/config/preferences/Erlang.rb

@@ -1,9 +1,23 @@
 # Encoding: UTF-8
 
-[{name: "Function Symbols",
+[{name: "Comments",
+  scope: "source.erlang",
+  settings: 
+   {shellVariables: 
+     [{name: "TM_COMMENT_START", value: "% "},
+      {name: "TM_COMMENT_MODE", value: "line"}]},
+  uuid: "08AFD8DA-AEFF-4979-98BA-21D5B0A59D33"},
+ {name: "Function Symbols",
   scope: "source.erlang entity.name.function.definition",
   settings: {showInSymbolList: 1, symbolTransformation: "s,$,/,"},
   uuid: "7D7FE91B-0543-4F95-8D99-AF393226415C"},
+ {name: "Indentation Rules",
+  scope: "source.erlang",
+  settings: 
+   {decreaseIndentPattern: "^\\s*\\b(end)\\b",
+    increaseIndentPattern: 
+     "^[^%]*(\\b(if|case|receive|after|fun|try|catch|begin|query)\\b(?!.*\\b(end)\\b.*))|(->(\\s*%.*)?$)"},
+  uuid: "34E0D602-ADAE-43F9-A661-0323A821AB75"},
  {name: "Macro Symbols",
   scope: "source.erlang entity.name.function.macro.definition",
   settings: {showInSymbolList: 1, symbolTransformation: "s/^/?/"},
@@ -20,18 +34,4 @@
   scope: 
    "source.erlang entity.name.function, source.erlang entity.name.type.class",
   settings: {showInSymbolList: "0"},
-  uuid: "AE84FFDF-2D5A-4331-A301-6CF34CF26CD8"},
- {name: "Comments",
-  scope: "source.erlang",
-  settings: 
-   {shellVariables: 
-     [{name: "TM_COMMENT_START", value: "% "},
-      {name: "TM_COMMENT_MODE", value: "line"}]},
-  uuid: "08AFD8DA-AEFF-4979-98BA-21D5B0A59D33"},
- {name: "Indentation Rules",
-  scope: "source.erlang",
-  settings: 
-   {decreaseIndentPattern: "^\\s*\\b(end)\\b",
-    increaseIndentPattern: 
-     "^[^%]*(\\b(if|case|receive|after|fun|try|catch|begin|query)\\b(?!.*\\b(end)\\b.*))|(->(\\s*%.*)?$)"},
-  uuid: "34E0D602-ADAE-43F9-A661-0323A821AB75"}]
+  uuid: "AE84FFDF-2D5A-4331-A301-6CF34CF26CD8"}]