Merge branch '2.2.6' into master

ChihyongChen · Jan 27, 2018 · 777a600 · 777a600
2 parents a6eb1ee + 1409068
commit 777a600
Show file tree

Hide file tree

Showing 8 changed files with 71 additions and 29 deletions.
diff --git a/Markdown (Standard).sublime-settings b/Markdown (Standard).sublime-settings
@@ -99,31 +99,31 @@
 	// Super key references to a key next to left Alt key. It usually has a Windows logo or "win" or "Command" on it.
 	// Jump between link/image/footnote reference and definition
 	// Default keys: (OSX)super+ctrl+shift+l	(Linux/Win)ctrl+alt+g
-	"mde.keymap_disable_reference_jump": false,
+	"mde.keymap_disable.reference_jump": false,
 	// Add a new link
 	// Default keys: (OSX)super+alt+r	(Linux/Win)ctrl+super+r
-	"mde.keymap_disable_reference_new_reference": false,
+	"mde.keymap_disable.reference_new_reference": false,
 	// Add a new inline link
 	// Default keys: (OSX)super+alt+v	(Linux/Win)ctrl+super+v
-	"mde.keymap_disable_reference_new_inline_link": false,
+	"mde.keymap_disable.reference_new_inline_link": false,
 	// Add a new inline image
 	// Default keys: (OSX/Linux/Win)super+shift+k
-	"mde.keymap_disable_reference_new_inline_image": false,
+	"mde.keymap_disable.reference_new_inline_image": false,
 	// Add a new footnote
 	// Default keys: (OSX/Linux/Win)alt+shift+6
-	"mde.keymap_disable_reference_new_footnote": false,
+	"mde.keymap_disable.reference_new_footnote": false,
 	// Fold current section
 	// Default keys: (OSX/Linux/Win)shift+tab
-	"mde.keymap_disable_fold_section": false,
+	"mde.keymap_disable.fold_section": false,
 	// Open a panel showing all functions related to folding
 	// Default keys: (OSX/Linux/Win)ctrl+shift+tab
-	"mde.keymap_disable_show_fold_all_sections": false,
+	"mde.keymap_disable.show_fold_all_sections": false,
 	// Jump to the next heading (any level/same or higher level)
 	// Default keys: (OSX)super+ctrl/shift+pagedown	(Linux/Win)ctrl+shift(+alt)+pagedown
-	"mde.keymap_disable_goto_next_heading": false,
+	"mde.keymap_disable.goto_next_heading": false,
 	// Jump to the previous heading (any level/same or higher level)
 	// Default keys: (OSX)super+ctrl/shift+pageup	(Linux/Win)ctrl+shift(+alt)+pageup
-	"mde.keymap_disable_goto_previous_heading": false,
+	"mde.keymap_disable.goto_previous_heading": false,
 	// List pages the link to the current page
 	"mde.keymap_disable.list_back_links": true,
 	// Open the home page
@@ -133,5 +133,4 @@
 	// Open the page referenced
 	"mde.keymap_disable.open_page": true,
 	// Make page reference
-	"mde.keymap_disable.make_page_reference": true
 }
