Merge branch 'st4-develop'

Author: deathaxe

.coveragerc

@@ -30,9 +30,9 @@ jobs:
           - 'x64'
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: Set up Python ${{ matrix.python }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python }}
           architecture: ${{ matrix.arch }}

.github/workflows/ci-lint.yml

@@ -28,11 +28,8 @@ jobs:
       matrix:
         st-version: [4]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: SublimeText/UnitTesting/actions/setup@v1
         with:
           sublime-text-version: ${{ matrix.st-version }}
       - uses: SublimeText/UnitTesting/actions/run-tests@v1
-        with:
-          coverage: true
-      - uses: codecov/codecov-action@v4

.github/workflows/ci-unit-tests.yml

@@ -14,11 +14,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.13'
       - name: Install MkDocs

.github/workflows/deploy-gh-pages.yml

@@ -155,7 +155,7 @@
 	// Default keys: (OSX/Linux/Win): alt+k, alt+0..9
 	"mde.keymap_disable.set_heading_level": false,
 	// Jump between link/image/footnote reference and definition
-	// Default keys: (OSX)super+ctrl+shift+l    (Linux/Win)ctrl+alt+g
+	// Default keys: (OSX/Linux/Win): f12, shift+f12
 	"mde.keymap_disable.reference_jump": false,
 	// Add a new link
 	// Default keys: (OSX)super+alt+r   (Linux/Win)ctrl+super+r

Preferences.sublime-settings

@@ -26,5 +26,6 @@
 	"3.2.0": "messages/3.2.0.md",
 	"3.3.0": "messages/3.3.0.md",
 	"3.4.0": "messages/3.4.0.md",
-	"3.5.0": "messages/3.5.0.md"
+	"3.5.0": "messages/3.5.0.md",
+	"3.6.0": "messages/3.6.0.md"
 }

messages.json

