#98 use fsPath which is handed over from UI instead of trying to figu…

…re it out again
fluxxus-nl · Feb 18, 2021 · 325e6ec · 325e6ec
1 parent 439500b
commit 325e6ec
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/vscode-extension/src/App logic/Services/ObjectService.ts b/vscode-extension/src/App logic/Services/ObjectService.ts
@@ -230,7 +230,9 @@ export class ObjectService {
         return { valid: true, reason: '' }
     }
     async isChangeValid_Scenario(msg: MessageUpdate): Promise<{ valid: boolean, reason: string }> {
-        let fsPath: string = await ElementUtils.getFSPathOfFeature(msg.Project, msg.Feature);
+        let fsPath: string = msg.FsPath;
+        if (fsPath == '')
+            fsPath = await ElementUtils.getFSPathOfFeature(msg.Project, msg.Feature);
         let document: TextDocument = await workspace.openTextDocument(fsPath);
         let scenarioProcedureName = TestMethodUtils.getProcedureName(TypeChanged.ScenarioName, msg.NewValue);
         if (await TestCodeunitUtils.isProcedureAlreadyDeclared(document, scenarioProcedureName, [])) {
@@ -244,7 +246,9 @@ export class ObjectService {
     async isChangeValid_Element(msg: MessageUpdate): Promise<{ valid: boolean, reason: string }> {
         if (!msg.ArrayIndex && msg.ArrayIndex != 0)
             throw new Error('ArrayIndex not passed')
-        let fsPath: string = await ElementUtils.getFSPathOfFeature(msg.Project, msg.Feature);
+        let fsPath: string = msg.FsPath
+        if (fsPath == '')
+            fsPath = await ElementUtils.getFSPathOfFeature(msg.Project, msg.Feature);
         let document: TextDocument = await workspace.openTextDocument(fsPath);
         if (!await ElementUtils.getRangeOfElement(document, msg.Scenario, msg.Id, msg.Type, msg.ArrayIndex)) {
             return {

diff --git a/vscode-extension/src/App logic/Utils/elementInsertionUtils.ts b/vscode-extension/src/App logic/Utils/elementInsertionUtils.ts
@@ -81,7 +81,9 @@ export class ElementInsertionUtils {
     }
 
     private static async addNewScenarioToCode(msg: MessageUpdate): Promise<boolean> {
-        let fsPath: string = await ElementUtils.getFSPathOfFeature(msg.Project, msg.Feature);
+        let fsPath: string = msg.FsPath
+        if (fsPath == '')
+            fsPath = await ElementUtils.getFSPathOfFeature(msg.Project, msg.Feature);
         let document: TextDocument = await workspace.openTextDocument(fsPath);
 
         let positionToInsert: Position = await ElementInsertionUtils.getPositionToInsertForScenario(document);