Tags: sublimehq/Packages
Tags
[HTML] Improve conflict markers in tags and values (#4238) * [HTML] Move syntax tests to tests/ directory * [HTML] Fix various conflict marker issues This commit explicitly includes `merge-conflict-markers` in front of each tag end punctuation (`>` or `/>`) to ensure conflict markers taking precedence. Including that context in `tag-attributes` is not sufficient as it is included after tag end punctuation patterns. Including that context in `prototype` is not sufficient as as it is excluded from tag attribute contexts for templating languages to inject template tags only within attribute names or values using `prototype`. Syntax tests are reorganized in a dedicated test file.
[HTML] Improve conflict markers in tags and values (#4238) * [HTML] Move syntax tests to tests/ directory * [HTML] Fix various conflict marker issues This commit explicitly includes `merge-conflict-markers` in front of each tag end punctuation (`>` or `/>`) to ensure conflict markers taking precedence. Including that context in `tag-attributes` is not sufficient as it is included after tag end punctuation patterns. Including that context in `prototype` is not sufficient as as it is excluded from tag attribute contexts for templating languages to inject template tags only within attribute names or values using `prototype`. Syntax tests are reorganized in a dedicated test file.
[Diff] Refactor for Diff3, Git, and conflicts (#4111) [Diff] Refactor Diff, Git Diff and Diff3 This commit... 1. rewrites Diff and Diff3 syntax according to the GNU and SVN documentation. 2. adds new Git Diff syntax, also used by Git Log. ## Notable changes - new support for - Diff3 formats - Conflict sections - "Combined" unified diffs, only in Git Diff - new syntax for Git Diff emails (`git am` and `git format-patch`) - if normal Diff syntax detects the "magic" first line, it delegates out to Git Diff instead. - tweaked scopes, preserving stacking from #2178 for backwards-compatibility - lots of documentation links - lots of new tests, mostly pulled from relevant documentation Co-authored-by: deathaxe <[email protected]>
[Diff] Refactor for Diff3, Git, and conflicts (#4111) [Diff] Refactor Diff, Git Diff and Diff3 This commit... 1. rewrites Diff and Diff3 syntax according to the GNU and SVN documentation. 2. adds new Git Diff syntax, also used by Git Log. ## Notable changes - new support for - Diff3 formats - Conflict sections - "Combined" unified diffs, only in Git Diff - new syntax for Git Diff emails (`git am` and `git format-patch`) - if normal Diff syntax detects the "magic" first line, it delegates out to Git Diff instead. - tweaked scopes, preserving stacking from #2178 for backwards-compatibility - lots of documentation links - lots of new tests, mostly pulled from relevant documentation Co-authored-by: deathaxe <[email protected]>
[Diff] Refactor for Diff3, Git, and conflicts (#4111) [Diff] Refactor Diff, Git Diff and Diff3 This commit... 1. rewrites Diff and Diff3 syntax according to the GNU and SVN documentation. 2. adds new Git Diff syntax, also used by Git Log. ## Notable changes - new support for - Diff3 formats - Conflict sections - "Combined" unified diffs, only in Git Diff - new syntax for Git Diff emails (`git am` and `git format-patch`) - if normal Diff syntax detects the "magic" first line, it delegates out to Git Diff instead. - tweaked scopes, preserving stacking from #2178 for backwards-compatibility - lots of documentation links - lots of new tests, mostly pulled from relevant documentation Co-authored-by: deathaxe <[email protected]>
[Diff] Refactor for Diff3, Git, and conflicts (#4111) [Diff] Refactor Diff, Git Diff and Diff3 This commit... 1. rewrites Diff and Diff3 syntax according to the GNU and SVN documentation. 2. adds new Git Diff syntax, also used by Git Log. ## Notable changes - new support for - Diff3 formats - Conflict sections - "Combined" unified diffs, only in Git Diff - new syntax for Git Diff emails (`git am` and `git format-patch`) - if normal Diff syntax detects the "magic" first line, it delegates out to Git Diff instead. - tweaked scopes, preserving stacking from #2178 for backwards-compatibility - lots of documentation links - lots of new tests, mostly pulled from relevant documentation Co-authored-by: deathaxe <[email protected]>
[Java] Fix literal backslash in strings (#4038) This commit removes `invalid.illegal` scope from unsupported escape sequences. Actually `\` is interpreted literal if it doesn't start a supported escape sequence. The following is a valid string without illegals: ``` new Source("src\main\java\com\example\application\views\HomeView.java") ```
[Java] Fix literal backslash in strings (#4038) This commit removes `invalid.illegal` scope from unsupported escape sequences. Actually `\` is interpreted literal if it doesn't start a supported escape sequence. The following is a valid string without illegals: ``` new Source("src\main\java\com\example\application\views\HomeView.java") ```
PreviousNext