Skip to content

Commit 4cab599

Browse files
authored
Fix path display issue and remove useless codes (#285)
1 parent 51ce1f4 commit 4cab599

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

src/exportJarSteps/GenerateJarExecutor.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
import { pathExists } from "fs-extra";
55
import { basename, extname, join } from "path";
6-
import { Disposable, Extension, extensions, ProgressLocation, QuickInputButtons, QuickPick, window } from "vscode";
6+
import { Disposable, Extension, extensions, ProgressLocation, QuickInputButtons, Uri, window } from "vscode";
77
import { ExportJarStep, IStepMetadata } from "../exportJarFileCommand";
88
import { Jdtls } from "../java/jdtls";
99
import { IExportJarStepExecutor } from "./IExportJarStepExecutor";
@@ -129,7 +129,8 @@ export class GenerateJarExecutor implements IExportJarStepExecutor {
129129
continue;
130130
}
131131
const extName = extname(classpath);
132-
const baseName = (extName === ".jar") ? basename(classpath) : classpath.substring(projectPath.length + 1);
132+
const baseName = Uri.parse(classpath).fsPath.startsWith(Uri.parse(projectPath).fsPath) ?
133+
classpath.substring(projectPath.length + 1) : basename(classpath);
133134
const descriptionValue = (isRuntime) ? "Runtime" : "Test";
134135
const typeValue = (extName === ".jar") ? "external" : "internal";
135136
if (!uriSet.has(classpath)) {

src/exportJarSteps/ResolveMainMethodExecutor.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT license.
33

4-
import { Disposable, ProgressLocation, QuickInputButtons, QuickPick, window } from "vscode";
4+
import { Disposable, ProgressLocation, QuickInputButtons, window } from "vscode";
55
import { ExportJarStep, IStepMetadata } from "../exportJarFileCommand";
66
import { Jdtls } from "../java/jdtls";
77
import { IExportJarStepExecutor } from "./IExportJarStepExecutor";

src/exportJarSteps/ResolveWorkspaceExecutor.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT license.
33

4-
import { Disposable, QuickPick, Uri, workspace } from "vscode";
4+
import { Disposable, Uri, workspace } from "vscode";
55
import { ExportJarStep, IStepMetadata } from "../exportJarFileCommand";
66
import { Jdtls } from "../java/jdtls";
77
import { INodeData } from "../java/nodeData";

0 commit comments

Comments
 (0)