Skip to content

Commit 1bb0a99

Browse files
snjezargrunber
authored andcommitted
Delete Java LS Configuration
- delete the Java LS configuration (<globalStorage>/redhat.java) when calling Clean Java Language Server Workspace
1 parent d2df57b commit 1bb0a99

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

src/extension.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import { snippetCompletionProvider } from './snippetCompletionProvider';
2929
import { JavaClassEditorProvider } from './javaClassEditor';
3030
import { StandardLanguageClient } from './standardLanguageClient';
3131
import { SyntaxLanguageClient } from './syntaxLanguageClient';
32-
import { convertToGlob, deleteClientLog, deleteDirectory, ensureExists, getBuildFilePatterns, getExclusionGlob, getInclusionPatternsFromNegatedExclusion, getJavaConfig, getJavaConfiguration, hasBuildToolConflicts, resolveActualCause, getVersion } from './utils';
32+
import { convertToGlob, deleteClientLog, deleteDirectory, ensureExists, getBuildFilePatterns, getExclusionGlob, getInclusionPatternsFromNegatedExclusion, getJavaConfig, getJavaConfiguration, hasBuildToolConflicts, resolveActualCause, getVersion, cleanJavaLSConfiguration } from './utils';
3333
import glob = require('glob');
3434
import { Telemetry } from './telemetry';
3535
import { getMessage } from './errorUtils';
@@ -436,6 +436,7 @@ export async function activate(context: ExtensionContext): Promise<ExtensionAPI>
436436
cleanupWorkspaceState(context);
437437
deleteDirectory(workspacePath);
438438
deleteDirectory(syntaxServerWorkspacePath);
439+
cleanJavaLSConfiguration(context);
439440
} catch (error) {
440441
data['error'] = getMessage(error);
441442
window.showErrorMessage(`Failed to delete ${workspacePath}: ${error}`);

src/utils.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import * as fs from 'fs';
44
import * as path from 'path';
5-
import { workspace, WorkspaceConfiguration, commands, Uri, version } from 'vscode';
5+
import { workspace, WorkspaceConfiguration, commands, Uri, version, ExtensionContext } from 'vscode';
66
import { Commands } from './commands';
77
import { IJavaRuntime } from 'jdk-utils';
88
import { getSupportedJreNames, listJdks, sortJdksBySource, sortJdksByVersion } from './jdkUtils';
@@ -22,6 +22,11 @@ export function isPreferenceOverridden(section: string): boolean {
2222
config.inspect(section).globalLanguageValue !== undefined;
2323
}
2424

25+
export function cleanJavaLSConfiguration(context: ExtensionContext) {
26+
const globalStoragePath = context.globalStorageUri?.fsPath; // .../Code/User/globalStorage/redhat.java
27+
deleteDirectory(globalStoragePath);
28+
}
29+
2530
export function deleteDirectory(dir) {
2631
if (fs.existsSync(dir)) {
2732
fs.readdirSync(dir).forEach((child) => {

0 commit comments

Comments
 (0)