diff --git a/Markdown (Standard).tmLanguage b/Markdown (Standard).tmLanguage
@@ -2,6 +2,13 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>fileTypes</key>
+	<array>
+		<string>md</string>
+		<string>mdown</string>
+		<string>markdown</string>
+		<string>markdn</string>
+	</array>
 	<key>foldingStartMarker</key>
 	<string>(?x)
 		(&lt;(?i:head|body|table|thead|tbody|tfoot|tr|div|select|fieldset|style|script|ul|ol|form|dl)\b.*?&gt;

diff --git a/Markdown.sublime-syntax b/Markdown.sublime-syntax
@@ -453,6 +453,7 @@ contexts:
     - include: fenced-kotlin
     - include: fenced-ocaml
     - include: fenced-reason
+    - include: fenced-haskell
     - include: fenced-undefined
   fenced-coffee:
     - match: '^(\s*[`~]{3,})\s*(coffee|cjsx)\s*$'
@@ -629,6 +630,13 @@ contexts:
         - match: ^(\1)\n
           pop: true
         - include: scope:source.tsx
+  fenced-haskell:
+    - match: '^(\s*[`~]{3,})\s*(haskell|hs)\s*$'
+      push:
+        - meta_scope: markup.raw.block.markdown markup.raw.block.fenced.markdown
+        - match: ^(\1)\n
+          pop: true
+        - include: scope:source.haskell
   fenced-undefined:
     - match: '^(\s*[`~]{3,}).*$'
       push:

diff --git a/MultiMarkdown.sublime-settings b/MultiMarkdown.sublime-settings
@@ -104,31 +104,31 @@
 	// Super key references to a key next to left Alt key. It usually has a Windows logo or "win" or "Command" on it.
 	// Jump between link/image/footnote reference and definition
 	// Default keys: (OSX)super+ctrl+shift+l	(Linux/Win)ctrl+alt+g
-	"mde.keymap_disable_reference_jump": false,
+	"mde.keymap_disable.reference_jump": false,
 	// Add a new link
 	// Default keys: (OSX)super+alt+r	(Linux/Win)ctrl+super+r
-	"mde.keymap_disable_reference_new_reference": false,
+	"mde.keymap_disable.reference_new_reference": false,
 	// Add a new inline link
 	// Default keys: (OSX)super+alt+v	(Linux/Win)ctrl+super+v
-	"mde.keymap_disable_reference_new_inline_link": false,
+	"mde.keymap_disable.reference_new_inline_link": false,
 	// Add a new inline image
 	// Default keys: (OSX/Linux/Win)super+shift+k
-	"mde.keymap_disable_reference_new_inline_image": false,
+	"mde.keymap_disable.reference_new_inline_image": false,
 	// Add a new footnote
 	// Default keys: (OSX/Linux/Win)alt+shift+6
-	"mde.keymap_disable_reference_new_footnote": false,
+	"mde.keymap_disable.reference_new_footnote": false,
 	// Fold current section
 	// Default keys: (OSX/Linux/Win)shift+tab
-	"mde.keymap_disable_fold_section": false,
+	"mde.keymap_disable.fold_section": false,
 	// Open a panel showing all functions related to folding
 	// Default keys: (OSX/Linux/Win)ctrl+shift+tab
-	"mde.keymap_disable_show_fold_all_sections": false,
+	"mde.keymap_disable.show_fold_all_sections": false,
 	// Jump to the next heading (any level/same or higher level)
 	// Default keys: (OSX)super+ctrl/shift+pagedown	(Linux/Win)ctrl+shift(+alt)+pagedown
-	"mde.keymap_disable_goto_next_heading": false,
+	"mde.keymap_disable.goto_next_heading": false,
 	// Jump to the previous heading (any level/same or higher level)
 	// Default keys: (OSX)super+ctrl/shift+pageup	(Linux/Win)ctrl+shift(+alt)+pageup
-	"mde.keymap_disable_goto_previous_heading": false,
+	"mde.keymap_disable.goto_previous_heading": false,
 	// List pages the link to the current page
 	"mde.keymap_disable.list_back_links": true,
 	// Open the home page

diff --git a/MultiMarkdown.tmLanguage b/MultiMarkdown.tmLanguage
@@ -2,6 +2,13 @@
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>fileTypes</key>
+	<array>
+		<string>md</string>
+		<string>mdown</string>
+		<string>markdown</string>
+		<string>markdn</string>
+	</array>
 	<key>firstLineMatch</key>
 	<string>(?i)^format:\s*complete\s*$</string>
 	<key>foldingStartMarker</key>

diff --git a/Symbol List - Heading.tmPreferences b/Symbol List - Heading.tmPreferences
@@ -12,6 +12,9 @@
 		<integer>1</integer>
 		<key>symbolTransformation</key>
 		<string>
+			s/\[([^]]+)\]\([^)]+\)/$1/g;
+			s/\[([^]]+)\]\[[^]]+\]/$1/g;
+			s/\[([^]]+)\]/$1/g;
 			s/\s*#+\s*$//g;
 			s/^\s*#(#*)\s*/$1/g;
 			s/^#{5}/                                   /g;

diff --git a/bootstrap.py b/bootstrap.py
@@ -128,21 +128,23 @@ def on_highlighted(index):
 
 
 def plugin_loaded():
-    from package_control import events
+    if "package_control" in sys.modules:
+        from package_control import events
 
-    if events.install(package_name):
-        # Native package causes some conflicts.
-        disable_native_markdown_package()
-        # Prmopts to select a color theme
-        choose_color_theme()
+        if events.install(package_name):
+            # Native package causes some conflicts.
+            disable_native_markdown_package()
+            # Prmopts to select a color theme
+            choose_color_theme()
 
 
 def plugin_unloaded():
-    from package_control import events
+    if "package_control" in sys.modules:
+        from package_control import events
 
-    if events.remove(package_name):
-        # Native package causes some conflicts.
-        enable_native_markdown_package()
+        if events.remove(package_name):
+            # Native package causes some conflicts.
+            enable_native_markdown_package()
 
 # Compat with ST2
 if sys.version_info < (3,):

diff --git a/messages/2.2.6.md b/messages/2.2.6.md
@@ -0,0 +1,16 @@
+# MarkdownEditing 2.2.6 Changelog
+
+Your _MarkdownEditing_ plugin is updated. Enjoy new version. For any type of
+feedback you can use [GitHub issues][issues].
+
+## Bug Fixes
+
+* Save dialog now uses proper file extensions on Markdown (Standard) and MultiMarkdown.
+
+## New Features
+
+* Haskell syntax is supported in code blocks.
+
+## Changes
+
+[issues]: https://github.com/SublimeText-Markdown/MarkdownEditing/issues