preparation for 0.9.11

client/.vscode/tasks.json

@@ -7,7 +7,11 @@
             "label": "prelanch",
             "type": "npm",
             "script": "prelanch",
-            "problemMatcher": []
+            "problemMatcher": [],
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
         }
     ]
 }

client/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Change Log
 All notable changes to the "Harbour and xHarbour" extension will be documented in this file.
 
+# 0.9.11
+ - **debugger** better stability
+ - **task** better stability
+ - **task** correct management of batch option
+
 # 0.9.10
  - **debugger** added process list on attach, attach by process Id
  - **task** added Harbour and HBMK2 tasks, BETA

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.10",
+    "version": "0.9.11",
     "publisher": "aperricone",
     "icon": "harbourIcon.png",
     "main": "./dist/extension",

client/package.nls.it.json

@@ -32,6 +32,7 @@
     "harbour.task.output": "tipo di output",
     "harbour.task.ctype": "tipo di output C",
     "harbour.task.HBMK2.input": "file HBP da buildare",
+    "harbour.task.HBMK2.output": "file di uscita",
     "harbour.task.HBMK2.extraArgs": "Parametri extra liberi",
     "harbour.task.HBMK2.debug": "Se true, verrà incluso anche il codice di debug per VSCode",
     "harbour.task.HBMK2.platform": "Piattaforma di destinazione di default",
@@ -40,6 +41,8 @@
     "harbour.task.portableName": "Genera un Harbour Portable Object (hrb)",
     "harbour.task.cCodeName": "Genera un file C",
     "harbour.task.HBMK2.provideName": "Builda {0}",
+    "harbour.task.HBMK2.provideName2": "Builda file corrente",
+    "harbour.task.HBMK2.provideName3": "Builda file corrente per il debugging",
     "harbour.task.HBMK2.errorBatch": "Incapace di avviare il batch di setup",
     "harbour.task.HBMK2.setup": "Impostando l'ambiente...",
     "harbour.task.HBMK2.start": "Avvio HBMK2",

client/package.nls.json

@@ -31,7 +31,8 @@
     "harbour.task.input": "file to compile",
     "harbour.task.output": "output type",
     "harbour.task.ctype": "Type of C output",
-    "harbour.task.HBMK2.input": "HBP file to build",
+    "harbour.task.HBMK2.input": "file to build",
+    "harbour.task.HBMK2.output": "output file name",
     "harbour.task.HBMK2.extraArgs": "Free extra arguments",
     "harbour.task.HBMK2.debug": "if true includes the libray for debugging on VSCode",
     "harbour.task.HBMK2.platform": "default target platform",
@@ -40,6 +41,8 @@
     "harbour.task.portableName": "Generate Harbour Portable Object (hrb)",
     "harbour.task.cCodeName": "Generate C file",
     "harbour.task.HBMK2.provideName": "build {0}",
+    "harbour.task.HBMK2.provideName2": "build current file",
+    "harbour.task.HBMK2.provideName3": "build current file for debugging",
     "harbour.task.HBMK2.errorBatch": "Unable to start setup batch",
     "harbour.task.HBMK2.setup": "setting up the enviroment...",
     "harbour.task.HBMK2.start": "Start HBMK2",

client/src/debugProvider.js

@@ -0,0 +1,67 @@
+const vscode = require('vscode');
+const path = require("path");
+const fs = require("fs");
+const cp = require("child_process");
+const os = require("os");
+const localize = require("./myLocalize.js").localize;
+const getAllWorkspaceFiles = require("./utils.js").getAllWorkspaceFiles;
+const taskProvider = require('./taskProvider.js');
+
+class HarbourDBGProvider {
+    provideDebugConfigurations(folder,token) {
+        return new getAllWorkspaceFiles(token).then((values)=>{
+            var retValue = [{
+                "type": "harbour-dbg",
+                "request": "launch",
+                "name": "Launch currentFile",
+                "preLaunchTask": localize("harbour.task.HBMK2.provideName3")
+            }];
+            if(token.isCancellationRequested) {
+                return;
+            }
+            for(let j=0;j<values.length;j++) {
+                let ff = values[j];
+                for(let i=0;i<ff.length;++i) {
+                    if(!ff[i].isFile()) continue;
+                    var ext = path.extname(ff[i].name).toLowerCase();
+                    if(ext==".hbp") {
+                        var debugInfo = {
+                            "type": "harbour-dbg",
+                            "request": "launch",
+                            "name": "Launch currentFile",
+                            "preLaunchTask": localize("harbour.task.HBMK2.provideName",path.basename(ff[i].name))
+                        };
+                        retValue.push(debugInfo);
+                    }
+                }
+            }
+            return retValue;
+        });
+    }
+
+    resolveDebugConfiguration(folder, debugConfiguration, token) {
+        /*
+        var textDocument = {uri: {fsPath:""}};
+        if(vscode && vscode.window && vscode.window.activeTextEditor && vscode.window.activeTextEditor.document)
+            textDocument =vscode.window.activeTextEditor.document;
+        var task = new vscode.Task({
+                "type": "HBMK2",
+                "input": "${file}",
+                "debugSymbols": true,
+                "output": "${fileBasenameNoExtension}_dbg"
+            }, vscode.TaskScope.Global, localize("harbour.task.HBMK2.provideName3") ,"HBMK2");
+        */
+       return {
+            "type": "harbour-dbg",
+            "request": "launch",
+            "name": "Launch currentFile",
+            "preLaunchTask": localize("harbour.task.HBMK2.provideName3")
+        };
+    }
+}
+
+function activate() {
+	vscode.debug.registerDebugConfigurationProvider("harbour-dbg", new HarbourDBGProvider());
+}
+
+exports.activate = activate;

client/src/debugger.js

@@ -385,16 +385,20 @@ harbourDebugSession.prototype.sendStack = function(line) {
 		var completePath = infos[0]
 		var found = false;
 		if(infos[0].length>0) {
-			if(path.isAbsolute(infos[0]) && fs.existsSync(infos[0])) {
-				completePath = trueCase.trueCasePathSync(infos[0]);
-				found=true;
-			} 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]);
+			try {
+				if(path.isAbsolute(infos[0]) && fs.existsSync(infos[0])) {
+					completePath = trueCase.trueCasePathSync(infos[0]);
 					found=true;
-					break;
+				} 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]);
+						found=true;
+						break;
+					}
 				}
+			} catch(ex) {
+				found=false;
 			}
 		}
 		if(found) infos[0]=path.basename(completePath);

client/src/extension.js

@@ -7,6 +7,7 @@ const decorator = require('./decorator.js');
 const docCreator = require('./docCreator.js');
 const taskProvider = require('./taskProvider.js');
 const net = require("net");
+const debugProvider = require("./debugProvider.js");
 
 var diagnosticCollection;
 
@@ -41,6 +42,7 @@ function activate(context) {
 	decorator.activate(context,cl);
 	docCreator.activate(context,cl);
 	taskProvider.activate();
+	//debugProvider.activate();
 }
 
 function DebugList(args) {

client/src/myLocalize.js

@@ -25,11 +25,9 @@ function reInit(config)
 function myLocalize()
 {
     var arg = Array.prototype.slice.call(arguments);
-    if(arg[0] in messages)
-    {
+    if(arg[0] in messages) {
         arg[0] = messages[arg[0]];
-    } else
-    {
+    } else {
         arg[0] = "Error: '" + arg[0] + "' not found";
     }
     arg.splice(0,0,null);