Add VBScript into "Visual Basic" scheme menu.

zufuliu · Nov 6, 2024 · 3343605 · 3343605
1 parent 165eb9d
commit 3343605
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 4 deletions.
diff --git a/locale/de/Notepad4.rc b/locale/de/Notepad4.rc
@@ -556,6 +556,7 @@ BEGIN
 		BEGIN
 			MENUITEM "&Visual Basic",				IDM_LEXER_VBNET
 			MENUITEM "&Office VBA",					IDM_LEXER_VBA
+			MENUITEM "VB&Script",					IDM_LEXER_VBS
 		END
 		POPUP "&XML Dokument"
 		BEGIN

diff --git a/locale/fr/Notepad4.rc b/locale/fr/Notepad4.rc
@@ -556,6 +556,7 @@ BEGIN
 		BEGIN
 			MENUITEM "&Visual Basic",				IDM_LEXER_VBNET
 			MENUITEM "&Office VBA",					IDM_LEXER_VBA
+			MENUITEM "VB&Script",					IDM_LEXER_VBS
 		END
 		POPUP "Document XML"
 		BEGIN

diff --git a/locale/it/Notepad4.rc b/locale/it/Notepad4.rc
@@ -556,6 +556,7 @@ BEGIN
 		BEGIN
 			MENUITEM "&Visual Basic",				IDM_LEXER_VBNET
 			MENUITEM "&Office VBA",					IDM_LEXER_VBA
+			MENUITEM "VB&Script",					IDM_LEXER_VBS
 		END
 		POPUP "Documento &XML"
 		BEGIN

diff --git a/locale/ja/Notepad4.rc b/locale/ja/Notepad4.rc
@@ -556,6 +556,7 @@ BEGIN
 		BEGIN
 			MENUITEM "&Visual Basic",				IDM_LEXER_VBNET
 			MENUITEM "&Office VBA",					IDM_LEXER_VBA
+			MENUITEM "VB&Script",					IDM_LEXER_VBS
 		END
 		POPUP "XML文書(&X)"
 		BEGIN

diff --git a/locale/ko/Notepad4.rc b/locale/ko/Notepad4.rc
@@ -556,6 +556,7 @@ BEGIN
 		BEGIN
 			MENUITEM "&Visual Basic",				IDM_LEXER_VBNET
 			MENUITEM "&Office VBA",					IDM_LEXER_VBA
+			MENUITEM "VB&Script",					IDM_LEXER_VBS
 		END
 		POPUP "XML 문서(&X)"
 		BEGIN

diff --git a/locale/pt-BR/Notepad4.rc b/locale/pt-BR/Notepad4.rc
@@ -556,6 +556,7 @@ BEGIN
 		BEGIN
 			MENUITEM "&Visual Basic",				IDM_LEXER_VBNET
 			MENUITEM "&Office VBA",					IDM_LEXER_VBA
+			MENUITEM "VB&Script",					IDM_LEXER_VBS
 		END
 		POPUP "&XML Document"
 		BEGIN

diff --git a/locale/ru/Notepad4.rc b/locale/ru/Notepad4.rc
@@ -557,6 +557,7 @@ BEGIN
 		BEGIN
 			MENUITEM "&Visual Basic",				IDM_LEXER_VBNET
 			MENUITEM "&Office VBA",					IDM_LEXER_VBA
+			MENUITEM "VB&Script",					IDM_LEXER_VBS
 		END
 		POPUP "&XML-документ"
 		BEGIN

diff --git a/locale/zh-Hans/Notepad4.rc b/locale/zh-Hans/Notepad4.rc
@@ -556,6 +556,7 @@ BEGIN
 		BEGIN
 			MENUITEM "&Visual Basic",				IDM_LEXER_VBNET
 			MENUITEM "&Office VBA",					IDM_LEXER_VBA
+			MENUITEM "VB&Script",					IDM_LEXER_VBS
 		END
 		POPUP "&XML 文档"
 		BEGIN

diff --git a/locale/zh-Hant/Notepad4.rc b/locale/zh-Hant/Notepad4.rc
@@ -556,6 +556,7 @@ BEGIN
 		BEGIN
 			MENUITEM "&Visual Basic",				IDM_LEXER_VBNET
 			MENUITEM "&Office VBA",					IDM_LEXER_VBA
+			MENUITEM "VB&Script",					IDM_LEXER_VBS
 		END
 		POPUP "&XML 文件"
 		BEGIN

diff --git a/src/Notepad4.rc b/src/Notepad4.rc
@@ -556,6 +556,7 @@ BEGIN
 		BEGIN
 			MENUITEM "&Visual Basic",				IDM_LEXER_VBNET
 			MENUITEM "&Office VBA",					IDM_LEXER_VBA
+			MENUITEM "VB&Script",					IDM_LEXER_VBS
 		END
 		POPUP "&XML Document"
 		BEGIN

diff --git a/src/Styles.cpp b/src/Styles.cpp
@@ -1444,10 +1444,9 @@ void Style_SetLexer(PEDITLEXER pLexNew, BOOL bLexerChanged) noexcept {
 		} break;
 
 		case NP2LEX_VBSCRIPT:
-			dialect = 2; // see LexVB.cxx
-			break;
 		case NP2LEX_VISUALBASIC: {
 			static_assert(IDM_LEXER_VBA - IDM_LEXER_VBNET == 1);
+			static_assert(IDM_LEXER_VBS - IDM_LEXER_VBNET == 2);
 			dialect = np2LexLangIndex - IDM_LEXER_VBNET;
 		} break;
 		}
@@ -2902,6 +2901,9 @@ void Style_SetLexerByLangIndex(int lang) noexcept {
 	case IDM_LEXER_VBA:
 		pLex = &lexVisualBasic;
 		break;
+	case IDM_LEXER_VBS:
+		pLex = &lexVBScript;
+		break;
 
 	// XML Document
 	case IDM_LEXER_XML:
@@ -2986,6 +2988,9 @@ void Style_UpdateSchemeMenu(HMENU hmenu) noexcept {
 		case NP2LEX_VISUALBASIC:
 			lang = IDM_LEXER_VBNET;
 			break;
+		case NP2LEX_VBSCRIPT:
+			lang = IDM_LEXER_VBS;
+			break;
 		// XML Document
 		case NP2LEX_XML:
 			lang = IDM_LEXER_XML;

diff --git a/src/resource.h b/src/resource.h
@@ -867,9 +867,10 @@
 // Visual Basic
 #define IDM_LEXER_VBNET					40733
 #define IDM_LEXER_VBA					40734
+#define IDM_LEXER_VBS					40735
 // individual
-#define IDM_LEXER_APACHE				40735
-#define IDM_LEXER_LEXER_COUNT			40736
+#define IDM_LEXER_APACHE				40736
+#define IDM_LEXER_LEXER_COUNT			40737
 
 #define IDS_ERR_LOADFILE				50000
 #define IDS_ERR_SAVEFILE				50001