Merge branch 'st4-develop'

Author: deathaxe

Preferences.sublime-settings

@@ -124,6 +124,13 @@
 	// MarkdownEditing (Folding):
 	// Selector for urls to automatically fold
 	"mde.auto_fold_link.selector": "( meta.image.inline.metadata.markdown | meta.image.reference.metadata.markdown | meta.link.inline.metadata.markdown | meta.link.reference.metadata.markdown ) - punctuation.definition.metadata",
+	// MarkdownEditing (Folding):
+	// Automatically fold sections when loading new document
+	// false: disable auto-folding on load
+	// true: fold headings by level 1
+	// 0: fold all sections, but keep headings visible (outline/toc mode, like ctrl+k, ctrl+9)
+	// 1..6: fold headings by level (like ctrl+k, ctrl+1..6)
+	"mde.auto_fold_sections.level": false,
 
 	// MarkdownEditing (Wiki):
 	// wiki file extensions

docs/usage.md

@@ -189,6 +189,25 @@ The folding selector can be tweaked in order to add or remove certain kinds of u
     "mde.auto_fold_link.selector": "( meta.image | meta.link ) & ( markup.underline | constant.other) - meta.link.reference.footnote - meta.link.reference.def - meta.link.inet",
 ```
 
+## Automatic Section Folding
+
+MarkdownEditing can automatically fold sections when loading a document.
+
+To globally enable it, add the following setting to _Perferences.sublime-settings_
+
+```jsonc
+    "mde.auto_fold_sections.level": 0,  // TOC mode
+```
+
+Valid values are:
+
+| Value | Description
+| :---: | ---
+| false | disable auto-folding on load
+| true  | fold headings by level 1
+|   0   | fold all sections, but keep headings visible (outline/toc mode, like <kbd>ctrl+k, ctrl+9</kbd>)
+| 1..6  | fold headings by level (like <kbd>ctrl+k, ctrl+1..6</kbd>)
+
 ## Navigation
 
 MarkdownEditing provides various ways to navigate between sections.

make.cmd

@@ -96,7 +96,7 @@ goto :usage
 
     :: create the release
     call git push --tags --force
-    gh release create --target master -t "%package% %2" "%2" %assets%
+    gh release create --target master -t "%package% %2" "%build%-%2" %assets%
     del /f /q *.sublime-package
     git fetch
     goto :eof

plugin.py

@@ -28,9 +28,9 @@
         MdeSelectColorSchemeCommand,
     )
     from .plugins.folding import (
+        MdeAutoFoldListener,
         MdeFoldAllSectionsCommand,
         MdeFoldLinksCommand,
-        MdeFoldLinksListener,
         MdeFoldSectionCommand,
         MdeShowFoldAllSectionsCommand,
         MdeUnfoldAllSectionsCommand,

plugins/folding.py

@@ -395,38 +395,44 @@ def run(self, edit, fold=None):
             unfold_urls(self.view)
 
 
-class MdeFoldLinksListener(MdeViewEventListener):
+class MdeAutoFoldListener(MdeViewEventListener):
     """
     This class describes an automatic link folding event listener.
     """
 
-    def auto_fold(self):
-        settings = self.view.settings()
-        if settings.get("mde.auto_fold_link.enabled", True):
+    def auto_fold_links(self):
+        if self.view.settings().get("mde.auto_fold_link.enabled", True):
             fold_urls(self.view)
         else:
             unfold_urls(self.view)
 
+    def auto_fold_sections(self):
+        level = self.view.settings().get("mde.auto_fold_sections.level", False)
+        if level is not False and 0 <= int(level) <= 6:
+            self.view.run_command("mde_fold_all_sections", {"target_level": level})
+
     def on_init(self):
         """
         Fold all links after application startup.
         """
-        self.auto_fold()
+        self.auto_fold_sections()
+        self.auto_fold_links()
 
     def on_load(self):
         """
         Fold all links once file is loaded.
         """
-        self.auto_fold()
+        self.auto_fold_sections()
+        self.auto_fold_links()
 
     def on_activated(self):
         """
         Update link folding when activating view.
         """
-        self.auto_fold()
+        self.auto_fold_links()
 
     def on_selection_modified(self):
         """
         Update link folding when moving caret around.
         """
-        self.auto_fold()
+        self.auto_fold_links()

syntaxes/Fold.tmPreferences

@@ -23,6 +23,14 @@
 				<key>excludeTrailingNewlines</key>
 				<true/>
 			</dict>
+			<dict>
+				<key>begin</key>
+				<string>punctuation.section.block.begin.markdown</string>
+				<key>end</key>
+				<string>punctuation.section.block.end.markdown</string>
+				<key>excludeTrailingNewlines</key>
+				<false/>
+			</dict>
 		</array>
 	</dict>
 </dict>

syntaxes/Markdown.sublime-syntax

@@ -166,6 +166,9 @@ variables:
     )
   fenced_code_block_escape: ^{{fenced_code_block_end}}
 
+  # https://pandoc.org/MANUAL.html#divs-and-spans
+  fenced_div_block: :{3,}
+
   # https://spec.commonmark.org/0.30/#email-autolink
   email_domain_commonmark: '[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?'
   email_user_commonmark: '[a-zA-Z0-9.!#$%&''*+/=?^_`{|}~-]+'
