branch: master commit 7ac8db63ad47f5c55c3617bf9befe2daf3f59648 Author: Jackson Ray Hamilton <jack...@jacksonrayhamilton.com> Commit: Jackson Ray Hamilton <jack...@jacksonrayhamilton.com>
Fix a bug where strings were matched. --- .gitignore | 2 +- context-coloring.el | 7 ++++++- scripts/tokenizer.js | 3 ++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 016d3b1..c531d98 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -*.elc \ No newline at end of file +*.elc diff --git a/context-coloring.el b/context-coloring.el index 0a72429..3d88661 100644 --- a/context-coloring.el +++ b/context-coloring.el @@ -111,15 +111,20 @@ Return the name of the temporary file." (define-minor-mode context-coloring-mode "Context-based code coloring for JavaScript, inspired by Douglas Crockford." nil " Context" nil + (make-local-variable 'jit-lock-stealth-time) (make-local-variable 'jit-lock-chunk-size) (make-local-variable 'jit-lock-contextually) (if (not context-coloring-mode) (progn + (setq jit-lock-stealth-time nil) (setq jit-lock-chunk-size 500) (setq jit-lock-contextually `syntax-driven) - (jit-lock-unregister 'context-coloring-fontify-region)) + (jit-lock-unregister 'context-coloring-fontify-region) + (jit-lock-register 'font-lock-fontify-region)) + (setq jit-lock-stealth-time 1) (setq jit-lock-chunk-size 536870911) (setq jit-lock-contextually nil) + (jit-lock-unregister 'font-lock-fontify-region) (jit-lock-register 'context-coloring-fontify-region))) ;;;###autoload diff --git a/scripts/tokenizer.js b/scripts/tokenizer.js index 0e799d1..b7b3268 100644 --- a/scripts/tokenizer.js +++ b/scripts/tokenizer.js @@ -64,7 +64,8 @@ process.stdin.on('end', function () { // Globality is not indicated by origin function. if (token.kind !== 'function' && - data.global.indexOf(token.string) > -1) { + (token.identifier && + data.global.indexOf(token.string) > -1)) { level = 0; } else { level = origin.function.level;