debugger: fixes trueCasePathSync use

APerricone · Jun 25, 2020 · 6178dc8 · APerricone · Jun 25, 2020 · APerricone
1 parent c60acbd
commit 6178dc8
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 12 deletions.
diff --git a/client/CHANGELOG.md b/client/CHANGELOG.md
@@ -1,16 +1,17 @@
 # Change Log
 All notable changes to the "Harbour and xHarbour" extension will be documented in this file.
 
+# 0.9.13
+ - **debugger** better stability
+
 # 0.9.12
  - **debugger** better stability
  - **task** better stability
  - **task** correct management of batch option
 
 # 0.9.11
  - **server** fixes case of unfound parent [#57](https://github.com/APerricone/harbourCodeExtension/issues/57)
- - **syntax** fixes [memvar aliasing syntax highlighting #58](https://github.com/APerricone/harbourCodeExtension/issues/58),
-                    [Multiline "inline" class methods syntax highlighting #59](https://github.com/APerricone/harbourCodeExtension/issues/59),
-                    [Try catch syntax highlighting #60](https://github.com/APerricone/harbourCodeExtension/issues/60) by [Edgard Lorraine Messias](https://github.com/edgardmessias)
+ - **syntax** fixes [memvar aliasing syntax highlighting #58](https://github.com/APerricone/harbourCodeExtension/issues/58),                    [Multiline "inline" class methods syntax highlighting #59](https://github.com/APerricone/harbourCodeExtension/issues/59),                    [Try catch syntax highlighting #60](https://github.com/APerricone/harbourCodeExtension/issues/60) by [Edgard Lorraine Messias](https://github.com/edgardmessias)
  - **debugger** better step out and step next support
  - **server** better code folding see [#56](https://github.com/APerricone/harbourCodeExtension/issues/56)
  - **task** added temporary variable solver waiting for [VSCode #81007](https://github.com/microsoft/vscode/issues/81007)

diff --git a/client/package.json b/client/package.json
@@ -2,7 +2,7 @@
     "name": "harbour",
     "displayName": "Harbour and xHarbour",
     "description": "Harbour and xHarbour languages support for visual studio code",
-    "version": "0.9.12",
+    "version": "0.9.13",
     "publisher": "aperricone",
     "icon": "harbourIcon.png",
     "main": "./dist/extension",

diff --git a/client/src/debugger.js b/client/src/debugger.js
@@ -385,21 +385,29 @@ harbourDebugSession.prototype.sendStack = function(line) {
 		var completePath = infos[0]
 		var found = false;
 		if(infos[0].length>0) {
-			try {
 				if(path.isAbsolute(infos[0]) && fs.existsSync(infos[0])) {
-					completePath = trueCase.trueCasePathSync(infos[0]);
-					found=true;
+					try {
+						completePath = trueCase.trueCasePathSync(infos[0]);
+						found=true;
+					} catch(ex) {
+						found=false;
+					}
 				} else
 				for(i=0;i<this.sourcePaths.length;i++) {
 					if(fs.existsSync(path.join(this.sourcePaths[i],infos[0]))) {
-						completePath = trueCase.trueCasePathSync(infos[0],this.sourcePaths[i]);
+						completePath = path.join(this.sourcePaths[i],infos[0]);
+						try {
+							completePath = trueCase.trueCasePathSync(infos[0],this.sourcePaths[i]);
+						} catch(ex) {
+							try {
+								completePath = trueCase.trueCasePathSync(completePath);
+							} catch(ex2) {
+							}
+						}
 						found=true;
 						break;
-					}
 				}
-			} catch(ex) {
-				found=false;
-			}
+				}
 		}
 		if(found) infos[0]=path.basename(completePath);
 		frames[j] = new debugadapter.StackFrame(j,infos[2],