Merge branch 'st4-develop'

SublimeText-Markdown · Apr 26, 2024 · 59c3063 · 59c3063
2 parents bcf8d0b + 98847dd
commit 59c3063
Show file tree

Hide file tree

Showing 15 changed files with 284 additions and 73 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -0,0 +1,2 @@
+[run]
+omit = */tests/*
diff --git a/.editorconfig b/.editorconfig
@@ -7,14 +7,35 @@ indent_size = 4
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[*.json]
-indent_style = tab
+# Markdown
 
 [*.md]
+indent_style = space
+indent_size = 2
 trim_trailing_whitespace = false
 
+# JSON
+
+[*.json]
+indent_style = tab
+indent_size = 4
+
 [*.sublime-*]
 indent_style = tab
+indent_size = 4
+
+# XML
 
 [*.tmPreferences]
 indent_style = tab
+indent_size = 4
+
+# YAML
+
+[*.sublime-syntax]
+indent_style = space
+indent_size = 2
+
+[*.yml]
+indent_style = space
+indent_size = 2
diff --git a/.github/workflows/ci-lint.yml b/.github/workflows/ci-lint.yml
@@ -21,7 +21,7 @@ on:
 jobs:
   lint:
     name: Python ${{ matrix.python }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         python:
@@ -30,9 +30,9 @@ jobs:
           - 'x64'
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python }}
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
           architecture: ${{ matrix.arch }}

diff --git a/.github/workflows/ci-syntax-tests.yml b/.github/workflows/ci-syntax-tests.yml
@@ -30,10 +30,16 @@ jobs:
         include:
           - build: 4107
             default_packages: v4107
+          - build: 4126
+            default_packages: v4126
+          - build: 4152
+            default_packages: v4152
+          - build: 4169
+            default_packages: v4169
           - build: latest
             default_packages: master
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: SublimeText/syntax-test-action@v2
         with:
           build: ${{ matrix.build }}

diff --git a/.github/workflows/ci-unit-tests.yml b/.github/workflows/ci-unit-tests.yml
@@ -28,11 +28,11 @@ jobs:
       matrix:
         st-version: [4]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: SublimeText/UnitTesting/actions/setup@v1
         with:
           sublime-text-version: ${{ matrix.st-version }}
       - uses: SublimeText/UnitTesting/actions/run-tests@v1
         with:
           coverage: true
-          codecov-upload: true
+      - uses: codecov/codecov-action@v4
diff --git a/.github/workflows/deploy-gh-pages.yml b/.github/workflows/deploy-gh-pages.yml
@@ -14,11 +14,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: '3.8'
       - name: Install MkDocs

diff --git a/Default (Linux).sublime-keymap b/Default (Linux).sublime-keymap
@@ -190,7 +190,7 @@
 	},
 	{ "keys": ["`"], "command": "move", "args": {"by": "characters", "forward": true}, "context":
 		[
-			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown markup.raw - meta.code-fence - markup.raw.code-fence", "match_all": true },
+			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown markup.raw - markup.raw.code-fence", "match_all": true },
 			{ "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
 			{ "key": "following_text", "operator": "regex_contains", "operand": "^`", "match_all": true }
 		]

diff --git a/Default (OSX).sublime-keymap b/Default (OSX).sublime-keymap
@@ -190,7 +190,7 @@
 	},
 	{ "keys": ["`"], "command": "move", "args": {"by": "characters", "forward": true}, "context":
 		[
-			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown markup.raw - meta.code-fence - markup.raw.code-fence", "match_all": true },
+			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown markup.raw - markup.raw.code-fence", "match_all": true },
 			{ "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
 			{ "key": "following_text", "operator": "regex_contains", "operand": "^`", "match_all": true }
 		]

diff --git a/Default (Windows).sublime-keymap b/Default (Windows).sublime-keymap
@@ -190,7 +190,7 @@
 	},
 	{ "keys": ["`"], "command": "move", "args": {"by": "characters", "forward": true}, "context":
 		[
-			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown markup.raw - meta.code-fence - markup.raw.code-fence", "match_all": true },
+			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown markup.raw - markup.raw.code-fence", "match_all": true },
 			{ "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
 			{ "key": "following_text", "operator": "regex_contains", "operand": "^`", "match_all": true }
 		]

diff --git a/messages.json b/messages.json
@@ -46,5 +46,6 @@
 	"3.1.9": "messages/3.1.9.md",
 	"3.1.10": "messages/3.1.10.md",
 	"3.1.11": "messages/3.1.11.md",
-	"3.1.12": "messages/3.1.12.md"
+	"3.1.12": "messages/3.1.12.md",
+	"3.1.13": "messages/3.1.13.md"
 }
diff --git a/messages/3.1.13.md b/messages/3.1.13.md
@@ -0,0 +1,18 @@
+# MarkdownEditing 3.1.13 Changelog
+
+Your _MarkdownEditing_ plugin is updated. Enjoy new version. For any type of
+feedback you can use [GitHub issues][issues].
+
+## Bug Fixes
+
+- fix premature block quote termination
+- fix extra backticks when creating fenced code blocks (#749)
+- fix syntax highlighting of single backticks and code-spans in table cells
+
+## New Features
+
+- syntax highlighting for LaTeX in fenced code blocks
+
+## Changes
+
+[issues]: https://github.com/SublimeText-Markdown/MarkdownEditing/issues
diff --git a/syntaxes/Fold.tmPreferences b/syntaxes/Fold.tmPreferences
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plist version="1.0">
 <dict>
-    <key>scope</key>
-    <string>text.html.markdown</string>
-    <key>settings</key>
-    <dict>
-        <key>foldScopes</key>
-        <array>
-            <dict>
-                <key>begin</key>
-                <string>markup.heading meta.whitespace.newline - markup.quote - meta.list</string>
-                <key>end</key>
-                <string>markup.heading - markup.quote - meta.list</string>
-                <key>excludeTrailingNewlines</key>
-                <true/>
-            </dict>
-            <dict>
-                <key>begin</key>
-                <string>meta.fold.code-fence.begin</string>
-                <key>end</key>
-                <string>meta.fold.code-fence.end</string>
-                <key>excludeTrailingNewlines</key>
-                <true/>
-            </dict>
-        </array>
-    </dict>
+	<key>scope</key>
+	<string>text.html.markdown</string>
+	<key>settings</key>
+	<dict>
+		<key>foldScopes</key>
+		<array>
+			<dict>
+				<key>begin</key>
+				<string>markup.heading meta.whitespace.newline - markup.quote - meta.list</string>
+				<key>end</key>
+				<string>markup.heading - markup.quote - meta.list</string>
+				<key>excludeTrailingNewlines</key>
+				<true/>
+			</dict>
+			<dict>
+				<key>begin</key>
+				<string>meta.fold.code-fence.begin</string>
+				<key>end</key>
+				<string>meta.fold.code-fence.end</string>
+				<key>excludeTrailingNewlines</key>
+				<true/>
+			</dict>
+		</array>
+	</dict>
 </dict>
 </plist>