Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

New setting to control creation of Artifact Id folder #197

Merged
merged 5 commits into from
Feb 21, 2022
Merged

New setting to control creation of Artifact Id folder #197

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c01a67c
new setting for creating artifactId folder
brunovieira97 Feb 12, 2022
2426f6d
modified project creation to consider new setting
brunovieira97 Feb 12, 2022
43c1c16
prevent overwriting existing files without alerting user
brunovieira97 Feb 12, 2022
9470ad8
refactor for better maintenance
brunovieira97 Feb 15, 2022
852d91d
fix: reverted uri changes to avoid compat issues
brunovieira97 Feb 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix: reverted uri changes to avoid compat issues
  • Loading branch information
@brunovieira97
brunovieira97 committed Feb 21, 2022
commit 852d91d247c3f4601271f44236c4592e813c207c
12 changes: 6 additions & 6 deletions src/handler/GenerateProjectHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export class GenerateProjectHandler extends BaseHandler {
const hasOpenFolder = vscode.workspace.workspaceFolders !== undefined || vscode.workspace.rootPath !== undefined;

// Don't prompt to open projectLocation if it's already a currently opened folder
if (hasOpenFolder && (vscode.workspace.workspaceFolders.some(folder => folder.uri === this.outputUri) || vscode.workspace.rootPath === this.outputUri.path)) {
if (hasOpenFolder && (vscode.workspace.workspaceFolders.some(folder => folder.uri.fsPath === this.outputUri.fsPath) || vscode.workspace.rootPath === this.outputUri.fsPath)) {
return;
}

Expand All @@ -68,7 +68,7 @@ export class GenerateProjectHandler extends BaseHandler {
if (choice === OPEN_IN_NEW_WORKSPACE) {
vscode.commands.executeCommand("vscode.openFolder", this.outputUri, hasOpenFolder);
} else if (choice === OPEN_IN_CURRENT_WORKSPACE) {
if (!vscode.workspace.workspaceFolders.find((workspaceFolder) => workspaceFolder.uri && this.outputUri.path.startsWith(workspaceFolder.uri.path))) {
if (!vscode.workspace.workspaceFolders.find((workspaceFolder) => workspaceFolder.uri && this.outputUri.fsPath.startsWith(workspaceFolder.uri.fsPath))) {
vscode.workspace.updateWorkspaceFolders(vscode.workspace.workspaceFolders.length, null, { uri: this.outputUri });
}
}
Expand Down Expand Up @@ -105,10 +105,10 @@ async function specifyTargetFolder(metadata: IProjectMetadata): Promise<vscode.U

const MESSAGE: string = useArtifactId ? MESSAGE_EXISTING_FOLDER : MESSAGE_FOLDER_NOT_EMPTY;

let outputUri: vscode.Uri = metadata.defaults.targetFolder ? vscode.Uri.parse(metadata.defaults.targetFolder) : await openDialogForFolder({ openLabel: LABEL_CHOOSE_FOLDER });
let outputUri: vscode.Uri = metadata.defaults.targetFolder ? vscode.Uri.file(metadata.defaults.targetFolder) : await openDialogForFolder({ openLabel: LABEL_CHOOSE_FOLDER });

if (outputUri && useArtifactId) {
outputUri = vscode.Uri.parse(`${outputUri.path}/${metadata.artifactId}`);
outputUri = vscode.Uri.file(`${outputUri.fsPath}/${metadata.artifactId}`);
}

// If not using Artifact Id as folder name, we assume any existing files with same names will be overwritten
Expand Down Expand Up @@ -139,7 +139,7 @@ async function downloadAndUnzip(targetUrl: string, targetFolder: vscode.Uri): Pr
}

p.report({ message: "Starting to unzip..." });
extract(filepath, { dir: targetFolder.path }, (err) => {
extract(filepath, { dir: targetFolder.fsPath }, (err) => {
if (err) {
return reject(err);
}
Expand All @@ -156,7 +156,7 @@ async function specifyOpenMethod(hasOpenFolder: boolean, projectLocation: vscode
OPEN_IN_NEW_WORKSPACE,
hasOpenFolder ? OPEN_IN_CURRENT_WORKSPACE : undefined,
].filter(Boolean);
openMethod = await vscode.window.showInformationMessage(`Successfully generated. Location: ${projectLocation.path}`, ...candidates);
openMethod = await vscode.window.showInformationMessage(`Successfully generated. Location: ${projectLocation.fsPath}`, ...candidates);
}
return openMethod;
}