Merge branch 'st3-develop' into st3176

SublimeText-Markdown · May 22, 2022 · e8761eb · e8761eb
2 parents 2f1c5b7 + 6c3ac62
commit e8761eb
Show file tree

Hide file tree

Showing 17 changed files with 233 additions and 167 deletions.
diff --git a/.github/workflows/ci-syntax-tests.yml b/.github/workflows/ci-syntax-tests.yml
@@ -23,6 +23,8 @@ on:
 jobs:
   syntax_tests:
     name: Sublime Text ${{ matrix.build }}
+    runs-on: ubuntu-18.04
+    timeout-minutes: 15 # default is 6 hours!
     strategy:
       matrix:
         include:
@@ -32,7 +34,6 @@ jobs:
             default_packages: v4107
           - build: latest
             default_packages: master
-    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - uses: SublimeText/syntax-test-action@v2

diff --git a/.github/workflows/ci-unit-tests.yml b/.github/workflows/ci-unit-tests.yml
@@ -21,7 +21,8 @@ on:
 jobs:
   test:
     name: Sublime Text ${{ matrix.st_version }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
+    timeout-minutes: 15 # default is 6 hours!
     strategy:
       fail-fast: false
       matrix:
@@ -35,6 +36,7 @@ jobs:
       - uses: actions/checkout@v1
       - run: sh -e /etc/init.d/xvfb start
       - run: curl -OL https://raw.githubusercontent.com/SublimeText/UnitTesting/master/sbin/github.sh
+      - run: apt-get update
       - run: |
           PATH="$HOME/.local/bin:$PATH"
           sh github.sh bootstrap

diff --git a/Default (Linux).sublime-keymap b/Default (Linux).sublime-keymap
@@ -1385,28 +1385,28 @@
 			{ "key": "setting.mde.keymap_disable.open_home_page", "operator": "not_equal", "operand": true }
 		]
 	},
-	{ "keys": ["ctrl+alt+d"], "command": "mde_open_page", "context":
+	{ "keys": ["ctrl+alt+j"], "command": "mde_open_journal", "context":
 		[
-			{ "key": "selector", "operator": "equal", "operand": "meta.link.reference.wiki.description.markdown", "match_all": true },
-			{ "key": "setting.mde.keymap_disable.open_page", "operator": "not_equal", "operand": true }
+			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true },
+			{ "key": "setting.mde.keymap_disable.open_journal", "operator": "not_equal", "operand": true }
 		]
 	},
-	{ "keys": ["ctrl+alt+d"], "command": "mde_make_page_reference", "context":
+	{ "keys": ["f12"], "command": "mde_open_page", "context":
 		[
-			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - (meta.link | markup.underline.link)", "match_all": true },
-			{ "key": "setting.mde.keymap_disable.make_page_reference", "operator": "not_equal", "operand": true }
+			{ "key": "selector", "operator": "equal", "operand": "meta.link.reference.wiki.description.markdown", "match_all": true },
+			{ "key": "setting.mde.keymap_disable.open_page", "operator": "not_equal", "operand": true }
 		]
 	},
-	{ "keys": ["ctrl+alt+x"], "command": "mde_list_back_links", "context":
+	{ "keys": ["shift+f12"], "command": "mde_list_back_links", "context":
 		[
-			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true },
+			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - (meta.link | markup.underline.link | variable)", "match_all": true },
 			{ "key": "setting.mde.keymap_disable.list_back_links", "operator": "not_equal", "operand": true }
 		]
 	},
-	{ "keys": ["ctrl+alt+j"], "command": "mde_open_journal", "context":
+	{ "keys": ["ctrl+alt+d"], "command": "mde_make_page_reference", "context":
 		[
-			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true },
-			{ "key": "setting.mde.keymap_disable.open_journal", "operator": "not_equal", "operand": true }
+			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - (meta.link | markup.underline.link)", "match_all": true },
+			{ "key": "setting.mde.keymap_disable.make_page_reference", "operator": "not_equal", "operand": true }
 		]
 	}
 ]
diff --git a/Default (OSX).sublime-keymap b/Default (OSX).sublime-keymap
@@ -1385,28 +1385,28 @@
 			{ "key": "setting.mde.keymap_disable.open_home_page", "operator": "not_equal", "operand": true }
 		]
 	},
