Skip to content

Commit 9170b06

Browse files
authored
Clean up the classpath configuration experiment (#670)
1 parent 295170b commit 9170b06

File tree

7 files changed

+1
-370
lines changed

7 files changed

+1
-370
lines changed

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555
"onWebviewPanel:java.welcome",
5656
"onCommand:java.classpathConfiguration",
5757
"onWebviewPanel:java.classpathConfiguration",
58-
"onWebviewPanel:java.markdownPreview",
5958
"onCommand:java.formatterSettings"
6059
],
6160
"contributes": {

src/classpath/markdownPreviewProvider.ts

Lines changed: 0 additions & 118 deletions
This file was deleted.

src/commands/index.ts

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// Licensed under the MIT license.
33

44
import * as vscode from "vscode";
5-
import * as path from "path";
65
import { instrumentCommand, webviewCmdLinkHandler } from "../utils";
76
import { createMavenProjectCmdHandler, createSpringBootProjectCmdHandler, createQuarkusProjectCmdHandler, createMicroProfileStarterProjectCmdHandler, showExtensionCmdHandler, openUrlCmdHandler, showReleaseNotesHandler, installExtensionCmdHandler } from "./handler";
87
import { overviewCmdHandler } from "../overview";
@@ -12,9 +11,6 @@ import { javaExtGuideCmdHandler } from "../ext-guide";
1211
import { instrumentOperationAsVsCodeCommand } from "vscode-extension-telemetry-wrapper";
1312
import { showWelcomeWebview } from "../welcome";
1413
import { showClasspathConfigurationPage } from "../classpath/classpathConfigurationView";
15-
import { markdownPreviewProvider } from "../classpath/markdownPreviewProvider";
16-
import { getExpService } from "../exp";
17-
import { TreatmentVariables } from "../exp/TreatmentVariables";
1814
import { javaFormatterSettingsEditorProvider } from "../formatter-settings";
1915

2016
export function initialize(context: vscode.ExtensionContext) {
@@ -34,15 +30,5 @@ export function initialize(context: vscode.ExtensionContext) {
3430
context.subscriptions.push(vscode.commands.registerCommand("java.welcome", instrumentCommand(context, "java.welcome", showWelcomeWebview)));
3531
context.subscriptions.push(vscode.commands.registerCommand("java.formatterSettings", instrumentCommand(context, "java.formatterSettings", () => javaFormatterSettingsEditorProvider.showFormatterSettingsEditor())));
3632
context.subscriptions.push(vscode.commands.registerCommand("java.formatterSettings.showTextEditor", instrumentCommand(context, "java.formatterSettings.showTextEditor", javaFormatterSettingsEditorProvider.reopenWithTextEditor)));
37-
context.subscriptions.push(vscode.commands.registerCommand("java.classpathConfiguration", instrumentCommand(context, "java.classpathConfiguration", async () => {
38-
const showCustomizedView: boolean = await getExpService()?.getTreatmentVariableAsync(TreatmentVariables.VSCodeConfig, TreatmentVariables.CustomizedClasspathConfigurationView, true /*checkCache*/) || false;
39-
if (showCustomizedView) {
40-
showClasspathConfigurationPage(context);
41-
} else {
42-
// To filter the setting in the workspace scope, see: https://github.com/microsoft/vscode/issues/90086#issuecomment-803510704
43-
await vscode.commands.executeCommand("workbench.action.openSettings", "java.project.sourcePaths");
44-
await vscode.commands.executeCommand("workbench.action.openWorkspaceSettings");
45-
markdownPreviewProvider.show(context.asAbsolutePath(path.join("webview-resources", "classpathConfiguration.md")), "Classpath Settings", context);
46-
}
47-
})));
33+
context.subscriptions.push(vscode.commands.registerCommand("java.classpathConfiguration", instrumentCommand(context, "java.classpathConfiguration", showClasspathConfigurationPage)));
4834
}

src/exp/TreatmentVariables.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,4 @@
44
export class TreatmentVariables {
55
public static readonly VSCodeConfig = 'vscode';
66
public static readonly PresentWelcomePageByDefault = 'presentWelcomePageByDefault';
7-
public static readonly CustomizedClasspathConfigurationView = 'customizedClasspathConfigurationView';
87
}

src/extension.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import { showWelcomeWebview, WelcomeViewSerializer } from "./welcome";
1515
import { JavaGettingStartedViewSerializer } from "./getting-started";
1616
import { JavaExtGuideViewSerializer } from "./ext-guide";
1717
import { ClassPathConfigurationViewSerializer } from "./classpath/classpathConfigurationView";
18-
import { MarkdownPreviewSerializer } from "./classpath/markdownPreviewProvider";
1918
import { initFormatterSettingsEditorProvider } from "./formatter-settings";
2019
import { initRemoteProfileProvider } from "./formatter-settings/RemoteProfileProvider";
2120

@@ -41,7 +40,6 @@ async function initializeExtension(_operationId: string, context: vscode.Extensi
4140
context.subscriptions.push(vscode.window.registerWebviewPanelSerializer("java.gettingStarted", new JavaGettingStartedViewSerializer()));
4241
context.subscriptions.push(vscode.window.registerWebviewPanelSerializer("java.welcome", new WelcomeViewSerializer()));
4342
context.subscriptions.push(vscode.window.registerWebviewPanelSerializer("java.classpathConfiguration", new ClassPathConfigurationViewSerializer()));
44-
context.subscriptions.push(vscode.window.registerWebviewPanelSerializer("java.markdownPreview", new MarkdownPreviewSerializer()));
4543

4644
const config = vscode.workspace.getConfiguration("java.help");
4745

webview-resources/classpathConfiguration.md

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)