Scintillua - merge relevant recent upstream commits #920
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The upstream revision was 09e0ff07283d62fae5cd3ef6ccc27f31c9360708.
This preserves backward compatibility with existing theme files.
This should fix the coloring of lexers using the new table based style definitions.
Replaces the current vis version with the more extensive upstream one. Thanks to @lepotic for spotting the upstream version inherited from the lua lexer.
Importing upstream version, without merging the changes introduced by commit cb41e7e In part as that commit introduces extensive changes for which the purpose is not clear to me from the commit message or changes.
Upstream already contains commit 657ab2e and list already high in rule list so d8ab659 is also superseded. However martanne#823 appears to resurface as syntax highlighting in code blocks fails.
This version works as expected on PHP comments. Vis commit 0ff02a7 to fix bug martanne#659 is no longer needed. It also adds new constants and keywords of commit 3232697 and c88474f.
This merges commit 79859b5 that fixes performance. Note that the commit highlights a TODO: keys should only be highlighted in {} mappings.
This adds commit 7e9e0a2 The new pattern does more or less the same thing, but forward instead of backward to speed it up.
Adds commit 807ba6f in new format. Otherwise, show-{tabs,newlines,spaces} replacement characters are undistinguishable from normal text.
This version allows {} to be nested in shell variables allowing a lines like
: ${FOO:="${bar}/baz"}
to be highlighted correctly. This supersedes commit 21727ae
This updates the readme for moving to the non-legacy lexer format. Changes made: 1) fixed links to upstream documentation and source. 2) added links to color-templates. 3) bumped LPeg dependency to 1.0.0 or higher as stated by upstream.
This refractors the legacy yaml lexer and includes the fix added in commit 89896da as stated in the following upstream comment: orbitalquark/scintillua@8829edb
This update includes an upstream refactor of the ansi_c lexer that incorporates the majority of fixes introduced by commit 1e9eb86 and hence supersedes it.
This adds a refactored scheme lexer that incorporates the vis patch introduced in commit 6455498
Upstream has removed the vbscript lexer in favor of the vb lexer as both are identical. See upstream commit dee7d76
martanne
force-pushed
the
scintillua
branch
2 times, most recently
from
f2b469c to
7574a46
Compare
|
I rebased once again and merged the latest upstream changes. There were quite a few annoying style changes. I hope that I didn't mess it up? I also summarized the current state in the corresponding issue. Thanks. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The following commits continues on pull-request #916 that I appear unable to reopen. These three commits bring ansi_c; scheme and the yaml lexers in sync with upstream closing some of the outstanding issues.
btw) the key missing element at the moment is the patch you mentioned here: is the #916 (comment)