[elpa] master 18e35dd 069/271: Shift token properties.

[Jackson Ray Hamilton]

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

    Shift token properties.
---
 context-coloring.el |   13 +++++++------
 scopifier.js        |   16 ++++++++--------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/context-coloring.el b/context-coloring.el
index 018a94e..18bf436 100644
--- a/context-coloring.el
+++ b/context-coloring.el
@@ -169,9 +169,10 @@ For example: \"context-coloring-depth-1-face\"."
 ;;; Tokenization functions
 
 ;; Tokens are vectors with the following form:
-;; 0: Level
-;; 1: Start
-;; 2: End
+;; 0: Start
+;; 1: End
+;; 2: Level
+;; 3: Style
 (defun context-coloring-apply-tokens (tokens)
   "Processes TOKENS to apply context-based coloring to the current buffer."
   (with-silent-modifications
@@ -181,9 +182,9 @@ For example: \"context-coloring-depth-1-face\"."
           (len (length tokens)))
       (while (< i len)
         (let ((token (elt tokens i)))
-          (let ((face (context-coloring-level-face (elt token 0) (elt token 
3)))
-                (start (elt token 1))
-                (end (elt token 2)))
+          (let ((start (elt token 0))
+                (end (elt token 1))
+                (face (context-coloring-level-face (elt token 2) (elt token 
3))))
             (add-text-properties start end `(face ,face rear-nonsticky t))))
         (setq i (+ i 1))))))
 
diff --git a/scopifier.js b/scopifier.js
index 7e4c64e..26501e4 100644
--- a/scopifier.js
+++ b/scopifier.js
@@ -9,8 +9,8 @@ var escope = require('escope'),
     isDefined = function (definitions, range) {
         return definitions.some(function (definition) {
             // Check for identical definitions.
-            return definition[1] === range[0] &&
-                definition[2] === range[1];
+            return definition[0] === range[0] &&
+                definition[1] === range[1];
         });
     },
 
@@ -63,18 +63,18 @@ module.exports = function (code) {
             return;
         }
         scopes = scopes.concat([[
-            scope.level,
             scope.block.range[0],
             scope.block.range[1],
+            scope.level,
             normal
         ]]);
         definitions = scope.variables.reduce(function (definitions, variable) {
             var mappedDefinitions = variable.defs.map(function (definition) {
                 var range = definition.name.range;
                 return [
-                    scope.level,
                     range[0],
                     range[1],
+                    scope.level,
                     bold
                 ];
             });
@@ -87,9 +87,9 @@ module.exports = function (code) {
             }
             return references.concat([[
                 // Handle global references too.
-                reference.resolved ? reference.resolved.scope.level : 0,
                 range[0],
                 range[1],
+                reference.resolved ? reference.resolved.scope.level : 0,
                 normal
             ]]);
         }, []);
@@ -100,9 +100,9 @@ module.exports = function (code) {
         .map(function (comment) {
             var range = comment.range;
             return [
-                -1,
                 range[0],
                 range[1],
+                -1,
                 normal
             ];
         });
@@ -113,9 +113,9 @@ module.exports = function (code) {
         .map(function (token) {
             // Emacs starts counting from 1.
             return [
-                token[0],
+                token[0] + 1,
                 token[1] + 1,
-                token[2] + 1,
+                token[2],
                 token[3]
             ];
         });