-	{ "keys": ["super+alt+d"], "command": "mde_open_page", "context":
+	{ "keys": ["super+alt+j"], "command": "mde_open_journal", "context":
 		[
-			{ "key": "selector", "operator": "equal", "operand": "meta.link.reference.wiki.description.markdown", "match_all": true },
-			{ "key": "setting.mde.keymap_disable.open_page", "operator": "not_equal", "operand": true }
+			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true },
+			{ "key": "setting.mde.keymap_disable.open_journal", "operator": "not_equal", "operand": true }
 		]
 	},
-	{ "keys": ["super+alt+d"], "command": "mde_make_page_reference", "context":
+	{ "keys": ["f12"], "command": "mde_open_page", "context":
 		[
-			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - (meta.link | markup.underline.link)", "match_all": true },
-			{ "key": "setting.mde.keymap_disable.make_page_reference", "operator": "not_equal", "operand": true }
+			{ "key": "selector", "operator": "equal", "operand": "meta.link.reference.wiki.description.markdown", "match_all": true },
+			{ "key": "setting.mde.keymap_disable.open_page", "operator": "not_equal", "operand": true }
 		]
 	},
-	{ "keys": ["super+alt+x"], "command": "mde_list_back_links", "context":
+	{ "keys": ["shift+f12"], "command": "mde_list_back_links", "context":
 		[
-			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true },
+			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - (meta.link | markup.underline.link | variable)", "match_all": true },
 			{ "key": "setting.mde.keymap_disable.list_back_links", "operator": "not_equal", "operand": true }
 		]
 	},
-	{ "keys": ["super+alt+j"], "command": "mde_open_journal", "context":
+	{ "keys": ["super+alt+d"], "command": "mde_make_page_reference", "context":
 		[
-			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true },
-			{ "key": "setting.mde.keymap_disable.open_journal", "operator": "not_equal", "operand": true }
+			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - (meta.link | markup.underline.link)", "match_all": true },
+			{ "key": "setting.mde.keymap_disable.make_page_reference", "operator": "not_equal", "operand": true }
 		]
 	}
 ]
diff --git a/Default (Windows).sublime-keymap b/Default (Windows).sublime-keymap
@@ -1385,28 +1385,28 @@
 			{ "key": "setting.mde.keymap_disable.open_home_page", "operator": "not_equal", "operand": true }
 		]
 	},
-	{ "keys": ["ctrl+alt+d"], "command": "mde_open_page", "context":
+	{ "keys": ["ctrl+alt+j"], "command": "mde_open_journal", "context":
 		[
-			{ "key": "selector", "operator": "equal", "operand": "meta.link.reference.wiki.description.markdown", "match_all": true },
-			{ "key": "setting.mde.keymap_disable.open_page", "operator": "not_equal", "operand": true }
+			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true },
+			{ "key": "setting.mde.keymap_disable.open_journal", "operator": "not_equal", "operand": true }
 		]
 	},
-	{ "keys": ["ctrl+alt+d"], "command": "mde_make_page_reference", "context":
+	{ "keys": ["f12"], "command": "mde_open_page", "context":
 		[
-			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - (meta.link | markup.underline.link)", "match_all": true },
-			{ "key": "setting.mde.keymap_disable.make_page_reference", "operator": "not_equal", "operand": true }
+			{ "key": "selector", "operator": "equal", "operand": "meta.link.reference.wiki.description.markdown", "match_all": true },
+			{ "key": "setting.mde.keymap_disable.open_page", "operator": "not_equal", "operand": true }
 		]
 	},
-	{ "keys": ["ctrl+alt+x"], "command": "mde_list_back_links", "context":
+	{ "keys": ["shift+f12"], "command": "mde_list_back_links", "context":
 		[
-			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true },
+			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - (meta.link | markup.underline.link | variable)", "match_all": true },
 			{ "key": "setting.mde.keymap_disable.list_back_links", "operator": "not_equal", "operand": true }
 		]
 	},
-	{ "keys": ["ctrl+alt+j"], "command": "mde_open_journal", "context":
+	{ "keys": ["ctrl+alt+d"], "command": "mde_make_page_reference", "context":
 		[
-			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true },
-			{ "key": "setting.mde.keymap_disable.open_journal", "operator": "not_equal", "operand": true }
+			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - (meta.link | markup.underline.link)", "match_all": true },
+			{ "key": "setting.mde.keymap_disable.make_page_reference", "operator": "not_equal", "operand": true }
 		]
 	}
 ]
