Merge 277db6e into 4e04449

jscs-dev · Nov 27, 2015 · e68ff7a · e68ff7a
2 parents 4e04449 + 277db6e
commit e68ff7a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/lib/js-file.js b/lib/js-file.js
@@ -847,6 +847,8 @@ JsFile.prototype = {
             var i = startLine - 1;
 
             if (startLine === endLine) {
+                // Remove tralling spaces (see gh-1968)
+                lines[i] = lines[i].replace(/\*\/\s+/, '\*\/');
                 lines[i] = lines[i].substring(0, startCol) + lines[i].substring(endCol);
             } else {
                 lines[i] = lines[i].substring(0, startCol);

diff --git a/test/specs/js-file.js b/test/specs/js-file.js
@@ -1290,6 +1290,13 @@ describe('js-file', function() {
             expect(file.getComments()[0].value).to.equal('comment1');
             expect(file.getComments()[1].value).to.equal('comment2');
         });
+
+        it('should remove left tralling spaces', function() {
+            var source = '/* bar */ false';
+            var file = createJsFile(source);
+            var lines = file.getLinesWithCommentsRemoved();
+            expect(lines[0]).to.equal('false');
+        });
     });
 
     describe('getFilename', function() {

diff --git a/test/specs/rules/disallow-mixed-spaces-and-tabs.js b/test/specs/rules/disallow-mixed-spaces-and-tabs.js
@@ -55,11 +55,6 @@ describe('rules/disallow-mixed-spaces-and-tabs', function() {
               .to.have.one.validation.error.from('disallowMixedSpacesAndTabs');
         });
 
-        it('should report tabs with spaces with multiline comment in between', function() {
-            expect(checker.checkString('\t/**/ \tvar x;'))
-              .to.have.one.validation.error.from('disallowMixedSpacesAndTabs');
-        });
-
         it('should report tabs before single space to align non-docblock multiline', function() {
             expect(checker.checkString('var x;' + multilineNotDocBlock)).to.have.no.errors();
         });