@@ -0,0 +1,16 @@
+# MarkdownEditing 3.6.0 Changelog
+
+Your _MarkdownEditing_ plugin is updated. Enjoy new version. For any type of
+feedback you can use [GitHub issues][issues].
+
+## Bug Fixes
+
+## New Features
+
+* Add BBCode support for fenced code block (PR #799)
+* Add support for KDL fenced code blocks - auto-v1/2-selection variant `kdl` as well as forced v1/v2 variants `kdl1` and `kdl2` (PR #783)
+* Add spearate scope for autolink URLs' protocol and www parts (PR #732)
+
+## Changes
+
+[issues]: https://github.com/SublimeText-Markdown/MarkdownEditing/issues

messages/3.6.0.md

@@ -28,7 +28,7 @@ def _debounced_callback(view, callback):
             if not view.is_valid():
                 del call_at[view.view_id]
                 return
-            diff = call_at[view.view_id] - now() * 1000
+            diff = call_at[view.view_id] - int(now() * 1000)
             if diff > 0:
                 set_timeout(partial(_debounced_callback, view, callback), diff)
             else:
@@ -39,7 +39,7 @@ def _debounced_callback(view, callback):
         def wrapper(self, *args, **kwargs):
             view = self.view if hasattr(self, "view") else args[0]
             pending = view.view_id in call_at
-            call_at[view.view_id] = now() * 1000 + delay_in_ms
+            call_at[view.view_id] = int(now() * 1000) + delay_in_ms
             if pending:
                 return
             callback = partial(func, self, *args, **kwargs)

plugins/decorators.py

@@ -1381,6 +1381,7 @@ contexts:
     - include: fenced-ada
     - include: fenced-ahk
     - include: fenced-arduino
+    - include: fenced-bbcode
     - include: fenced-coffee
     - include: fenced-dart
     - include: fenced-docker
@@ -1392,6 +1393,9 @@ contexts:
     - include: fenced-jade
     - include: fenced-julia
     - include: fenced-kotlin
+    - include: fenced-kdl
+    - include: fenced-kdl1
+    - include: fenced-kdl2
     - include: fenced-less
     - include: fenced-mermaid
     - include: fenced-nim
@@ -2536,6 +2540,29 @@ contexts:
         1: punctuation.definition.raw.code-fence.end.markdown
         2: meta.fold.code-fence.end.markdown
 
+  fenced-bbcode:
+    - match: |-
+         (?x)
+          {{fenced_code_block_start}}
+          (?i:\s*(bbcode|bbc))
+          {{fenced_code_block_trailing_infostring_characters}}
+      captures:
+        0: meta.code-fence.definition.begin.markdown-gfm
+        2: punctuation.definition.raw.code-fence.begin.markdown
+        5: constant.other.language-name.markdown
+        6: comment.line.infostring.markdown
+        7: meta.fold.code-fence.begin.markdown
+      embed: scope:text.bbcode
+      embed_scope:
+        meta.code-fence.body.markdown-gfm
+        markup.raw.code-fence.bbcode.markdown-gfm
+        text.bbcode
+      escape: '{{fenced_code_block_escape}}'
+      escape_captures:
+        0: meta.code-fence.definition.end.markdown-gfm
+        1: punctuation.definition.raw.code-fence.end.markdown
+        2: meta.fold.code-fence.end.markdown
+
   fenced-coffee:
     - match: |-
          (?x)
@@ -2789,6 +2816,75 @@ contexts:
         1: punctuation.definition.raw.code-fence.end.markdown
         2: meta.fold.code-fence.end.markdown
 
+  fenced-kdl:
+    - match: |-
+         (?x)
+          {{fenced_code_block_start}}
+          (?i:\s*(kdl))
+          {{fenced_code_block_trailing_infostring_characters}}
+      captures:
+        0: meta.code-fence.definition.begin.markdown-gfm
+        2: punctuation.definition.raw.code-fence.begin.markdown
+        5: constant.other.language-name.markdown
+        6: comment.line.infostring.markdown
+        7: meta.fold.code-fence.begin.markdown
+      embed: scope:text.kdl
+      embed_scope:
+        meta.code-fence.body.markdown-gfm
+        markup.raw.code-fence.kdl.markdown-gfm
+        text.kdl
+      escape: '{{fenced_code_block_escape}}'
+      escape_captures:
+        0: meta.code-fence.definition.end.markdown-gfm
+        1: punctuation.definition.raw.code-fence.end.markdown
+        2: meta.fold.code-fence.end.markdown
+
+  fenced-kdl1:
+    - match: |-
+         (?x)
+          {{fenced_code_block_start}}
+          (?i:\s*(kdl1))
+          {{fenced_code_block_trailing_infostring_characters}}
+      captures:
+        0: meta.code-fence.definition.begin.markdown-gfm
+        2: punctuation.definition.raw.code-fence.begin.markdown
+        5: constant.other.language-name.markdown
+        6: comment.line.infostring.markdown
+        7: meta.fold.code-fence.begin.markdown
+      embed: scope:text.kdl.1
+      embed_scope:
+        meta.code-fence.body.markdown-gfm
+        markup.raw.code-fence.kdl.markdown-gfm
+        text.kdl.1
+      escape: '{{fenced_code_block_escape}}'
+      escape_captures:
+        0: meta.code-fence.definition.end.markdown-gfm
+        1: punctuation.definition.raw.code-fence.end.markdown
+        2: meta.fold.code-fence.end.markdown
+
+  fenced-kdl2:
+    - match: |-
+         (?x)
+          {{fenced_code_block_start}}
+          (?i:\s*(kdl2))
+          {{fenced_code_block_trailing_infostring_characters}}
+      captures:
+        0: meta.code-fence.definition.begin.markdown-gfm
+        2: punctuation.definition.raw.code-fence.begin.markdown
+        5: constant.other.language-name.markdown
+        6: comment.line.infostring.markdown
+        7: meta.fold.code-fence.begin.markdown
+      embed: scope:text.kdl.2
+      embed_scope:
+        meta.code-fence.body.markdown-gfm
+        markup.raw.code-fence.kdl.markdown-gfm
+        text.kdl.2
+      escape: '{{fenced_code_block_escape}}'
+      escape_captures:
+        0: meta.code-fence.definition.end.markdown-gfm
+        1: punctuation.definition.raw.code-fence.end.markdown
+        2: meta.fold.code-fence.end.markdown
+
   fenced-less:
     - match: |-
          (?x)
@@ -4354,9 +4450,12 @@ contexts:
     # GitHub Flavoured Markdown
     # After a valid domain, zero or more non-space non-< characters may follow
     # https://github.github.com/gfm/#autolinks-extension-
-    - match: (?:(?:https|http|ftp)(://)|www\.)[\w-]+
+    - match: (https|http|ftp)(://)(www\.)?|(www\.)
       captures:
-        1: punctuation.separator.path.markdown
+        1: markup.underline.link.protocol.markdown-gfm
+        2: markup.underline.link.protocol.markdown-gfm punctuation.separator.path.markdown
+        3: markup.underline.link.www.markdown-gfm
+        4: markup.underline.link.www.markdown-gfm
       push: autolink-inet-unquoted-content
 
   autolink-inet-angled-content:
@@ -4371,7 +4470,8 @@ contexts:
     - include: autolink-inet-common
 
   autolink-inet-unquoted-content:
-    - meta_scope: meta.link.inet.markdown markup.underline.link.markdown-gfm
+    - meta_scope: meta.link.inet.markdown
+    - meta_content_scope: markup.underline.link.markdown-gfm
     # 1. When an autolink ends in ), we scan the entire autolink for the total
     #    number of parentheses. If there is a greater number of closing parentheses
     #    than opening ones, we don't consider the last character part of the

syntaxes/Markdown.sublime-syntax

@@ -3356,8 +3356,12 @@ paragraph
 
 | table | followed by
 https://foo.bar/baz
-| <- meta.paragraph.markdown meta.link.inet.markdown markup.underline.link.markdown-gfm
-|^^^^^^^^^^^^^^^^^^ meta.paragraph.markdown meta.link.inet.markdown markup.underline.link.markdown-gfm
+| <- meta.paragraph.markdown meta.link.inet.markdown markup.underline.link.protocol.markdown-gfm
+|^^^^^^^^^^^^^^^^^^ meta.paragraph.markdown meta.link.inet.markdown
+|^^^^^^^ markup.underline.link.protocol.markdown-gfm
+|    ^^^ punctuation.separator.path.markdown
+|       ^^^^^^^^^^^ markup.underline.link.markdown-gfm
+|              ^ punctuation.separator.path.markdown
 
 | table | followed by
 # heading