Skip to content

Commit 98eff8e

Browse files
committed
copy project name when import project
1 parent 557cfc1 commit 98eff8e

3 files changed

Lines changed: 7 additions & 4 deletions

File tree

src/EIDEProject.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2221,7 +2221,7 @@ class EIDEProject extends AbstractProject {
22212221
File.fromArray([wsFile.dir, AbstractProject.EIDE_DIR, AbstractProject.prjConfigName]), option.type);
22222222

22232223
// set project name
2224-
prjConfig.config.name = AbstractProject.formatProjectName(option.name);
2224+
prjConfig.config.name = option.projectName || AbstractProject.formatProjectName(option.name);
22252225

22262226
return {
22272227
rootFolder: rootDir,
@@ -2232,7 +2232,7 @@ class EIDEProject extends AbstractProject {
22322232

22332233
protected create(option: CreateOptions): File {
22342234
const baseInfo = this.createBase(option);
2235-
baseInfo.prjConfig.config.name = AbstractProject.formatProjectName(option.name);
2235+
baseInfo.prjConfig.config.name = option.projectName || AbstractProject.formatProjectName(option.name);
22362236
baseInfo.prjConfig.config.outDir = 'build';
22372237
baseInfo.prjConfig.config.srcDirs = [];
22382238
baseInfo.prjConfig.Save();

src/EIDEProjectExplorer.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1449,6 +1449,7 @@ class ProjectDataProvider implements vscode.TreeDataProvider<ProjTreeItem> {
14491449

14501450
const basePrj = AbstractProject.NewProject().createBase({
14511451
name: ePrjInfo.name,
1452+
projectName: ePrjInfo.name,
14521453
type: nPrjType,
14531454
outDir: ePrjRoot
14541455
}, false);
@@ -1753,6 +1754,7 @@ class ProjectDataProvider implements vscode.TreeDataProvider<ProjTreeItem> {
17531754

17541755
const baseInfo = AbstractProject.NewProject().createBase({
17551756
name: nPrjOutDir.name,
1757+
projectName: keilPrjFile.noSuffixName,
17561758
type: targets[0].type,
17571759
outDir: nPrjOutDir
17581760
}, false);

src/EIDETypeDefine.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,9 @@ export interface ProjectFileGroup extends FileGroup {
8080
export type ProjectType = 'C51' | 'ARM' | 'RISC-V' | 'ANY-GCC';
8181

8282
export interface CreateOptions {
83-
name: string; // folder name
84-
outDir: File;
83+
name: string; // project folder name
84+
projectName?: string;
85+
outDir: File; // project location
8586
templateFile?: File;
8687
type: ProjectType;
8788
}

0 commit comments

Comments
 (0)