Merge pull request #264 from Galooshi/fix-263

Fix using absolute paths for path to current file

lib/Importer.js

@@ -1,5 +1,6 @@
 'use strict';
 
+import escapeRegExp from 'lodash.escaperegexp';
 import eslint from 'eslint';
 
 import CommandLineEditor from './CommandLineEditor';
@@ -27,7 +28,12 @@ export default class Importer {
   constructor(lines, pathToCurrentFile) {
     this.editor = new CommandLineEditor(lines);
     this.config = new Configuration(pathToCurrentFile);
-    this.pathToCurrentFile = pathToCurrentFile;
+
+    // Normalize the path to the current file so that we only have to deal with
+    // local paths.
+    this.pathToCurrentFile = pathToCurrentFile && pathToCurrentFile.replace(
+      RegExp(`^${escapeRegExp(process.cwd())}/`), '');
+
     this.messages = Array.from(this.config.messages);
     this.unresolvedImports = {};
   }

lib/JsModule.js

@@ -92,16 +92,13 @@ export default class JsModule {
       return;
     }
 
-    // First, strip out any absolute path up until the current directory
-    let makeRelativeTo = makeRelativeToPath.replace(`^${process.cwd()}/`, '');
-
     // Ignore if the file to relate to is part of a different lookupPath
-    if (!makeRelativeTo.startsWith(this.lookupPath)) {
+    if (!makeRelativeToPath.startsWith(this.lookupPath)) {
       return;
     }
 
     // Strip out the lookupPath
-    makeRelativeTo = makeRelativeTo.replace(
+    const makeRelativeTo = makeRelativeToPath.replace(
       RegExp(`^${escapeRegExp(this.lookupPath)}/`), '');
 
     let importPath = path.relative(

lib/__tests__/Importer-test.js

@@ -1864,6 +1864,20 @@ foo
             expect(subject()).toEqual(`
 import foo from 'foo';
 
+foo
+            `.trim());
+          });
+        });
+
+        describe('when the current file is an absolute path in the same lookupPath', () => {
+          beforeEach(() => {
+            pathToCurrentFile = `${process.cwd()}/bar/test.js`;
+          });
+
+          it('uses a relative import path', () => {
+            expect(subject()).toEqual(`
+import foo from './foo';
+
 foo
             `.trim());
           });