Scopes tokenizer: new implementation #5628
Draft
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
nightwing
reviewed
Aug 20, 2024
| @@ -2,5 +2,5 @@ | |||
| const textTokens = new Set(["text", "rparen", "lparen"]); | |||
|
|
|||
| exports.isTextToken = function(tokenType) { | |||
| return textTokens.has(tokenType); | |||
| return textTokens.has(tokenType.toString()); | |||
There was a problem hiding this comment.
Without it simple_tokenizer is not working as expected
| @@ -13,7 +13,7 @@ oop.inherits(FoldMode, BaseFoldMode); | |||
|
|
|||
|
|
|||
| this.$getMode = function(state) { | |||
| if (typeof state != "string") | |||
| if (Array.isArray(state)) | |||
| state = state[0]; | |||
| for (var key in this.subModes) { | |||
There was a problem hiding this comment.
Should we add .syntax property to Scope to make this simpler?
src/mode/lua_highlight_rules.js
Outdated
| onMatch2 : function(value, scope){ | ||
| var parent = scope.get("bracketedComment" + (value.length - 2)) | ||
| parent.meta = (value.length - 2); | ||
| return parent.get(this.next).get("comment"); |
There was a problem hiding this comment.
Should use scope.get(this.next, value.length - 2).get("comment");
| @@ -99,12 +99,16 @@ TextHighlightRules = function() { | |||
| }; | |||
|
|
|||
| var pushState = function(currentState, stack) { | |||
| if (currentState != "start" || stack.length) | |||
| stack.unshift(this.nextState, currentState); | |||
| if (typeof currentState.get == "function") { | |||
There was a problem hiding this comment.
Can we keep only the scope variant here?
There was a problem hiding this comment.
We would need to make significant changes in normalizeRules logic in that case
# Conflicts: # src/mode/lua_highlight_rules.js
nightwing
force-pushed
the
scopes-tokenizer
branch
from
92db310
to
c6141fa
Compare
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.
Issue #, if available:
Description of changes:
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.
Pull Request Checklist:
ace.d.ts) and its references: