Merge branch 'st3-develop' into st4-develop

Author: deathaxe

messages.json

@@ -41,5 +41,6 @@
 	"3.1.4": "messages/3.1.4.md",
 	"3.1.5": "messages/3.1.5.md",
 	"3.1.6": "messages/3.1.6.md",
-	"3.1.7": "messages/3.1.7.md"
+	"3.1.7": "messages/3.1.7.md",
+	"3.1.8": "messages/3.1.8.md"
 }

messages/3.1.8.md

@@ -0,0 +1,15 @@
+# MarkdownEditing 3.1.8 Changelog
+
+Your _MarkdownEditing_ plugin is updated. Enjoy new version. For any type of
+feedback you can use [GitHub issues][issues].
+
+## Bug Fixes
+
+* Fix GFM auto-link termination
+* Add support for pandoc attributes in reference definitions (#712)
+
+## New Features
+
+## Changes
+
+[issues]: https://github.com/SublimeText-Markdown/MarkdownEditing/issues

plugins/headings/common.py

@@ -57,7 +57,9 @@ class MdeUnsavedViewNameSetter(MdeViewEventListener):
     MAX_NAME = 50
 
     def on_modified(self):
-        if self.view.file_name() is not None or not self.view.settings().get("set_unsaved_view_name", True):
+        if self.view.file_name() is not None or not self.view.settings().get(
+            "set_unsaved_view_name", True
+        ):
             return
 
         name = first_heading_text(self.view)

syntaxes/Markdown.sublime-syntax

@@ -2654,25 +2654,44 @@ contexts:
         3: punctuation.definition.reference.end.markdown
         4: punctuation.separator.key-value.markdown
       push:
-        - link-def-end
+        - link-def-meta
+        - link-def-attr
         - link-def-title
         - link-def-url
 
-  link-def-end:
+  link-def-meta:
     - meta_include_prototype: false
     - meta_scope: meta.link.reference.def.markdown
     - include: immediately-pop
 
+  link-def-attr:
+    - match: \{
+      scope: punctuation.definition.attributes.begin.markdown
+      set: link-def-attr-body
+    - match: ^(?!\s*{)|(?=\S)
+      pop: 1
+
+  link-def-attr-body:
+    - meta_scope: meta.attributes.markdown
+    - include: tag-attributes
+
   link-def-title:
     - match: ^(?!\s*["'(])
       pop: 1
     - match: (?=["'(])
       set:
-        - expect-eol
+        - expect-attr-or-eol
         - link-title
+    - match: (?=\{)
+      pop: 1
     - match: \S.+
       scope: invalid.illegal.expected-eol.markdown
 
+  expect-attr-or-eol:
+    - match: (?=\{)
+      pop: 1
+    - include: expect-eol
+
   link-def-url:
     - match: <
       scope: punctuation.definition.link.begin.markdown
@@ -3438,6 +3457,7 @@ contexts:
       scope: invalid.illegal.attribute-name.markdown
 
   tag-attr-meta:
+    - meta_include_prototype: false
     - meta_scope: meta.attribute-with-value.markdown
     - include: immediately-pop
 

tests/syntax_test_markdown.md

@@ -2765,6 +2765,41 @@ Foo
 |      ^ punctuation.separator.key-value.markdown
 |        ^^^^ markup.underline.link.markdown
 
+## https://custom-tests/link-reference-definitions/with-attributes
+
+[link]: /url {#id .class width=30}
+|            ^^^^^^^^^^^^^^^^^^^^^ meta.link.reference.def.markdown meta.attributes.markdown
+
+[link]: /url (description) {#id .class width=30}
+|                          ^^^^^^^^^^^^^^^^^^^^^ meta.link.reference.def.markdown meta.attributes.markdown
+
+[link]: /url "description" {#id .class width=30}
+|                          ^^^^^^^^^^^^^^^^^^^^^ meta.link.reference.def.markdown meta.attributes.markdown
+
+[link]: 
+  /url 
+  {#id .class width=30}
+| ^^^^^^^^^^^^^^^^^^^^^ meta.link.reference.def.markdown meta.attributes.markdown
+
+[link]: 
+  /url 
+
+  {#id .class width=30}
+| ^^^^^^^^^^^^^^^^^^^^^ - meta.link - meta.attributes
+
+[link]: 
+  /url 
+  "description" 
+  {#id .class width=30}
+| ^^^^^^^^^^^^^^^^^^^^^ meta.link.reference.def.markdown meta.attributes.markdown
+
+[link]: 
+  /url 
+  "description" 
+
+  {#id .class width=30}
+| ^^^^^^^^^^^^^^^^^^^^^ - meta.link - meta.attributes
+
 ## https://custom-tests/link-reference-definitions/in-block-quotes
 
 > [foo]: /url "description"