Merge branch 'release/v1.5.0'

1c-query.tmLanguage

@@ -21,8 +21,10 @@
       <dict>
         <key>name</key>
         <string>comment.line.double-slash.sdbl</string>
-        <key>match</key>
-        <string>(//.*)</string>
+        <key>begin</key>
+        <string>//</string>
+        <key>end</key>
+        <string>$</string>
       </dict>
       <dict>
         <key>name</key>

1c.tmLanguage

@@ -491,8 +491,10 @@
           <dict>
             <key>name</key>
             <string>comment.line.double-slash.bsl</string>
-            <key>match</key>
-            <string>(^\s*//.*$)</string>
+            <key>begin</key>
+            <string>^\s*//</string>
+            <key>end</key>
+            <string>$</string>
           </dict>
           <dict>
             <key>name</key>
@@ -519,8 +521,10 @@
           <dict>
             <key>name</key>
             <string>comment.line.double-slash.bsl</string>
-            <key>match</key>
-            <string>(//.*$)</string>
+            <key>begin</key>
+            <string>//</string>
+            <key>end</key>
+            <string>$</string>
           </dict>
           <dict>
             <key>name</key>

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.5.0
+
+* Добавлена возможность автоматически разворачивать конструкции вида `++`/`+=` и подобных по нажатию на `Tab`
+
 ## 1.4.12
 
 * В варианты запуска скриптов oscript добавлен режим `-check`

Default.sublime-keymap

@@ -54,5 +54,25 @@
           "operand": false
         }
       ]
+  },
+  {
+    "keys": [
+      "tab"
+    ],
+    "command": "expand_abbreviation",
+    "context":
+      [
+        {
+          "key": "selection_empty",
+          "operator": "equal",
+          "operand": true,
+          "match_all": false
+        },
+        {
+          "key": "selector",
+          "operator": "equal",
+          "operand": "source.bsl"
+        }
+      ]
   }
 ]

expand_abbreviation.py

@@ -0,0 +1,49 @@
+import sublime
+import sublime_plugin
+import re
+
+
+class ExpandAbbreviationCommand(sublime_plugin.TextCommand):
+
+    def run(self, edit):
+        view = sublime.active_window().active_view()
+        r = self.view.sel()[0]
+        empty_region = r.empty()
+        line = view.substr(sublime.Region(r.b, r.b - 2))
+        if empty_region and (line == "++" or
+                             line == "--" or
+                             line == "+=" or
+                             line == "-=" or
+                             line == "*=" or
+                             line == "/=" or
+                             line == "%="):
+            begin_line = self.view.full_line(r).a
+            region_text = sublime.Region(begin_line, self.view.sel()[0].b - 2)
+            prec_text = view.substr(region_text)
+            if re.search(r'([\w]+\s?)$', prec_text):
+                word = re.search(r'([\w]+\s?)$', prec_text).group(1)
+                postfix = ""
+                if line == "++":
+                    postfix = " + 1;"
+                elif line == "--":
+                    postfix = " - 1;"
+                elif line == "+=":
+                    postfix = " + "
+                elif line == "-=":
+                    postfix = " - "
+                elif line == "*=":
+                    postfix = " * "
+                elif line == "/=":
+                    postfix = " / "
+                elif line == "%=":
+                    postfix = " % "
+                snippet = word + " = " + word + postfix
+                begin_word = self.view.sel()[0].b - len(word) - 2
+                region = sublime.Region(begin_word, self.view.sel()[0].b)
+                self.view.replace(edit, region, snippet)
+                return
+        elif not empty_region:
+            self.view.run_command('indent')
+            return
+
+        self.view.insert(edit, self.view.sel()[0].b, '\t')