@@ -256,6 +259,7 @@ variables:
        |  {{block_quote}}             # a blockquote begins the line
        |  {{atx_heading}}             # an ATX heading begins the line
        |  {{fenced_code_block_start}} # a fenced codeblock begins the line
+       |  {{fenced_div_block}}        # a fenced div block begins the line
        |  {{thematic_break}}          # line is a thematic beak
        |  {{first_list_item}}         # a list item begins the line
        |  {{html_block}}              # a html block begins the line
@@ -269,6 +273,7 @@ variables:
         |   {{block_quote}}             # a blockquote begins the line
         |   {{atx_heading}}             # an ATX heading begins the line
         |   {{fenced_code_block_start}} # a fenced codeblock begins the line
+        |   {{fenced_div_block}}        # a fenced div block begins the line
         |   {{thematic_break}}          # line is a thematic beak
         |   {{list_item}}               # a list item begins the line
         |   {{html_block}}              # a html block begins the line
@@ -362,6 +367,7 @@ contexts:
     - include: list-blocks
     - include: tables
     - include: fenced-code-blocks
+    - include: fenced-div-blocks
     - include: html-blocks
     - include: reference-definitions
     - include: atx-headings
@@ -594,6 +600,7 @@ contexts:
            |   {{reference_definition}}    # a reference definition begins the line
            |   {{atx_heading}}             # an ATX heading begins the line
            |   {{fenced_code_block_start}} # a fenced codeblock begins the line
+           |   {{fenced_div_block}}        # a fenced div block begins the line
            |   {{thematic_break}}          # line is a thematic beak
            |   {{list_item}}               # a list item begins the line
            |   {{html_block}}              # a html block begins the line
