v.1.0.3 syntax recursion error fix, users autocompletions

Author: tosher

README.md

@@ -67,6 +67,12 @@ Example:
 }
 ```
 
+## Hints
+For auto-completions show, add option to syntax specific settings (markdown):
+
+```
+"auto_complete_triggers": [ {"selector": "text.html.markdown", "characters": "#!@"} ]
+```
 
 ## External dependencies
 * [Python Gitlab](http://python-gitlab.readthedocs.io/en/stable/index.html)

StGitlab.sublime-syntax

@@ -10,31 +10,37 @@ contexts:
     - include: block_meta
     - include: inline
 
-  # block_markdown2:
-  #   - match: ^(─{3,})$
-  #     captures:
-  #       1: comment.1.tag.stgitlab
-  #     push:
-  #       - meta_include_prototype: false
-  #       - meta_content_scope: meta.environment.embedded.text.html.markdown.gfm.stgitlab text.html.markdown.gfm.embedded
-  #       - match: (\1)
-  #         pop: true
-  #       - include: scope:text.html.markdown.gfm
-
+  # After Build 3153
+  # https://forum.sublimetext.com/t/dev-build-3153/33014/8
+  # https://github.com/sublimehq/Packages/commit/72bd6bdae9e185d9ebedab9679a55cd8ae8c3e60
   block_markdown:
     - match: (^┌─{3,}$)
       captures:
         1: markup.other.special.gitlab
-      push: Packages/MarkdownEditing/Markdown.sublime-syntax
-      with_prototype:
-        - match: (?=^└─{3,}\n)
-          captures:
-            1: markup.other.special.gitlab
-          pop: true
+      # embed: Packages/MarkdownEditing/Markdown.sublime-syntax
+      embed: scope:text.html.markdown.gfm
+      embed_scope: text.html.markdown.gfm.embedded.gitlab
+      escape: (?=^└─{3,}$)
     - match: (^└─{3,}$)
       captures:
         1: markup.other.special.gitlab
 
+  # Before build 3153
+  # Apparent recursion within a with_prototype action: 25000 context sanity limit hit
+  # block_markdown:
+  #   - match: (^┌─{3,}$)
+  #     captures:
+  #       1: markup.other.special.gitlab
+  #     push: Packages/MarkdownEditing/Markdown.sublime-syntax
+  #     with_prototype:
+  #       - match: (?=^└─{3,}\n)
+  #         captures:
+  #           1: markup.other.special.gitlab
+  #         pop: true
+  #   - match: (^└─{3,}$)
+  #     captures:
+  #       1: markup.other.special.gitlab
+
   block_meta:
     - match: (^═+$)
       captures:

messages.json

@@ -1,5 +1,6 @@
 {
     "install": "messages/install.txt",
     "1.0.1": "messages/1.0.1.txt",
-    "1.0.2": "messages/1.0.2.txt"
+    "1.0.2": "messages/1.0.2.txt",
+    "1.0.3": "messages/1.0.3.txt"
 }

messages/1.0.3.txt

@@ -0,0 +1,5 @@
+StGitlab 1.0.3 changelog:
+
+* Fixed: StGitlab syntax compatibility with ST builds after 3153
+* Fixed: Users list in completions
+* Fixed: Users completions fires

stgitlab.py

@@ -191,10 +191,11 @@ def on_activated_async(self):
     def on_query_completions(self, prefix, locations):
         if self.view.settings().get('screen') == 'st_gitlab_editbox':
             gitlab = utils.gl.get()
-            pattern_issue = re.compile(r'(^|.*\s)(\#)(\d+)?')
             completions = []
             cursor_position = locations[0]
-            chars_before = self.view.substr(sublime.Region(cursor_position - 10, cursor_position))
+            chars_before = self.view.substr(sublime.Region(cursor_position - 2, cursor_position))
+
+            pattern_issue = re.compile(r'(^|\s)(\#)(\d+)?')
             m = pattern_issue.match(chars_before)
             if m and m.group(2):
                 issues = gitlab.issues()
@@ -205,7 +206,7 @@ def on_query_completions(self, prefix, locations):
             if completions:
                 return completions
 
-            pattern_merge = re.compile(r'(^|.*\s)(\!)(\d+)?')
+            pattern_merge = re.compile(r'(^|\s)(\!)(\d+)?')
             m = pattern_merge.match(chars_before)
             if m and m.group(2):
                 merges = gitlab.merges()
@@ -216,14 +217,20 @@ def on_query_completions(self, prefix, locations):
             if completions:
                 return completions
 
-            pattern_user = re.compile(r'(^|.*\s)(\@)(\d+)?')
+            pattern_user = re.compile(r'(^|\s)(\@)(\w+)?')
             m = pattern_user.match(chars_before)
             if m and m.group(2):
-                users = gitlab.users()
+                users_group_filter = utils.stg_get_setting('users_group_filter', [])
+                if users_group_filter:
+                    users = utils.users_filtered(users_group_filter)
+                else:
+                    users = utils.users_all()
+                # users = gitlab.users()
                 for user in users:
-                    if m.group(3) and not user.name.startswith(m.group(3)):
+                    print(user.username)
+                    if m.group(3) and not user.username.lower().startswith(m.group(3).lower()):
                         continue
-                    completions.append(('%s\tGitlab user' % user.name, user.name))
+                    completions.append(('%s - %s\tGitlab user' % (user.username, user.name), user.username))
             if completions:
                 return completions