diff --git a/Preferences.sublime-settings b/Preferences.sublime-settings
@@ -170,13 +170,13 @@
 	// Default keys: (OSX)super+ctrl/shift+pageup   (Linux/Win)ctrl+shift(+alt)+pageup
 	"mde.keymap_disable.goto_previous_heading": false,
 	// List pages the link to the current page
-	"mde.keymap_disable.list_back_links": true,
+	"mde.keymap_disable.list_back_links": false,
 	// Open the home page
 	"mde.keymap_disable.open_home_page": true,
 	// Open the journal
 	"mde.keymap_disable.open_journal": true,
 	// Open the page referenced
-	"mde.keymap_disable.open_page": true,
+	"mde.keymap_disable.open_page": false,
 	// Make page reference
 	"mde.keymap_disable.make_page_reference": true
 }
diff --git a/docs/usage.md b/docs/usage.md
@@ -345,8 +345,8 @@ Lastly the command to open the *home* page is provided, where the home page is j
 | Linux/Windows | MacOS | Description
 |---------------|-------|-------------
 | <kbd>Ctrl</kbd> + <kbd>Alt</kbd> + <kbd>H</kbd> | <kbd>⌘</kbd> + <kbd>⌥</kbd> + <kbd>H</kbd> | Open home page
-| <kbd>Ctrl</kbd> + <kbd>Alt</kbd> + <kbd>D</kbd> | <kbd>⌘</kbd> + <kbd>⌥</kbd> + <kbd>D</kbd> | Open wiki page under the cursor
 | <kbd>Ctrl</kbd> + <kbd>Alt</kbd> + <kbd>J</kbd> | <kbd>⌘</kbd> + <kbd>⌥</kbd> + <kbd>J</kbd> | Open journal page for today
-| <kbd>Ctrl</kbd> + <kbd>Alt</kbd> + <kbd>X</kbd> | <kbd>⌘</kbd> + <kbd>⌥</kbd> + <kbd>B</kbd> | List back links
+| <kbd>f12</kbd> | <kbd>f12</kbd>  | Open wiki page under cursor
+| <kbd>Shift</kbd> + <kbd>f12</kbd> | <kbd>⇧</kbd> + <kbd>f12</kbd> | List back links
 
 _Note: The key bindings are disabled via Preferences by default to prevent conflicts with certain keyboard layouts._
diff --git a/messages.json b/messages.json
@@ -36,5 +36,6 @@
 	"3.0.7": "messages/3.0.7.md",
 	"3.1.0": "messages/3.1.0.md",
 	"3.1.1": "messages/3.1.1.md",
-	"3.1.2": "messages/3.1.2.md"
+	"3.1.2": "messages/3.1.2.md",
+	"3.1.3": "messages/3.1.3.md"
 }
diff --git a/messages/3.1.3.md b/messages/3.1.3.md
@@ -0,0 +1,20 @@
+# MarkdownEditing 3.1.3 Changelog
+
+Your _MarkdownEditing_ plugin is updated. Enjoy new version. For any type of
+feedback you can use [GitHub issues][issues].
+
+## Bug Fixes
+
+* Bind F12 (instead of `ctrl+alt+D`) to follow wiki links (#679)
+* Bind Sift+F12 (instead of `ctrl+alt+X`) to list back links links
+* Add `yml` syntax tag to enable YAML highlighting in fenced code-blocks (#688)
+* Add `yml` syntax tag as optional frontmatter language specifier
+* Fix YAML frontmatter markers in MultiMarkdown (#690)
+
+## New Features
+
+## Changes
+
+* Update syntax definition for LaTeX math equations
+
+[issues]: https://github.com/SublimeText-Markdown/MarkdownEditing/issues
diff --git a/schemes/Monokai.sublime-color-scheme b/schemes/Monokai.sublime-color-scheme
@@ -69,7 +69,7 @@
 		{
 			"name": "Markdown: Striked URLs",
 			"scope": "text.html.markdown markup.strikethrough & (markup.underline.link.markdown | markup.underline.link.image.markdown)",
-			"foreground": "var(yellow5)",
+			"foreground": "var(yellow5)"
 		},
 		{
 			"name": "Markdown: Hard Line Breaks",