Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ST4 next #759

Merged
merged 16 commits into from
Apr 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[run]
omit = */tests/*
25 changes: 23 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions .github/workflows/ci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ on:
jobs:
lint:
name: Python ${{ matrix.python }}
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
strategy:
matrix:
python:
Expand All @@ -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 }}
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/ci-syntax-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions .github/workflows/deploy-gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Default (Linux).sublime-keymap
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
]
Expand Down
2 changes: 1 addition & 1 deletion Default (OSX).sublime-keymap
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
]
Expand Down
2 changes: 1 addition & 1 deletion Default (Windows).sublime-keymap
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
]
Expand Down
3 changes: 2 additions & 1 deletion messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
18 changes: 18 additions & 0 deletions messages/3.1.13.md
Original file line number Diff line number Diff line change
@@ -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
48 changes: 24 additions & 24 deletions syntaxes/Fold.tmPreferences
Original file line number Diff line number Diff line change
@@ -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>
Loading