[elpa] master ff988f3 051/271: Fix duplicate tokens and tail-end bug.

[Jackson Ray Hamilton]

branch: master
commit ff988f3e20bbc74f0ddb24f0650b43242a36feb7
Author: Jackson Ray Hamilton <address@hidden>
Commit: Jackson Ray Hamilton <address@hidden>

    Fix duplicate tokens and tail-end bug.
---
 context-coloring.el |    4 ++--
 scopifier.js        |   28 +++++++++++++++++-----------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/context-coloring.el b/context-coloring.el
index 82708e4..7d1fb02 100644
--- a/context-coloring.el
+++ b/context-coloring.el
@@ -193,7 +193,7 @@ calling FUNCTION with the parsed list of tokens."
                                 (with-current-buffer buffer
                                   (context-coloring-apply-tokens tokens))
                                 (setq context-coloring-scopifier-process nil)
-                                ;; (message "Colorized (after %f seconds)." (- 
(float-time) start-time))
+                                (message "Colorized (after %f seconds)." (- 
(float-time) start-time))
                                 )))))
 
   ;; Give the process its input.
@@ -206,7 +206,7 @@ calling FUNCTION with the parsed list of tokens."
 (defun context-coloring-colorize ()
   (interactive)
   (setq context-coloring-colorize-start-time (float-time))
-  ;; (message "%s" "Colorizing.")
+  (message "%s" "Colorizing.")
   (context-coloring-scopify))
 
 (defun context-coloring-change-function (start end length)
diff --git a/scopifier.js b/scopifier.js
index c534ca7..3b2338d 100644
--- a/scopifier.js
+++ b/scopifier.js
@@ -4,6 +4,13 @@
 
 var escope = require('escope'),
     esprima = require('esprima'),
+    isDefined = function (definitions, range) {
+        return definitions.some(function (definition) {
+            // Check for identical definitions.
+            return definition[1] === range[0] &&
+                definition[2] === range[1];
+        });
+    },
     whole = '';
 
 process.stdin.setEncoding('utf8');
@@ -36,6 +43,7 @@ process.stdin.on('end', function () {
     }
 
     analyzedScopes.forEach(function (scope) {
+        var scopeDefinitions;
         if (scope.level === undefined) {
             if (scope.upper) {
                 if (scope.upper.functionExpressionScope) {
@@ -57,6 +65,7 @@ process.stdin.on('end', function () {
                 scope.block.range[0],
                 scope.block.range[1]
             ]);
+            scopeDefinitions = [];
             scope.variables.forEach(function (variable) {
                 var definitions = [],
                     references = [];
@@ -69,13 +78,8 @@ process.stdin.on('end', function () {
                     ]);
                 });
                 variable.references.forEach(function (reference) {
-                    var range = reference.identifier.range,
-                        isDefined = definitions.some(function (definition) {
-                            // Check for identical definitions.
-                            return definition[1] === range[0] &&
-                                definition[2] === range[1];
-                        });
-                    if (isDefined) {
+                    var range = reference.identifier.range;
+                    if (isDefined(definitions, range)) {
                         return;
                     }
                     references.push([
@@ -84,16 +88,16 @@ process.stdin.on('end', function () {
                         range[1]
                     ]);
                 });
+                Array.prototype.push.apply(scopeDefinitions, definitions);
                 Array.prototype.push.apply(symbols, definitions);
                 Array.prototype.push.apply(symbols, references);
             });
             scope.references.forEach(function (reference) {
-                var range;
-                if (reference.resolved) {
+                var range = reference.identifier.range;
+                if (reference.resolved || isDefined(scopeDefinitions, range)) {
                     return;
                 }
                 // Handle global references.
-                range = reference.identifier.range;
                 symbols.push([
                     0,
                     range[0],
@@ -118,7 +122,9 @@ process.stdin.on('end', function () {
 
     continuous = continuous.slice(1).reduce(function (soFar, token) {
         var previous = soFar[soFar.length - 1];
-        if (previous[0] === token[0]) {
+        // Detect same-color exact tail ends (nothing else is safe to join).
+        if (previous[0] === token[0] &&
+                previous[2] === token[1] - 1) {
             previous[2] = token[2];
             return soFar;
         }