Skip to content

Commit 2d7c236

Browse files
LeonovecSergeyfbricon
authored andcommitted
Use one place for storage build file patterns
Bug fix: Extension change message is not displayed Signed-off-by: Siarhei Leanavets <Siarhei_Leanavets1@epam.com>
1 parent 1a13ed8 commit 2d7c236

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

src/plugin.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import * as vscode from 'vscode';
44
import * as path from 'path';
55
import { Commands } from './commands';
6+
import { buildFilePatterns } from './standardLanguageClient';
67

78
let existingExtensions: Array<string>;
8-
let existingBuildFilePatterns: Array<string>;
99

1010
export function collectJavaExtensions(extensions: readonly vscode.Extension<any>[]): string[] {
1111
const result = [];
@@ -40,8 +40,6 @@ export function collectBuildFilePattern(extensions: readonly vscode.Extension<an
4040
}
4141
}
4242
}
43-
// Make a copy of build file patterns:
44-
existingBuildFilePatterns = result.slice();
4543
return result;
4644
}
4745

@@ -72,13 +70,14 @@ function isExistingExtensionsUpdated(extensions: readonly vscode.Extension<any>[
7270
}
7371
}
7472
}
73+
return hasChanged;
7574
}
7675

7776
function isExistingBuildFilePatternsUpdated(extensions: readonly vscode.Extension<any>[]) {
78-
if (!existingBuildFilePatterns) {
77+
if (!buildFilePatterns) {
7978
return false;
8079
}
81-
const oldPatterns = new Set(existingBuildFilePatterns.slice());
80+
const oldPatterns = new Set(buildFilePatterns.slice());
8281
const newPatterns = collectBuildFilePattern(extensions);
8382
const hasChanged = ( oldPatterns.size !== newPatterns.length);
8483
if (!hasChanged) {
@@ -88,4 +87,5 @@ function isExistingBuildFilePatternsUpdated(extensions: readonly vscode.Extensio
8887
}
8988
}
9089
}
90+
return hasChanged;
9191
}

src/standardLanguageClient.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import { TypeHierarchyDirection, TypeHierarchyItem } from "./typeHierarchy/proto
3131

3232
const extensionName = 'Language Support for Java';
3333
const GRADLE_CHECKSUM = "gradle/checksum/prompt";
34-
let buildFilePatterns: Array<string>;
34+
export let buildFilePatterns: Array<string>;
3535

3636
export class StandardLanguageClient {
3737

0 commit comments

Comments
 (0)