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.

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

Better Highlighting for Blocks #4520

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

Better Highlighting for Blocks #4520

Changes from all commits
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
13 changes: 13 additions & 0 deletions mode/smalltalk/smalltalk.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ CodeMirror.defineMode('smalltalk', function(config) {

var specialChars = /[+\-\/\\*~<>=@%|&?!.,:;^]/;
var keywords = /true|false|nil|self|super|thisContext/;
var variables = /Smalltalk/;
Copy link
Member

Choose a reason for hiding this comment

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

You shouldn't use a mode-global variable to keep state -- modes can be restarted and resumed at different points at any time, and thus state should go into the state object.

Copy link
Author

Choose a reason for hiding this comment

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

I feel like I'm in a lecture! heh. I will make a note of this and a) fix and b) not do it again!


var Context = function(tokenizer, parent) {
this.next = tokenizer;
Expand Down Expand Up @@ -91,6 +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;
Copy link
Member

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

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 Expand Up @@ -120,6 +122,17 @@ CodeMirror.defineMode('smalltalk', function(config) {

if (aChar === '|') {
token.context = context.parent;
var str = stream.string;
Copy link
Member

Choose a reason for hiding this comment

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

Could whatever you're trying to do here be expressed by matching a regexp on the stream at this point? Munging the whole line without regard for where in the line we currently are doesn't seem like a good idea.

Copy link
Author

Choose a reason for hiding this comment

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

I'm not a JS developer by trade, but I am learning. I'll give the RegEx a shot. Basically I'm trying to find whether or not there are additional variables in a block, so [:var1 | |var2 var3| ...]

var arr = str.split('|');
arr.length == 3 ? str = arr[1] : str = arr[2];
if(!str){ str = '' };
var arr2 = str.split(' ');
for(var i=0;i<arr2.length;i++){
Copy link
Member

Choose a reason for hiding this comment

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

(Also please put spaces around operators.)

var aVar = arr2[i].replace(/\s/g, '');
if(aVar.length != 0){
if(!variables.test(aVar)){ variables = new RegExp(variables.source + (new RegExp('|^'+aVar+'$').source))};
}
}
token.eos = true;

} else {
Expand Down