fix idf size task

Author: brianignacio5

src/espIdf/size/idfSizeTask.ts

@@ -2,13 +2,13 @@
  * Project: ESP-IDF VSCode Extension
  * File Created: Wednesday, 3rd November 2021 4:56:23 pm
  * Copyright 2021 Espressif Systems (Shanghai) CO LTD
- * 
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ * 
  *    http://www.apache.org/licenses/LICENSE-2.0
- * 
+ * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,18 +20,15 @@ import { ensureDir } from "fs-extra";
 import { join } from "path";
 import {
   TaskPanelKind,
-  ProcessExecutionOptions,
   TaskPresentationOptions,
   TaskRevealKind,
   TaskScope,
   Uri,
   workspace,
-  ProcessExecution,
 } from "vscode";
 import { NotificationMode, readParameter } from "../../idfConfiguration";
 import { TaskManager } from "../../taskManager";
-import { appendIdfAndToolsToPath } from "../../utils";
-import { getProjectName } from "../../workspaceConfig";
+import { appendIdfAndToolsToPath, readProjectCMakeLists } from "../../utils";
 import { getVirtualEnvPythonPath } from "../../pythonManager";
 import { OutputCapturingExecution } from "../../taskManager/customExecution";
 
@@ -47,15 +44,15 @@ export class IdfSizeTask {
     this.buildDirPath = readParameter("idf.buildPath", workspaceUri) as string;
   }
 
-  private async mapFilePath() {
-    const projectName = await getProjectName(this.buildDirPath);
+  private mapFilePath() {
+    const projectName = readProjectCMakeLists(this.currentWorkspace.fsPath);
     return join(this.buildDirPath, `${projectName}.map`);
   }
 
   public async getSizeInfo() {
     await ensureDir(this.buildDirPath);
     const pythonCommand = await getVirtualEnvPythonPath(this.currentWorkspace);
-    const mapFilePath = await this.mapFilePath();
+    const mapFilePath = this.mapFilePath();
     const args = [this.idfSizePath, mapFilePath];
 
     const modifiedEnv = await appendIdfAndToolsToPath(this.currentWorkspace);

src/test/project.test.ts

@@ -117,8 +117,8 @@ suite("Project tests", () => {
     const newProjectName = readProjectCMakeLists(projectPath);
     assert.notEqual(currProjectName, undefined);
     assert.notEqual(newProjectName, undefined);
-    assert.equal(currProjectName[0], `project(${prevName})`);
-    assert.equal(newProjectName[0], `project(${newName})`);
+    assert.equal(currProjectName, `${prevName}`);
+    assert.equal(newProjectName, `${newName}`);
   });
 
   test("get templates projects", async () => {

src/utils.ts

@@ -185,7 +185,7 @@ export function spawn(
     sendToTelemetry: true,
   }
 ): Promise<Buffer> {
-  let buff = Buffer.alloc(0);
+  let buff: Buffer = Buffer.alloc(0);
   const sendToOutputChannel = (data: any) => {
     buff = Buffer.concat([buff, data]);
     options.outputString += buff.toString();
@@ -803,9 +803,9 @@ export function readProjectCMakeLists(dirPath: string) {
   const cmakeListFile = path.join(dirPath, "CMakeLists.txt");
   if (fileExists(cmakeListFile)) {
     const content = fs.readFileSync(cmakeListFile, "utf-8");
-    const projectMatches = content.match(/(project\(.*?\))/g);
-    if (projectMatches && projectMatches.length > 0) {
-      return projectMatches;
+    const projectMatches = content.match(/project\(([^)\s]+)/i);
+    if (projectMatches && projectMatches[1]) {
+      return projectMatches[1];
     }
   }
 }