@@ -705,6 +712,7 @@ contexts:
            (?: $                           # the line is blank (or only contains whitespace)
            |   {{atx_heading}}             # an ATX heading begins the line
            |   {{fenced_code_block_start}} # a fenced codeblock begins the line
+           |   {{fenced_div_block}}        # a fenced div block begins the line
            |   {{thematic_break}}          # line is a thematic beak
            |   {{list_item}}               # a list item begins the line
            |   {{html_block}}              # a html block begins the line
@@ -732,6 +740,7 @@ contexts:
            (?: \s* $                       # the line is blank (or only contains whitespace)
            |   {{atx_heading}}             # an ATX heading begins the line
            |   {{fenced_code_block_start}} # a fenced codeblock begins the line
+           |   {{fenced_div_block}}        # a fenced div block begins the line
            |   {{thematic_break}}          # line is a thematic beak
            |   {{list_item}}               # a list item begins the line
            |   {{html_block}}              # a html block begins the line
@@ -1147,7 +1156,6 @@ contexts:
     - include: fenced-rust
     - include: fenced-scala
     - include: fenced-shell
-    - include: fenced-shell-script
     - include: fenced-sql
     - include: fenced-tsx
     - include: fenced-typescript
@@ -2007,46 +2015,24 @@ contexts:
     - match: |-
          (?x)
           {{fenced_code_block_start}}
-          (?i:\s*(console|shell))
+          (?i:\s*(console|bash|shell(?:-script)?|sh)|zsh)
           {{fenced_code_block_trailing_infostring_characters}}
       captures:
         0: meta.code-fence.definition.begin.shell.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:source.shell.interactive.markdown
+      embed: scope:source.shell.embedded.markdown
       embed_scope:
         markup.raw.code-fence.shell.markdown-gfm
-        source.shell.interactive.markdown
+        source.shell
       escape: '{{fenced_code_block_escape}}'
       escape_captures:
         0: meta.code-fence.definition.end.shell.markdown-gfm
         1: punctuation.definition.raw.code-fence.end.markdown
         2: meta.fold.code-fence.end.markdown
 
-  fenced-shell-script:
-    - match: |-
-         (?x)
-          {{fenced_code_block_start}}
-          (?i:\s*(shell-script|sh|bash|zsh))
-          {{fenced_code_block_trailing_infostring_characters}}
-      captures:
-        0: meta.code-fence.definition.begin.shell-script.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:source.shell.bash
-      embed_scope:
-        markup.raw.code-fence.shell-script.markdown-gfm
-        source.shell.bash
-      escape: '{{fenced_code_block_escape}}'
-      escape_captures:
-        0: meta.code-fence.definition.end.shell-script.markdown-gfm
-        1: punctuation.definition.raw.code-fence.end.markdown
-        2: meta.fold.code-fence.end.markdown
-
   fenced-sql:
     - match: |-
          (?x)
@@ -3090,6 +3076,7 @@ contexts:
            |   {{reference_definition}}    # a reference definition begins the line
            |   {{atx_heading}}             # an ATX heading begins the line
            |   {{fenced_code_block_start}} # a fenced codeblock begins the line
+           |   {{fenced_div_block}}        # a fenced div block begins the line
            |   {{thematic_break}}          # line is a thematic beak
            |   {{list_item}}               # a list item begins the line
            |   {{html_block}}              # a html block begins the line
@@ -3205,6 +3192,7 @@ contexts:
           |   {{atx_heading}}
           |   {{block_quote}}
           |   {{fenced_code_block_start}}
+          |   {{fenced_div_block}}
           |   {{indented_code_block}}
           |   {{thematic_break}}
           )
@@ -4368,6 +4356,46 @@ contexts:
     - include: scope:text.tex.latex#macros
     - include: scope:text.tex.latex#math-content
 
+###[ EXTENSIONS: PANDOC FENCED DIVS ]##########################################
+
+  fenced-div-blocks:
+    # https://pandoc.org/MANUAL.html#divs-and-spans
+    - match: ^[ \t]*({{fenced_div_block}})[ \t]*(?=\S)
+      captures:
+        1: punctuation.section.block.begin.markdown
+      push:
+        - fenced-div-body
+        - fenced-div-puncuation
+        - fenced-div-attr
+
+  fenced-div-attr:
+    - meta_include_prototype: false
+    - match: \{
+      scope: punctuation.definition.attributes.begin.markdown
+      set: link-def-attr-body
+    - match: '{{tag_attribute_name_start}}'
+      set:
+        - tag-attr-meta
+        - tag-attr-equals
+        - tag-attr-name
+    - match: else-pop
+
+  fenced-div-puncuation:
+    - meta_include_prototype: false
+    - match: ':+'
+      scope: punctuation.section.block.markdown
+      pop: 1
+    - include: else-pop
+
+  fenced-div-body:
+    - meta_include_prototype: false
+    - meta_scope: meta.block.div.markdown
+    - match: ^[ \t]*(\1)(\s*\n)
+      captures:
+        1: punctuation.section.block.end.markdown
+      pop: 1
+    - include: markdown
+
 ###[ PROTOTYPES ]#############################################################
 
   else-pop:
@@ -4386,4 +4414,3 @@ contexts:
   immediately-pop:
     - match: ''
       pop: 1
-

syntaxes/Shell (for Markdown).sublime-syntax

@@ -1,37 +1,41 @@
 %YAML 1.2
 ---
-name: Interactive Unix Shell
-scope: source.shell.interactive.markdown
+scope: source.shell.embedded.markdown
 version: 2
 hidden: true
 
 extends: Packages/ShellScript/Shell-Unix-Generic.sublime-syntax
 
 contexts:
-  prototype:
-    - meta_prepend: true
-    # continuation lines begin with `> `
-    - match: ^\s*(>)\s
-      captures:
-        1: comment.other.shell
-
   main:
+    - meta_include_prototype: false
+    # found shebang => normal script
+    - match: ^(?=\s*#!)
+      set: [statements, shebang]
+    # first non-comment line starts with `$` => interactive shell
     - match: ^(?=\s*\$\s)
-      push: shell-interactive
-    - include: statements
+      set: shell-interactive
+    # some script without shebang
+    - match: ^(?=\s*[^#])
+      set: statements
+    - include: comments
 
   shell-interactive:
     - match: ^\s*(\$)(?=\s)
       captures:
         1: comment.other.shell
       embed: statements
-      escape: (?<![^\\]\\)(?<![\\]{3})\n
+      escape: '{{no_escape_behind}}\n'
 
   line-continuation-body:
     - meta_prepend: true
-    - meta_include_prototype: false
-    # continuation lines begin with `> `
+    # continuation line of interactive shells begin with `> `
     - match: ^\s*(>)\s
       captures:
         1: comment.other.shell
       pop: 1
+
+variables:
+  # lazy escaping from heredoc as shell maybe indented
+  no_indent: ^\s*
+  tab_indent: ^\s*