programmatic features

add reference provider and code formator
fix outline view mistake `asseme cs:code` for label
fix diagnose can't display fatal message: view fatal as error
Merge branch 'next' into master

Author: xsro

.vscode/launch.json

@@ -18,6 +18,19 @@
 			],
 			"preLaunchTask": "${defaultBuildTask}"
 		},
+		{
+			"name": "Run Extension(no i18n)",
+			"type": "extensionHost",
+			"request": "launch",
+			"runtimeExecutable": "${execPath}",
+			"args": [
+				"--extensionDevelopmentPath=${workspaceFolder}"
+			],
+			"outFiles": [
+				"${workspaceFolder}/out/**/*.js"
+			],
+			"preLaunchTask": "${defaultBuildTask}"
+		},
 		{
 			"name": "Extension Tests",
 			"type": "extensionHost",

CHANGELOG.md

@@ -1,30 +1,36 @@
 # Change Log
 
-All notable changes to the "masm-tasm" extension will be documented in this file.Welcome [issue](https://github.com/xsro/masm-tasm/issues) and PR
+## welcome any feedback [issue](https://github.com/xsro/masm-tasm/issues)
 
-## 目标
+## 0.2.1
 
-- [ ] 搞一个好看的logo和名字
-- [ ] 问题匹配功能完善
-- [ ] hover的简单实现:如中断的简单信息
-- [ ] LSP和DAP支持（目前对我来说太难了）
-- [ ] 根据具体的AH值显示跳转到不同的信息
+- [x] `dosbox here`增加了一个命令以在当前文件所在目录下打开dosbox，来提供更加自由的操作，见demo
+- [x] 优化diagnose对fatal类错误的匹配,优化大纲视图
+- [x] 提供代码格式化功能（需要完善并且现在的效果并不是很好）
+- [x] 提供查找引用功能（目前也并不完美）
+- [ ] webpack打包（nls部分总是失败）
 
-### 0.2.0
+鉴于这些功能目前可能不完善，你可以在设置中关闭他们（关闭后需要手动重启）
+
+DEMO `dosbox here`示例: 代码来自[dpisdaniel/assembly-pacman](https://github.com/dpisdaniel/assembly-pacman)
+
+![demo pacman](https://github.com/xsro/masm-tasm/raw/next/pics/demo_pacman.gif)
+
+## 0.2.0
 
 - [x] DOS 汇编基本的语法支持
 - [x] vscode 界面的大纲视图的简单实现
 
 汇编语言支持的symbol大概有以下几种，但是vscode的[SymbolKind](https://code.visualstudio.com/api/references/vscode-api#SymbolKind)却与它们不对应，我决定做以下对应
 
-|assembly symbol|vscode symbol|
-|---|---|
-|macro|Module|
-|segment|Class|
-|procedure|Function|
-|struct|Struct|
-|label|Key|
-|variable|Variable|
+|assembly symbol|vscode symbol|汇编关键字|vscode关键字|
+|---|---|---|----|
+|macro|Module|宏|模块|
+|segment|Class|段|类|
+|procedure|Function|子程序|函数|
+|struct|Struct|结构体|结构体|
+|label|Key|标号|键|
+|variable|Variable|变量|变量|
 
 ### 0.1.4
 

README.md

@@ -2,7 +2,7 @@
 
 [中文](https://github.com/xsro/masm-tasm/blob/master/doc/README_zh.md)|[English](https://github.com/xsro/masm-tasm/blob/master/README.md)
 
-Language support for DOS assembly,suitable for studying MASM/TASM and the course <*principles& peripheral technology of microprocessor*>.
+Language support for DOS assembly,may be suitable for studying MASM/TASM and the course <*principles& peripheral technology of microprocessor*>.
 
 - Offer *grammar*,basic *outline* view and *hover* support for DOS assembly language
 - Support both **TASM and MASM** assembler tools: choose MASM or TASM in the preference
@@ -21,13 +21,13 @@ when you are editing `assembly` files ,you can right click at the editor panel,t
 2. "Run ASM code": Compile and Run the program
 3. "Debug ASM code": Compile and Debug the program
 
-### Demo 1: using MASM（via msdos-player）
+### Demo 1: using TASM(via dosbox, default mode)
 
-![demo msdos-player masm](https://github.com/xsro/masm-tasm/raw/master/pics/demo_msdos_masm.gif)
+![demo dosbox tasm](https://github.com/xsro/masm-tasm/raw/master/pics/demo_dosbox_tasm.gif)
 
-### Demo 2: using TASM(via dosbox)
+### Demo 2: using MASM（via msdos-player）
 
-![demo dosbox tasm](https://github.com/xsro/masm-tasm/raw/master/pics/demo_dosbox_tasm.gif)
+![demo msdos-player masm](https://github.com/xsro/masm-tasm/raw/master/pics/demo_msdos_masm.gif)
 
 ### Demo 3: Open dosbox and type the command you need
 
@@ -67,7 +67,12 @@ the extension has built in tools for windows. But if you need to use assembler o
   3. `dosbox`: dosbox.exe and related files
   4. `player`: msdos.exe
 
-Linux and other OS user do not need folder dosbox and player. Instead, we should make sure DOSBox can be opened by shell command `dosbox` (node: child_process.exec("dosbox"))
+Linux and other OS user do not need folder dosbox and player. Instead, we should make sure DOSBox can be opened by shell command `dosbox` (node: child_process.exec("dosbox")). Use command like
+
+```sh
+sudo apt install dosbox  #install dosbox
+dosbox #if successfully opened the dosbox, it is largely possible for the extension to use dosbox
+```
 
 ### About use of DOSBox
 

i18n/chs/package.i18n.json

@@ -17,5 +17,6 @@
 	"dosasm.config.boxrun.enum1":"运行之后在dosbox窗口停留，可以输入exit，点击x，或者Ctrl+F9关闭程序",
 	"dosasm.config.boxrun.enum2":"运行程序之后自动关闭",
 	"dosasm.config.boxrun.enum3":"运行程序之后先停顿一下 输入任意字符后关闭窗口",
-	"dosasm.config.dosbox.resolution":"自定义dosbox窗口大小，格式如1024x640，不设置则为DOSBox默认大小"
+	"dosasm.config.dosbox.resolution":"自定义dosbox窗口大小，格式如1024x640，不设置则为DOSBox默认大小",
+	"dosasm.command.dosboxhere":"打开DOSBox将当前文件所在目录挂载到E盘，并配置相关环境"
 }

language-configuration.json

@@ -17,13 +17,13 @@
     "surroundingPairs": [
         ["[", "]"],
         ["\"", "\""],
-        ["'", "'"]
+        ["'", "'"],
     ],
     "wordPattern": "('(.*?)')|(-?\\d*\\.\\d\\w*)|([^\\`\\~\\!\\#\\%\\^\\&\\*\\(\\)\\-\\=\\+\\[\\{\\]\\}\\\\\\|\\:\\;\\'\\\"\\,\\.\\<\\>\\/\\?\\s]+)|(\\;.+$)",
     "folding": {
         "markers": {
-            "start": "proc|struct",
-            "end": "endp|ends"
+            "start": "^\\s*\\w+\\s+proc|struct|PROC|STRUCT|SEGMENT|MACRO|macro",
+            "end": "^\\s*\\w*\\s*endp|ends|ENDP|ENDS|ENDM|endm"
         }
     },
     "indentationRules": {

package.json

@@ -2,9 +2,9 @@
 	"name": "masm-tasm",
 	"displayName": "MASM/TASM",
 	"publisher": "xsro",
-	"description": "DOS汇编语言开发环境和语法支持，安装即用,自带DOSBox.exe和TASM/MASM工具",
-	"version": "0.2.0",
-	"keywords":["dosbox","16位","汇编","微机原理","tasm","masm"],
+	"description": "DOS汇编语言开发环境和语法支持，win下安装即用,自带DOSBox.exe和TASM/MASM工具",
+	"version": "0.2.1",
+	"keywords":["dosbox","16位","汇编","微机原理","tasm","masm","8086"],
 	"icon":"dosboxasm.png",
 	"engines": {
 		"vscode": "^1.47.0"
@@ -24,7 +24,8 @@
 		"onLanguage:asm",
 		"onLanguage:masm",
 		"onLanguage:tasm",
-		"onLanguage:assembly"
+		"onLanguage:assembly",
+		"onCommand:dosboxhere"
 	],
 	"main": "./out/extension.js",
 	"contributes": {
@@ -88,6 +89,10 @@
 			{
 				"command":"masm-tasm.cleanalldiagnose",
 				"title":"%dosasm.command.cleanalldianose%"
+			},
+			{
+				"command":"masm-tasm.dosboxhere",
+				"title":"%dosasm.command.dosboxhere%"
 			}
 		],
 		"configuration" :{
@@ -127,7 +132,7 @@
 				"masmtasm.language.programmaticFeatures":{
 					"type":"boolean",
 					"default":true,
-					"description": "experimental programmatic features like hover,outline,jump to definition. You can close them by choosing false"
+					"description": "Experimental programmatic features like hover,outline,jump to definition/reference. Restart needed"
 				},
 				"masmtasm.dosbox.run": {
 					"type": "string",

package.nls.json

@@ -17,5 +17,6 @@
 	"dosasm.config.boxrun.enum1":"do nothing, manually input exit or click 'x' or press 'Ctrl+F9' to exit",
 	"dosasm.config.boxrun.enum2":"exit DOSBox automatically",
 	"dosasm.config.boxrun.enum3":"pause and then exit",
-	"dosasm.config.dosbox.resolution":"Set dosbox resolution like '1024x640'.If left empty, it means use the default resolution of DOSBox"
+	"dosasm.config.dosbox.resolution":"Set dosbox resolution like '1024x640'.If left empty, it means use the default resolution of DOSBox",
+	"dosasm.command.dosboxhere":"Dosbox here: Open DosBox, Mount the path of the editor files's folder as E:\\ and set the needed environment"
 }

pics/demo_pacman.gif

@@ -31,6 +31,19 @@ export class DOSBox{
         }
         if(diag && doc) this.BOXdiag(conf,diag,doc)
     }
+    public BoxOpenCurrentFolder(conf:Config,doc:TextDocument){
+        let folderpath:string=Uri.joinPath(doc.uri,'../').fsPath
+        let Ecmd:string='-noautoexec -c "mount e \\\"'+folderpath+'\\\"" -c "mount c \\\"'+conf.path+'\\\"" -c "set PATH=%%PATH%%;c:\masm;c:\\tasm"-c "e:"'
+        if(process.platform=='win32'){
+            let wincommand='start/min/wait "" "'+conf.path+'/dosbox/dosbox.exe" -conf "'+conf.dosboxconfuri.fsPath+'" '
+            execSync(wincommand+Ecmd,{cwd:conf.workpath,shell:'cmd.exe'})
+        }
+        else{
+            let linuxcommand='dosbox -conf "'+conf.dosboxconfuri.fsPath+'" '
+            execSync(linuxcommand+Ecmd,{cwd:conf.workpath})
+        }
+        
+    }
     private BOXdiag(conf:Config,diag:landiagnose,doc:TextDocument):string{
         let info:string=' ',content:string
         let document=doc

src/DOSBox.ts

@@ -95,7 +95,6 @@ export class Config {
     {
         let configUri=conf.dosboxconfuri
         let Pathadd=' '
-        Pathadd='set PATH=c:\\tasm;c:\\masm'
         let configContent = `[sdl]
 windowresolution=${conf.resolution}
 output=opengl
@@ -104,7 +103,7 @@ mount c "${conf.path}"
 mount d "${conf.workpath}"
 mount x "${conf.batchpath}"
 d:
-${Pathadd}`;
+set PATH=%PATH%;c:\\tasm;c:\\masm`;
         if (autoExec) configContent=configContent+'\n'+autoExec
         this.writefile(configUri,configContent)
     }