Include JSDoc tag in auto-completion list for ActionScript and TypeSc…

…ript.
zufuliu · Mar 3, 2023 · d302e6c · d302e6c
1 parent ed9dd0c
commit d302e6c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/readme.md b/readme.md
@@ -1,8 +1,6 @@
-# Notepad2-zufuliu and metapath
+# Notepad2-zufuliu and metapath-zufuliu
 
-Notepad2-zufuliu is a light-weight Scintilla based text editor for Windows with syntax highlighting, code folding, auto-completion and API list for many programming languages and documents.
-
-> *Notepad2-zufuliu* is a modified version (fork) of [Notepad2-mod](https://xhmikosr.github.io/notepad2-mod/). *metapath* is a bug-fixed version of original [metapath](https://www.flos-freeware.ch/archive.html).
+Notepad2-zufuliu is a light-weight Scintilla based text editor for Windows with syntax highlighting, code folding, auto-completion and API list for many programming languages and documents, it's based on official [Notepad2](https://www.flos-freeware.ch/notepad2.html) and [Notepad2-mod](https://xhmikosr.github.io/notepad2-mod/). metapath-zufuliu is a file browser plugin and based on official [metapath](https://www.flos-freeware.ch/archive.html).
 
 [![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](License.txt) [![Latest release](https://img.shields.io/github/release/zufuliu/notepad2.svg)](https://github.com/zufuliu/notepad2/releases) [![Downloads](https://img.shields.io/github/downloads/zufuliu/notepad2/total.svg)](https://github.com/zufuliu/notepad2/releases)
 
@@ -131,7 +129,7 @@ Latest development builds (artifacts in Release configuration for each compiler
 	* TCL, [Screenshots](https://github.com/zufuliu/notepad2/wiki/Screenshots#tcl)
 	* Texinfo
 	* [TOML File](https://toml.io/)
-	* [TypeScript](tools/lang/TypeScript.ts), TypeScript 4.9.
+	* [TypeScript](tools/lang/TypeScript.ts), TypeScript 5.0.
 	* Visual Basic, VB6, VB.NET
 	* VBScript
 	* [VHDL](tools/lang/VHDL.vhdl), up to VHDL 2019.

diff --git a/src/EditAutoC.c b/src/EditAutoC.c
@@ -1241,6 +1241,9 @@ static AddWordResult AutoC_AddSpecWord(struct WordList *pWList, int iCurrentStyl
 		if (ch == '@' || (ch == '<' && rid == NP2LEX_TYPESCRIPT)) {
 			if (iCurrentStyle >= SCE_JS_COMMENTLINE && iCurrentStyle <= SCE_JS_TASKMARKER) {
 				WordList_AddList(pWList, pLex->pKeyWords->pszKeyWords[JavaScriptKeywordIndex_Jsdoc]);
+				if (rid != NP2LEX_JAVASCRIPT) {
+					WordList_AddList(pWList, lexJavaScript.pKeyWords->pszKeyWords[JavaScriptKeywordIndex_Jsdoc]);
+				}
 				return AddWordResult_Finish;
 			}
 #if 0

diff --git a/tools/lang/JavaScript.js b/tools/lang/JavaScript.js
@@ -1080,6 +1080,3 @@ Worker() {
 	removeItem(keyName)
 	setItem(keyName, keyValue)
 }
-
-// https://api.jquery.com/
-jQuery
diff --git a/tools/lang/TypeScript.ts b/tools/lang/TypeScript.ts
@@ -1,4 +1,4 @@
-// 4.9 https://www.typescriptlang.org/docs/
+// 5.0 https://www.typescriptlang.org/docs/
 // 1.8 https://github.com/microsoft/TypeScript/blob/main/doc/
 
 //! keywords		===========================================================