Skip to content

Commit 73166df

Browse files
author
Hamed Soleimani
committed
minor updates
1 parent 5068a17 commit 73166df

File tree

3 files changed

+8
-20
lines changed

3 files changed

+8
-20
lines changed

packages/core/src/shared/filetypes.ts

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -363,15 +363,8 @@ export const codefileExtensions = new Set([
363363
// Code file names without an extension
364364
export const codefileNames = new Set(['Dockerfile', 'Dockerfile.build', 'gradlew', 'mvnw', '.gitignore'])
365365

366-
// Build file names
367-
export const buildfileNames = new Set(['gradle/wrapper/gradle-wrapper.jar'])
368-
369366
/** Returns true if `filename` is a code file. */
370367
export function isCodeFile(filename: string): boolean {
371368
const ext = path.extname(filename).toLowerCase()
372-
return (
373-
codefileExtensions.has(ext) ||
374-
codefileNames.has(path.basename(filename)) ||
375-
buildfileNames.has(path.basename(filename))
376-
)
369+
return codefileExtensions.has(ext) || codefileNames.has(path.basename(filename))
377370
}

packages/core/src/shared/utilities/workspaceUtils.ts

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ export function checkUnsavedChanges(): boolean {
268268
return vscode.workspace.textDocuments.some((doc) => doc.isDirty)
269269
}
270270

271-
export function getExcludePattern(additionalPatterns: string[] = [], nonGlobalExtraPatterns: boolean = true) {
271+
export function getExcludePattern(defaultExcludePatterns: boolean = true) {
272272
const globAlwaysExcludedDirs = getGlobDirExcludedPatterns().map((pattern) => `**/${pattern}/*`)
273273
const extraPatterns = [
274274
'**/package-lock.json',
@@ -290,11 +290,7 @@ export function getExcludePattern(additionalPatterns: string[] = [], nonGlobalEx
290290
'**/License.md',
291291
'**/LICENSE.md',
292292
]
293-
const allPatterns = [
294-
...globAlwaysExcludedDirs,
295-
...(nonGlobalExtraPatterns ? extraPatterns : []),
296-
...additionalPatterns,
297-
]
293+
const allPatterns = [...globAlwaysExcludedDirs, ...(defaultExcludePatterns ? extraPatterns : [])]
298294
return `{${allPatterns.join(',')}}`
299295
}
300296

@@ -307,11 +303,11 @@ export function getExcludePattern(additionalPatterns: string[] = [], nonGlobalEx
307303
async function filterOutGitignoredFiles(
308304
rootPath: string,
309305
files: vscode.Uri[],
310-
addExtraPatterns: boolean = true
306+
defaultExcludePatterns: boolean = true
311307
): Promise<vscode.Uri[]> {
312308
const gitIgnoreFiles = await vscode.workspace.findFiles(
313309
new vscode.RelativePattern(rootPath, '**/.gitignore'),
314-
getExcludePattern([], addExtraPatterns)
310+
getExcludePattern(defaultExcludePatterns)
315311
)
316312
const gitIgnoreFilter = await GitIgnoreFilter.build(gitIgnoreFiles)
317313
return gitIgnoreFilter.filterFiles(files)
@@ -330,7 +326,7 @@ export async function collectFiles(
330326
workspaceFolders: CurrentWsFolders,
331327
respectGitIgnore: boolean = true,
332328
maxSize = 200 * 1024 * 1024, // 200 MB
333-
addExtraIgnorePatterns: boolean = true
329+
defaultExcludePatterns: boolean = true
334330
): Promise<
335331
{
336332
workspaceFolder: vscode.WorkspaceFolder
@@ -367,11 +363,11 @@ export async function collectFiles(
367363
for (const rootPath of sourcePaths) {
368364
const allFiles = await vscode.workspace.findFiles(
369365
new vscode.RelativePattern(rootPath, '**'),
370-
getExcludePattern([], addExtraIgnorePatterns)
366+
getExcludePattern(defaultExcludePatterns)
371367
)
372368

373369
const files = respectGitIgnore
374-
? await filterOutGitignoredFiles(rootPath, allFiles, addExtraIgnorePatterns)
370+
? await filterOutGitignoredFiles(rootPath, allFiles, defaultExcludePatterns)
375371
: allFiles
376372

377373
for (const file of files) {

packages/core/src/test/shared/filetypes.test.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,6 @@ describe('isCodeFile', () => {
160160
'mvnw',
161161
'build.gradle',
162162
'gradle/wrapper/gradle-wrapper.properties',
163-
'gradle/wrapper/gradle-wrapper.jar',
164163
]
165164
for (const codeFilePath of codeFiles) {
166165
assert.strictEqual(isCodeFile(codeFilePath), true)

0 commit comments

Comments
 (0)