Fix computation of end offset of comment

Author: nwalters512

lib/nodes/inline-comment.js

@@ -8,7 +8,7 @@ module.exports = {
     if (token[0] === 'word' && token[1].slice(0, 2) === '//') {
       const first = token;
       const bits = [];
-      let last;
+      let endOffset;
       let remainingInput;
 
       while (token) {
@@ -20,7 +20,12 @@ module.exports = {
 
             // Get remaining input and retokenize
             remainingInput = token[1].substring(token[1].indexOf('\n'));
-            remainingInput += this.input.css.valueOf().substring(this.tokenizer.position());
+            const untokenizedRemainingInput = this.input.css
+              .valueOf()
+              .substring(this.tokenizer.position());
+            remainingInput += untokenizedRemainingInput;
+
+            endOffset = token[3] + untokenizedRemainingInput.length - remainingInput.length;
           } else {
             // If the tokenizer went to the next line go back
             this.tokenizer.back(token);
@@ -29,11 +34,12 @@ module.exports = {
         }
 
         bits.push(token[1]);
-        last = token;
+        // eslint-disable-next-line prefer-destructuring
+        endOffset = token[2];
         token = this.tokenizer.nextToken({ ignoreUnclosed: true });
       }
 
-      const newToken = ['comment', bits.join(''), first[2], last[2]];
+      const newToken = ['comment', bits.join(''), first[2], endOffset];
       this.inlineComment(newToken);
 
       // Replace tokenizer to retokenize the rest of the string

test/parser/comments.test.js

@@ -180,7 +180,7 @@ test('inline comments with asterisk are persisted (#135)', (t) => {
   t.is(nodeToString(root), less);
 });
 
-test.only('handles single quotes in comments (#163)', (t) => {
+test('handles single quotes in comments (#163)', (t) => {
   const less = `a {\n  // '\n  color: pink;\n}\n\n/** ' */`;
 
   const root = parse(less);
@@ -203,8 +203,7 @@ test.only('handles single quotes in comments (#163)', (t) => {
   t.is(innerCommentNode.source.start.line, 2);
   t.is(innerCommentNode.source.start.column, 3);
   t.is(innerCommentNode.source.end.line, 2);
-  // TODO: this test is failing
-  // t.is(innerCommentNode.source.end.column, 6);
+  t.is(innerCommentNode.source.end.column, 6);
 
   t.is(declarationNode.source.start.line, 3);
   t.is(declarationNode.source.start.column, 3);