Skip to content

Commit bbf8ad2

Browse files
committed
Make gitignore code clearer
1 parent 117af9e commit bbf8ad2

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

src/index.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -89,17 +89,17 @@ async function analyse(rawPaths?: string | string[], opts: T.Options = {}): Prom
8989
if (!useRawContent && opts.checkIgnored) {
9090
const nestedIgnoreFiles = files.filter(file => file.endsWith('.gitignore'));
9191
for (const ignoresFile of nestedIgnoreFiles) {
92-
const relFile = relPath(ignoresFile);
93-
const relFolder = paths.dirname(relFile);
92+
const relIgnoresFile = relPath(ignoresFile);
93+
const relIgnoresFolder = paths.dirname(relIgnoresFile);
9494
// Parse gitignores
9595
const ignoresDataRaw = await readFile(ignoresFile);
9696
const ignoresData = ignoresDataRaw.replace(/#.+|\s+$/gm, '');
97-
const localIgnoresData = ignoresData
98-
// '.file' -> '/root/*/.file'
99-
.replace(/^(?=[^\s\/\\])/gm, localRoot(relFolder) + '/*/')
100-
// '/folder' -> '/root/folder'
101-
.replace(/^[\/\\]/gm, localRoot(relFolder) + '/')
102-
ignored.add(localIgnoresData);
97+
const absoluteIgnoresData = ignoresData
98+
// '.file' -> 'root/*/.file'
99+
.replace(/^(?=[^\s\/\\])/gm, localRoot(relIgnoresFolder) + '/*/')
100+
// '/folder' -> 'root/folder'
101+
.replace(/^[\/\\]/gm, localRoot(relIgnoresFolder) + '/')
102+
ignored.add(absoluteIgnoresData);
103103
files = filterOutIgnored(files, ignored);
104104
}
105105
}

0 commit comments

Comments
 (0)