Merge pull request #326 from mrmlnc/ISSUE-325_fix_relative_ignore_patterns

ISSUE-325: do not ignore negative patterns for patterns outside cwd

Author: mrmlnc

src/managers/tasks.spec.ts

@@ -59,7 +59,7 @@ describe('Managers → Task', () => {
 
 		it('should return two tasks when one of patterns contains reference to the parent directory', () => {
 			const expected = [
-				tests.task.builder().base('..').positive('../*.md').build(),
+				tests.task.builder().base('..').positive('../*.md').negative('*.md').build(),
 				tests.task.builder().base('.').positive('*').positive('a/*').negative('*.md').build()
 			];
 

src/managers/tasks.ts

@@ -38,7 +38,7 @@ export function convertPatternsToTasks(positive: Pattern[], negative: Pattern[],
 	const outsideCurrentDirectoryGroup = groupPatternsByBaseDirectory(patternsOutsideCurrentDirectory);
 	const insideCurrentDirectoryGroup = groupPatternsByBaseDirectory(patternsInsideCurrentDirectory);
 
-	tasks.push(...convertPatternGroupsToTasks(outsideCurrentDirectoryGroup, [], dynamic));
+	tasks.push(...convertPatternGroupsToTasks(outsideCurrentDirectoryGroup, negative, dynamic));
 
 	/*
 	 * For the sake of reducing future accesses to the file system, we merge all tasks within the current directory

src/tests/smoke/regular.smoke.ts

@@ -483,3 +483,24 @@ smoke.suite('Smoke → Regular (relative)', [
 	{ pattern: '../{first,second}', cwd: 'fixtures/first' },
 	{ pattern: './../*', cwd: 'fixtures/first' }
 ]);
+
+smoke.suite('Smoke → Regular (relative & ignore)', [
+	{
+		pattern: './../*',
+		cwd: 'fixtures/first',
+		ignore: '../*',
+		correct: true,
+		reason: 'The `node-glob` package does not exclude files, although the `../*` pattern can be applied here.'
+	},
+	{ pattern: './../*', cwd: 'fixtures/first', ignore: './../*' },
+	{ pattern: './../*', cwd: 'fixtures/first', ignore: '**' },
+
+	{ pattern: '../*', cwd: 'fixtures/first', ignore: '../*' },
+	{ pattern: '../*', cwd: 'fixtures/first', ignore: '**' },
+
+	{ pattern: '../../*', cwd: 'fixtures/first/nested', ignore: '../../*' },
+	{ pattern: '../../*', cwd: 'fixtures/first/nested', ignore: '**' },
+
+	{ pattern: '../{first,second}', cwd: 'fixtures/first', ignore: '../first/**' },
+	{ pattern: '../{first,second}', cwd: 'fixtures/first', ignore: '**/first/**' }
+]);