fix(ignores): ensure we always pass a relative string to the ignores …

…package

decls/index.js

@@ -84,6 +84,9 @@ declare var atom: {
   packages: {
     isPackageActive: (name: string) => boolean,
   },
+  project: {
+    relativizePath: (path: string) => [string | null, string],
+  },
   tooltips: {
     add: (target: HTMLElement, options?: Atom$Tooltips$Options) => Atom$Disposable,
   },

dist/atomInterface/index.js

@@ -6,6 +6,8 @@ var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+const _ = require('lodash/fp');
+
 // constants
 const LINTER_LINT_COMMAND = 'linter:lint';
 
@@ -68,6 +70,8 @@ const attemptWithErrorNotification = (() => {
 
 const runLinter = editor => isLinterLintCommandDefined(editor) && atom.commands.dispatch(atom.views.getView(editor), LINTER_LINT_COMMAND);
 
+const relativizePathFromAtomProject = path => path ? _.get('[1]', atom.project.relativizePath(path)) : null;
+
 module.exports = {
   addErrorNotification,
   addInfoNotification,
@@ -82,6 +86,7 @@ module.exports = {
   isDisabledIfNoConfigFile,
   isFormatOnSaveEnabled,
   isLinterEslintAutofixEnabled,
+  relativizePathFromAtomProject,
   runLinter,
   shouldRespectEslintignore,
   shouldUseEslint,

dist/formatOnSave/isFilePathEslintIgnored.js

@@ -11,7 +11,7 @@ const getNearestEslintignorePath = filePath => findCachedFromFilePath(filePath,
 
 const safeRelativePath = _.curry(
 // $FlowFixMe
-(from, to) => !!from && !!to ? path.relative(from, to) : undefined);
+(from, to) => !!from && !!to ? path.join(path.relative(from, to)) : undefined);
 
 const getFilePathRelativeToEslintignore = (filePath
 // $FlowIssue: lodashfp placeholders not supported yet

dist/formatOnSave/shouldFormatOnSave.js

@@ -14,19 +14,20 @@ const {
   isFormatOnSaveEnabled,
   isDisabledIfNotInPackageJson,
   isDisabledIfNoConfigFile,
+  relativizePathFromAtomProject,
   shouldRespectEslintignore
 } = require('../atomInterface');
 const isFilePathEslintIgnored = require('./isFilePathEslintIgnored');
 const isPrettierInPackageJson = require('./isPrettierInPackageJson');
 
 const hasFilePath = editor => !!getCurrentFilePath(editor);
 
-const filePathDoesNotMatchBlacklistGlobs = _.flow(getCurrentFilePath, filePath => _.negate(someGlobsMatchFilePath)(getExcludedGlobs(), filePath));
+const filePathDoesNotMatchBlacklistGlobs = _.flow(getCurrentFilePath, relativizePathFromAtomProject, filePath => _.negate(someGlobsMatchFilePath)(getExcludedGlobs(), filePath));
 
 // $FlowFixMe
 const noWhitelistGlobsPresent = _.flow(getWhitelistedGlobs, _.isEmpty);
 
-const isFilePathWhitelisted = _.flow(getCurrentFilePath, filePath => someGlobsMatchFilePath(getWhitelistedGlobs(), filePath));
+const isFilePathWhitelisted = _.flow(getCurrentFilePath, relativizePathFromAtomProject, filePath => someGlobsMatchFilePath(getWhitelistedGlobs(), filePath));
 
 const isEslintIgnored = _.flow(getCurrentFilePath, isFilePathEslintIgnored);
 

src/atomInterface/index.js

@@ -1,4 +1,5 @@
 // @flow
+const _ = require('lodash/fp');
 
 // constants
 const LINTER_LINT_COMMAND = 'linter:lint';
@@ -67,6 +68,9 @@ const runLinter = (editor: TextEditor) =>
   isLinterLintCommandDefined(editor) &&
   atom.commands.dispatch(atom.views.getView(editor), LINTER_LINT_COMMAND);
 
+const relativizePathFromAtomProject = (path: ?string) =>
+  path ? _.get('[1]', atom.project.relativizePath(path)) : null;
+
 module.exports = {
   addErrorNotification,
   addInfoNotification,
@@ -81,6 +85,7 @@ module.exports = {
   isDisabledIfNoConfigFile,
   isFormatOnSaveEnabled,
   isLinterEslintAutofixEnabled,
+  relativizePathFromAtomProject,
   runLinter,
   shouldRespectEslintignore,
   shouldUseEslint,

src/formatOnSave/isFilePathEslintIgnored.js

@@ -11,7 +11,8 @@ const getNearestEslintignorePath = (filePath: FilePath): ?FilePath =>
 
 const safeRelativePath = _.curry(
   // $FlowFixMe
-  (from: ?FilePath, to: ?FilePath): ?FilePath => (!!from && !!to ? path.relative(from, to) : undefined),
+  (from: ?FilePath, to: ?FilePath): ?FilePath =>
+    !!from && !!to ? path.join(path.relative(from, to)) : undefined,
 );
 
 const getFilePathRelativeToEslintignore = (filePath: FilePath): ?FilePath =>

src/formatOnSave/shouldFormatOnSave.js

@@ -13,6 +13,7 @@ const {
   isFormatOnSaveEnabled,
   isDisabledIfNotInPackageJson,
   isDisabledIfNoConfigFile,
+  relativizePathFromAtomProject,
   shouldRespectEslintignore,
 } = require('../atomInterface');
 const isFilePathEslintIgnored = require('./isFilePathEslintIgnored');
@@ -22,6 +23,7 @@ const hasFilePath = (editor: TextEditor) => !!getCurrentFilePath(editor);
 
 const filePathDoesNotMatchBlacklistGlobs: (editor: TextEditor) => boolean = _.flow(
   getCurrentFilePath,
+  relativizePathFromAtomProject,
   (filePath: ?FilePath) => _.negate(someGlobsMatchFilePath)(getExcludedGlobs(), filePath),
 );
 
@@ -33,6 +35,7 @@ const noWhitelistGlobsPresent: () => boolean = _.flow(
 
 const isFilePathWhitelisted: (editor: TextEditor) => boolean = _.flow(
   getCurrentFilePath,
+  relativizePathFromAtomProject,
   (filePath: ?FilePath) => someGlobsMatchFilePath(getWhitelistedGlobs(), filePath),
 );
 

src/formatOnSave/shouldFormatOnSave.test.js

@@ -13,6 +13,7 @@ const {
   isFormatOnSaveEnabled,
   getExcludedGlobs,
   getWhitelistedGlobs,
+  relativizePathFromAtomProject,
   shouldRespectEslintignore,
 } = require('../atomInterface');
 const getPrettierInstance = require('../helpers/getPrettierInstance');
@@ -31,6 +32,7 @@ beforeEach(() => {
   isFormatOnSaveEnabled.mockImplementation(() => true);
   isFileFormattable.mockImplementation(() => true);
   getCurrentFilePath.mockImplementation(() => fakeCurrentFilePath);
+  relativizePathFromAtomProject.mockImplementation(() => fakeCurrentFilePath);
   isFilePathEslintIgnored.mockImplementation(() => false);
   isPrettierProperVersion.mockImplementation(() => true);
   isDisabledIfNotInPackageJson.mockImplementation(() => false);