Skip to content

Commit 7966f67

Browse files
committed
Fix failing unit tests
1 parent 8207047 commit 7966f67

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

src/utilities/filesystem.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ export function isIncluded(
112112
excludeList: Record<string, boolean> = getDefaultExcludeList()
113113
): boolean {
114114
let notExcluded = true;
115-
let included = false;
115+
let included = true;
116116
for (const key of Object.keys(excludeList)) {
117117
if (excludeList[key]) {
118118
if (contains(uri.fsPath, key, { contains: true })) {

test/unit-tests/sourcekit-lsp/LanguageClientManager.test.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ suite("LanguageClientManager Suite", () => {
6969
const mockedVSCodeWindow = mockGlobalObject(vscode, "window");
7070
const mockedVSCodeExtensions = mockGlobalObject(vscode, "extensions");
7171
const mockedVSCodeWorkspace = mockGlobalObject(vscode, "workspace");
72+
const excludeConfig = mockGlobalValue(configuration, "exclude");
7273
let changeConfigEmitter: AsyncEventEmitter<vscode.ConfigurationChangeEvent>;
7374
let createFilesEmitter: AsyncEventEmitter<vscode.FileCreateEvent>;
7475
let deleteFilesEmitter: AsyncEventEmitter<vscode.FileDeleteEvent>;
@@ -92,6 +93,9 @@ suite("LanguageClientManager Suite", () => {
9293
mockedVSCodeWorkspace.onDidCreateFiles.callsFake(createFilesEmitter.event);
9394
deleteFilesEmitter = new AsyncEventEmitter();
9495
mockedVSCodeWorkspace.onDidDeleteFiles.callsFake(deleteFilesEmitter.event);
96+
mockedVSCodeWorkspace.getConfiguration
97+
.withArgs("files")
98+
.returns({ get: () => ({}) } as any);
9599
// Mock the WorkspaceContext and SwiftToolchain
96100
mockedBuildFlags = mockObject<BuildFlags>({
97101
buildPathFlags: mockFn(s => s.returns([])),
@@ -208,6 +212,8 @@ suite("LanguageClientManager Suite", () => {
208212
mockedLspConfig.serverArguments = [];
209213
// Process environment variables
210214
mockedEnvironment.setValue({});
215+
// Exclusion
216+
excludeConfig.setValue({});
211217
});
212218

213219
suite("LanguageClientToolchainCoordinator", () => {

0 commit comments

Comments
 (0)