Added support for F# (FSharp) language syntax highlight (#2298) (2)

WinMerge · Apr 27, 2024 · 15fbdc4 · 15fbdc4
1 parent b0a8f4c
commit 15fbdc4
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 48 deletions.
diff --git a/Docs/Users/Contributors.txt b/Docs/Users/Contributors.txt
@@ -290,6 +290,7 @@ Other Contributors (code, ideas, testing..):
 * Yutaka-Sawada
 * myss
 * vlakoff
+* Tuomas Hietanen
 
 WinMerge includes code from:
 * Jared Breland <jbreland@legroom.net> (Installer's modpath script)

diff --git a/Src/Merge.rc b/Src/Merge.rc
@@ -4205,6 +4205,7 @@ BEGIN
     IDS_COLORSCHEME_DCL     "DCL"
     IDS_COLORSCHEME_DLANG   "D"
     IDS_COLORSCHEME_FORTRAN "Fortran"
+    IDS_COLORSCHEME_FSHARP  "F#"
     IDS_COLORSCHEME_GO      "Go"
     IDS_COLORSCHEME_HTML    "HTML"
     IDS_COLORSCHEME_INI     "INI"

diff --git a/Src/MergeEditView.cpp b/Src/MergeEditView.cpp
@@ -4149,7 +4149,7 @@ void CMergeEditView::OnUpdateViewChangeScheme(CCmdUI *pCmdUI)
 	for (int i = ID_COLORSCHEME_FIRST + 1, j = 0; i <= ID_COLORSCHEME_LAST; ++i, ++j)
 	{
 		name = theApp.LoadString(i);
-		AppendMenu(hSubMenu, MF_STRING | (((j % 22) == 21) ? MF_MENUBREAK : 0), i, name.c_str());
+		AppendMenu(hSubMenu, MF_STRING | (((j % 23) == 22) ? MF_MENUBREAK : 0), i, name.c_str());
 	}
 
 	pCmdUI->Enable(true);

diff --git a/Src/resource.h b/Src/resource.h
@@ -931,53 +931,54 @@
 #define IDS_COLORSCHEME_DCL             33160
 #define IDS_COLORSCHEME_DLANG           33161
 #define IDS_COLORSCHEME_FORTRAN         33162
-#define IDS_COLORSCHEME_GO              33163
-#define IDS_COLORSCHEME_HTML            33164
-#define IDS_COLORSCHEME_INI             33165
-#define IDS_COLORSCHEME_INNOSETUP       33166
-#define IDS_COLORSCHEME_INSTALLSHIELD   33167
-#define IDS_COLORSCHEME_JAVA            33168
-#define IDS_COLORSCHEME_JAVASCRIPT      33169
-#define IDS_COLORSCHEME_JSON            33170
-#define IDS_COLORSCHEME_LISP            33171
-#define IDS_COLORSCHEME_LUA             33172
-#define IDS_COLORSCHEME_MATLAB          33173
-#define IDS_COLORSCHEME_NSIS            33174
-#define IDS_COLORSCHEME_PASCAL          33175
-#define IDS_COLORSCHEME_PERL            33176
-#define IDS_COLORSCHEME_PHP             33177
-#define IDS_COLORSCHEME_PO              33178
-#define IDS_COLORSCHEME_POWERSHELL      33179
-#define IDS_COLORSCHEME_PYTHON          33180
-#define IDS_COLORSCHEME_REXX            33181
-#define IDS_COLORSCHEME_RSRC            33182
-#define IDS_COLORSCHEME_RUBY            33183
-#define IDS_COLORSCHEME_RUST            33184
-#define IDS_COLORSCHEME_SGML            33185
-#define IDS_COLORSCHEME_SH              33186
-#define IDS_COLORSCHEME_SIOD            33187
-#define IDS_COLORSCHEME_SMARTY          33188
-#define IDS_COLORSCHEME_SQL             33189
-#define IDS_COLORSCHEME_TCL             33190
-#define IDS_COLORSCHEME_TEX             33191
-#define IDS_COLORSCHEME_VERILOG         33192
-#define IDS_COLORSCHEME_VHDL            33193
-#define IDS_COLORSCHEME_XML             33194
-#define ID_COLORSCHEME_LAST             33194
-#define ID_TOOLBAR_NONE                 33195
-#define ID_TOOLBAR_SMALL                33196
-#define ID_TOOLBAR_BIG                  33197
-#define ID_TOOLBAR_HUGE                 33198
-#define ID_VIEW_RESIZE_PANES            33199
-#define ID_VIEW_ZOOMIN                  33200
-#define ID_VIEW_ZOOMOUT                 33201
-#define ID_VIEW_ZOOMNORMAL              33202
-#define ID_PLUGINS_LIST                 33203
-#define ID_PREDIFFER_MANUAL             33204
-#define ID_PREDIFFER_AUTO               33205
-#define ID_VIEW_DIFFCONTEXT_ALL         33208
-#define ID_VIEW_DIFFCONTEXT_0           33209
-#define ID_VIEW_DIFFCONTEXT_1           33210
+#define IDS_COLORSCHEME_FSHARP          33163
+#define IDS_COLORSCHEME_GO              33164
+#define IDS_COLORSCHEME_HTML            33165
+#define IDS_COLORSCHEME_INI             33166
+#define IDS_COLORSCHEME_INNOSETUP       33167
+#define IDS_COLORSCHEME_INSTALLSHIELD   33168
+#define IDS_COLORSCHEME_JAVA            33169
+#define IDS_COLORSCHEME_JAVASCRIPT      33170
+#define IDS_COLORSCHEME_JSON            33171
+#define IDS_COLORSCHEME_LISP            33172
+#define IDS_COLORSCHEME_LUA             33173
+#define IDS_COLORSCHEME_MATLAB          33174
+#define IDS_COLORSCHEME_NSIS            33175
+#define IDS_COLORSCHEME_PASCAL          33176
+#define IDS_COLORSCHEME_PERL            33177
+#define IDS_COLORSCHEME_PHP             33178
+#define IDS_COLORSCHEME_PO              33179
+#define IDS_COLORSCHEME_POWERSHELL      33180
+#define IDS_COLORSCHEME_PYTHON          33181
+#define IDS_COLORSCHEME_REXX            33182
+#define IDS_COLORSCHEME_RSRC            33183
+#define IDS_COLORSCHEME_RUBY            33184
+#define IDS_COLORSCHEME_RUST            33185
+#define IDS_COLORSCHEME_SGML            33186
+#define IDS_COLORSCHEME_SH              33187
+#define IDS_COLORSCHEME_SIOD            33188
+#define IDS_COLORSCHEME_SMARTY          33189
+#define IDS_COLORSCHEME_SQL             33190
+#define IDS_COLORSCHEME_TCL             33191
+#define IDS_COLORSCHEME_TEX             33192
+#define IDS_COLORSCHEME_VERILOG         33193
+#define IDS_COLORSCHEME_VHDL            33194
+#define IDS_COLORSCHEME_XML             33195
+#define ID_COLORSCHEME_LAST             33195
+#define ID_TOOLBAR_NONE                 33200
+#define ID_TOOLBAR_SMALL                33201
+#define ID_TOOLBAR_BIG                  33202
+#define ID_TOOLBAR_HUGE                 33203
+#define ID_VIEW_RESIZE_PANES            33204
+#define ID_VIEW_ZOOMIN                  33205
+#define ID_VIEW_ZOOMOUT                 33206
+#define ID_VIEW_ZOOMNORMAL              33207
+#define ID_PLUGINS_LIST                 33208
+#define ID_PREDIFFER_MANUAL             33209
+#define ID_PREDIFFER_AUTO               33210
+#define ID_VIEW_DIFFCONTEXT_ALL         33218
+#define ID_VIEW_DIFFCONTEXT_0           33219
+#define ID_VIEW_DIFFCONTEXT_1           33220
 #define ID_VIEW_DIFFCONTEXT_3           33221
 #define ID_VIEW_DIFFCONTEXT_5           33222
 #define ID_VIEW_DIFFCONTEXT_7           33223

diff --git a/Translations/WinMerge/StringBlacklist.txt b/Translations/WinMerge/StringBlacklist.txt
@@ -24,6 +24,7 @@ CSS
 DCL
 D
 Fortran
+F#
 Go
 HTML
 INI