fix: some bugs when using msdosmerge hover: change the name for keywords' categary

Author: xsro

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ## welcome feedback and contribution [github issue](https://github.com/xsro/masm-tasm/issues)
 
-### [unreleased]
+### 0.5.0/0.5.1
 
 - MASM插件更新到 `6.11`，最近在想如何支持`masm6.x`语法
 - 尝试用异步重写了一些代码，希望不要引入bug

i18n/chs/out/language/wordinfo.i18n.json

@@ -1,7 +1,7 @@
 {
     "keykind.Command": "操作码助记符",
-    "keykind.Memory": "Memory",
-    "keykind.Instruction": "Instruction伪指令助记符",
+    "keykind.Memory": "数据定义指令",
+    "keykind.Instruction": "伪指令助记符",
     "keykind.Register": "Register寄存器",
     "keykind.Saved": "Saved保留字",
     "keykind.Size": "Size",
@@ -45,8 +45,8 @@
     "ascii.US": "(单元分隔符)",
     "ascii.space": "(空格)",
     "ascii.DEL": "(删除)",
-    "num.hex":"十六进制数",
-    "num.oct":"八进制数",
-    "num.dec":"十进制数",
-    "num.bin":"二进制数"
+    "num.hex": "十六进制数",
+    "num.oct": "八进制数",
+    "num.dec": "十进制数",
+    "num.bin": "二进制数"
 }

package-lock.json

@@ -3,7 +3,7 @@
   "displayName": "MASM/TASM",
   "publisher": "xsro",
   "description": "DOS汇编语言开发环境和语法支持，win下安装即用,自带DOSBox.exe和TASM/MASM工具",
-  "version": "0.5.1-beta.1",
+  "version": "0.5.1",
   "keywords": [
     "dosbox",
     "16位",
@@ -233,7 +233,7 @@
   "devDependencies": {
     "@types/glob": "^7.1.3",
     "@types/mocha": "^7.0.2",
-    "@types/node": "^13.13.23",
+    "@types/node": "^13.13.29",
     "@types/vscode": "^1.44.0",
     "@typescript-eslint/eslint-plugin": "^2.34.0",
     "@typescript-eslint/parser": "^2.34.0",
@@ -250,7 +250,7 @@
     "typescript": "^3.9.7",
     "vsce": "^1.81.1",
     "vscode-nls-dev": "^3.3.2",
-    "vscode-test": "^1.4.0"
+    "vscode-test": "^1.4.1"
   },
   "dependencies": {
     "vscode-nls": "^4.1.2"

package.json

@@ -9,8 +9,8 @@ set "cdo=%CD%">nul
 set path=%~f1\player\;%~f1\masm\;%~f1\tasm\
 cd %~f4
 %~d4
-del T*.*
-copy %3 T.ASM>nul
+::del T*.*
+::copy %3 T.ASM>nul
 if "%2" == "MASM" goto masm
 if "%2" == "TASM" goto tasm
 goto end

scripts/playerasm.bat

@@ -23,7 +23,7 @@ export async function runDosbox2(conf: Config, runOrDebug: boolean): Promise<str
 export function runDosbox(conf: Config, more?: string, doc?: TextDocument): Promise<string> {
     let preCommand: string = "";
     let boxcmd: string = '@echo off\n';
-    boxcmd += `mount c \\\"${conf.path}\\\"\nmount d \\\"${conf.workUri.fsPath}\\\"\n`;//mount the necessary path
+    boxcmd += `mount c \\\"${conf.toolsUri.fsPath}\\\"\nmount d \\\"${conf.workUri.fsPath}\\\"\n`;//mount the necessary path
     boxcmd += "d:\nset PATH=%%PATH%%;c:\\tasm;c:\\masm\n";//switch to the working space and add path\
     if (doc) {
         let filename = doc?.fileName;

src/DOSBox.ts

@@ -31,7 +31,7 @@ async function customToolCheck(path: string): Promise<ToolInfo> {
         hasTasm: false
     };
     let dir1 = await fs.readDirectory(uri);
-    console.log(inArrays(dir1, ["boxasm.bat", FileType.File]));
+    //console.log(inArrays(dir1, ["boxasm.bat", FileType.File]));
     if (inArrays(dir1, ["dosbox", FileType.Directory]) && process.platform === "win32") {
         let dir2 = await fs.readDirectory(Uri.joinPath(uri, './dosbox'));
         if (inArrays(dir2, ["dosbox.exe", FileType.File])) {
@@ -47,7 +47,7 @@ async function customToolCheck(path: string): Promise<ToolInfo> {
     info.hasBoxasm = inArrays(dir1, ["boxasm.bat", FileType.File]);
     info.hasMasm = inArrays(dir1, ["masm", FileType.Directory]);
     info.hasTasm = inArrays(dir1, ["tasm", FileType.Directory]);
-    console.log(dir1, info);
+    //console.log(dir1, info);
     return info;
 };
 function writefile(Uri: Uri, Content: string) {
@@ -82,11 +82,13 @@ export class Config {
         this.toolsUri = Uri.joinPath(content.extensionUri, './tools');
         if (toolpath) {
             customToolCheck(toolpath).then(
-                (value) => { this.customToolInfo = value; },
+                (value) => {
+                    this.customToolInfo = value;
+                    this.toolsUri = value.uri;
+                },
                 (reason) => { console.log(reason); this.customToolInfo = undefined; }
             );
         };
-
         //写dosbox配置信息
         this.writeBoxconfig(this);
     }

src/configration.ts

@@ -531,11 +531,11 @@ enum KeywordType {
 export function getType(type: KeywordType): string {
 	switch (type) {
 		case KeywordType.Instruction:
-			return localize("keykind.Command", "(Command)");
+			return localize("keykind.Command", "(Opcode mnemonics)");
 		case KeywordType.MemoryAllocation:
-			return localize("keykind.Memory", "(Memory)");
+			return localize("keykind.Memory", "(Data definitions)");
 		case KeywordType.PreCompileCommand:
-			return localize("keykind.Instruction", "(Instruction)");
+			return localize("keykind.Instruction", "(Assembly directives)");
 		case KeywordType.Register:
 			return localize("keykind.Register", "(Register)");
 		case KeywordType.SavedWord:

src/language/wordinfo.ts

@@ -59,7 +59,9 @@ export class AsmAction {
                     break;
             }
             if (goon && (DOSemu === "msdos player" || DOSemu === "auto")) {
-                MSDos.RunDebug(this._config, DOSemu === "msdos player", runOrDebug);
+                let flag: boolean = DOSemu === "msdos player";
+                flag = (MASMorTASM === "masm" || runOrDebug === false || DOSemu == "auto") || flag
+                MSDos.RunDebug(this._config, flag, runOrDebug);
             };
         }
     }

src/runcode.ts

@@ -29,7 +29,8 @@ export function RunDebug(conf: Config, viaplayer: boolean, runordebug: boolean)
     else {
         debug = 'DEBUG T.EXE';
     }
-    if (viaplayer) {
+    let flag: boolean = (conf.MASMorTASM === "TASM" && runordebug === false);
+    if (viaplayer && !flag) {
         outTerminal(runordebug, conf);
     }
     else {