Skip to content

Better Highlighting for Blocks #4520

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.

Sign up for GitHub

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

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Better Highlighting for Blocks #4520

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
bb116df
Better Highlighting for Blocks
riverdusty Jan 31, 2017
1966c45
Better Highlighting for Blocks
riverdusty Jan 31, 2017
fb38713
Better Highlighting for Blocks
riverdusty Jan 31, 2017
e4750cc
Better Highlighting for Blocks
riverdusty Jan 31, 2017
a2c07ab
Better Highlighting for Blocks
riverdusty Jan 31, 2017
0ad0e15
Original
riverdusty Feb 9, 2017
ee0de9d
Better Highlighting for Blocks
riverdusty Feb 9, 2017
c4ae734
Better Highlighting for Blocks
riverdusty Feb 9, 2017
1619c24
Better Highlighting for Blocks
riverdusty Feb 9, 2017
df3669b
Better Highlighting for Blocks
riverdusty Feb 9, 2017
cfada4e
Better Highlighting for Blocks
riverdusty Feb 9, 2017
ea3b111
Better Highlighting for Blocks
riverdusty Feb 9, 2017
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
Prev Previous commit
Next Next commit
Better Highlighting for Blocks
  • Loading branch information
@riverdusty
riverdusty committed Feb 9, 2017
commit df3669ba7a7f30d8f09f21cc9418c84b455e5c2d
2 changes: 1 addition & 1 deletion mode/smalltalk/smalltalk.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ CodeMirror.defineMode('smalltalk', function(config) {
} else if (/[\w_]/.test(aChar)) {
stream.eatWhile(/[\w\d_]/);
token.name = state.expectVariable ? (keywords.test(stream.current()) ? 'keyword' : 'variable') : null;
token.name = state.expectVariable ? (variables.test(stream.current()) ? 'variable-2' : 'variable') : null;
token.name = state.expectVariable ? (variables.test(stream.current()) ? 'variable-2' : 'variable') : null;
Copy link
Member

@marijnh marijnh Feb 9, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are you assigning to the same property twice here? This effectively disables the previous statement, which doesn't look like it is right.

Copy link
Author

@riverdusty riverdusty Feb 9, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could probably be better represented like,
} else if (/[\w_]/.test(aChar)) { stream.eatWhile(/[\w\d_]/); if(keywords.test(stream.current()){ token.name = 'keyword' } else if(variables.test(stream.current){ token.name = 'variable-2' } else { token.name = 'variable' }


} else {
token.eos = state.expectVariable;
Expand Down