Fix msys2 clang build

Fix notepad-plus-plus#17448, close notepad-plus-plus#17449

Author: ozone10

.github/workflows/CI_build.yml

@@ -170,35 +170,35 @@ jobs:
 
     - name: Archive artifacts for x64 / Release
       if: matrix.build_platform == 'x64' && matrix.build_configuration == 'Release'
-      uses: actions/upload-artifact@v5
+      uses: actions/upload-artifact@v6
       with:
           name: Notepad++.MSVC.${{ matrix.build_platform}}.${{ matrix.build_configuration}}
           path: PowerEditor\bin64\Notepad++.exe
 
     - name: Archive artifacts for Win32 / Release
       if: matrix.build_platform == 'Win32' && matrix.build_configuration == 'Release'
-      uses: actions/upload-artifact@v5
+      uses: actions/upload-artifact@v6
       with:
           name: Notepad++.MSVC.${{ matrix.build_platform}}.${{ matrix.build_configuration}}
           path: PowerEditor\bin\Notepad++.exe
 
     - name: Archive artifacts for ARM64 / Release
       if: matrix.build_platform == 'ARM64' && matrix.build_configuration == 'Release'
-      uses: actions/upload-artifact@v5
+      uses: actions/upload-artifact@v6
       with:
           name: Notepad++.MSVC.${{ matrix.build_platform}}.${{ matrix.build_configuration}}
           path: PowerEditor\binarm64\Notepad++.exe
 
     - name: Archive artifacts for ARM64|x64 / Debug
       if: (matrix.build_platform == 'ARM64' || matrix.build_platform == 'x64') && matrix.build_configuration == 'Debug'
-      uses: actions/upload-artifact@v5
+      uses: actions/upload-artifact@v6
       with:
           name: Notepad++.MSVC.${{ matrix.build_platform}}.${{ matrix.build_configuration}}
           path: PowerEditor\visual.net\${{ matrix.build_platform}}\${{ matrix.build_configuration}}\Notepad++.exe
 
     - name: Archive artifacts for Win32 / Debug
       if: matrix.build_platform == 'Win32' && matrix.build_configuration == 'Debug'
-      uses: actions/upload-artifact@v5
+      uses: actions/upload-artifact@v6
       with:
           name: Notepad++.MSVC.${{ matrix.build_platform}}.${{ matrix.build_configuration}}
           path: PowerEditor\visual.net\${{ matrix.build_configuration}}\Notepad++.exe
@@ -336,6 +336,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        build_compiler: [gcc]
         build_configuration: [Release, Debug]
         build_platform: [x86_64, i686]
 
@@ -351,7 +352,8 @@ jobs:
            $newContent = $content -replace 'TEXT\(\"Notepad\+\+ v.*\"\)', 'TEXT("Notepad++ GH_BUILD")'
            $newContent | Set-Content -Path 'resource.h'
 
-    - name: Make n++ exe
+    - name: Make n++ exe / gcc
+      if: matrix.build_compiler == 'gcc'
       working-directory: .\
       run: |
         Write-host "${{ matrix.build_platform }}"
@@ -374,14 +376,14 @@ jobs:
 
     - name: Archive artifacts for ${{ matrix.build_platform}} / Release
       if: matrix.build_configuration == 'Release'
-      uses: actions/upload-artifact@v5
+      uses: actions/upload-artifact@v6
       with:
-          name: Notepad++.GCC.${{ matrix.build_platform}}.${{ matrix.build_configuration}}
-          path: bin.${{ matrix.build_platform}}\notepad++.exe
+          name: Notepad++.${{ matrix.build_compiler}}.${{ matrix.build_platform}}.${{ matrix.build_configuration}}
+          path: bin.${{ matrix.build_compiler}}.${{ matrix.build_platform}}\notepad++.exe
 
     - name: Archive artifacts for ${{ matrix.build_platform}} / Debug
       if: matrix.build_configuration == 'Debug'
-      uses: actions/upload-artifact@v5
+      uses: actions/upload-artifact@v6
       with:
-          name: Notepad++.GCC.${{ matrix.build_platform}}.${{ matrix.build_configuration}}
-          path: bin.${{ matrix.build_platform}}-debug\notepad++.exe
+          name: Notepad++.${{ matrix.build_compiler}}.${{ matrix.build_platform}}.${{ matrix.build_configuration}}
+          path: bin.${{ matrix.build_compiler}}.${{ matrix.build_platform}}-debug\notepad++.exe

PowerEditor/gcc/makefile

@@ -18,6 +18,8 @@
 # definitions
 #
 
+MAKEFILE_ABS_DIR = $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
+
 GCC_DIRECTORY := ../gcc
 GCC_EXCLUDE := $(GCC_DIRECTORY)/gcc-%
 SRC_DIRECTORY := ../src
@@ -38,8 +40,11 @@ LEXILLA_TARGET := liblexilla.a
 
 ifeq ($(CXX),clang++)
   CXX := $(CROSS_COMPILE)clang++
+  SCI_CLANG := 1
+  COMPILER_SUFFIX := clang.
 else
   CXX := $(CROSS_COMPILE)g++
+  COMPILER_SUFFIX := gcc.
 endif
 
 CXXFLAGS := -include $(GCC_DIRECTORY)/gcc-fixes.h -std=c++20
@@ -74,26 +79,34 @@ CXXFLAGS += -Og \
             -Wextra-semi \
             -Wformat=2 \
             -Wmisleading-indentation \
-            -Wunused \
-            -Wno-cast-function-type \
-            -Wno-overloaded-virtual
+            -Wunused
 CPP_DEFINE += DEBUG
 endif
 
 ifeq ($(CXX),clang++)
-  CXXFLAGS += -Wimplicit-fallthrough \
+  CXXFLAGS += -Wpedantic \
+              -Wall \
+              -Wextra \
+              -Wimplicit-fallthrough \
               -Wno-c++98-compat \
               -Wno-c++98-compat-pedantic \
-              -Wno-reserved-id-macro \
-              -Wno-pragma-pack \
-              -Wno-unknown-pragmas \
-              -Wno-unused-command-line-argument \
+              -Wno-c99-extensions \
+              -Wno-cast-align \
+              -Wno-deprecated-declarations \
+              -Wno-nested-anon-types \
               -Wno-overloaded-virtual \
+              -Wno-padded \
+              -Wno-pragma-pack \
+              -Wno-reserved-id-macro \
+              -Wno-reserved-identifier \
               -Wno-sign-conversion \
-              -Wno-c99-extensions \
-              -Wno-deprecated-declarations
-else ifeq ($(BUILD_TYPE),release)
-  CXXFLAGS += -Wno-alloc-size-larger-than
+              -Wno-switch-default \
+              -Wno-unsafe-buffer-usage \
+              -Wno-unsafe-buffer-usage-in-libc-call \
+              -Wno-unused-command-line-argument
+else
+  CXXFLAGS += -Wno-cast-function-type \
+              -Wno-overloaded-virtual
 endif
 
 ifneq "$(filter-out 0,$(CLANGANALYZE))" ""
@@ -135,7 +148,7 @@ export RC += -Fpe-x86-64
 endif
 
 # define target and build directories and update dependent variables
-TARGET_DIRECTORY := bin.$(TARGET_CPU)$(BUILD_SUFFIX)
+TARGET_DIRECTORY := bin.$(COMPILER_SUFFIX)$(TARGET_CPU)$(BUILD_SUFFIX)
 BUILD_DIRECTORY := $(TARGET_DIRECTORY).build
 
 TARGET_BINARY := $(TARGET_DIRECTORY)/$(TARGET_BINARY)
@@ -195,7 +208,7 @@ CPDIR := cp -r
 RMDIR := rm -rf
 CP := cp
 RM := rm -f
-PREBUILD_EVENT_CMD := cmd //C "cd PowerEditor/src && NppLibsVersionH-generator.bat"
+PREBUILD_EVENT_CMD := cmd //C "$(MAKEFILE_ABS_DIR)/../src/NppLibsVersionH-generator.bat"
 normalize-path = $1
 else ifneq "$(wildcard $(dir $(SHELL))ls.exe)" ""
 # a Windows system with a proper shell
@@ -207,7 +220,7 @@ CPDIR := $(SHELL_DIRECTORY)cp.exe -r
 RMDIR := $(SHELL_DIRECTORY)rm.exe -rf
 CP := $(SHELL_DIRECTORY)cp.exe
 RM := $(SHELL_DIRECTORY)rm.exe -f
-PREBUILD_EVENT_CMD := cmd //C "cd PowerEditor/src && NppLibsVersionH-generator.bat"
+PREBUILD_EVENT_CMD := cmd //C "$(MAKEFILE_ABS_DIR)/../src/NppLibsVersionH-generator.bat"
 normalize-path = $1
 else
 # a standard Windows system
@@ -269,10 +282,10 @@ $(LEXILLA_TARGET): .force
 endif
 
 $(SCINTILLA_TARGET): | $(BUILD_DIRECTORY) $(SCINTILLA_BUILD_DIRECTORY)
-	$(AT)$(MAKE) $(SUBMAKEFLAGS) -C $(SCINTILLA_DIRECTORY)/win32 -f makefile -f ../../boostregex/nppSpecifics_mingw.mak DIR_O=$(SCINTILLA_BUILD_PATH) LIBSCI=$(SCINTILLA_TARGET_PATH) $(SCINTILLA_TARGET_PATH)
+	$(AT)$(MAKE) $(SUBMAKEFLAGS) -C $(SCINTILLA_DIRECTORY)/win32 -f makefile -f ../../boostregex/nppSpecifics_mingw.mak DIR_O=$(SCINTILLA_BUILD_PATH) LIBSCI=$(SCINTILLA_TARGET_PATH) $(SCINTILLA_TARGET_PATH) CLANG=$(SCI_CLANG)
 
 $(LEXILLA_TARGET): | $(BUILD_DIRECTORY) $(LEXILLA_BUILD_DIRECTORY)
-	$(AT)$(MAKE) $(SUBMAKEFLAGS) -C $(LEXILLA_DIRECTORY)/src DIR_O=$(LEXILLA_BUILD_PATH) LIBLEXILLA=$(LEXILLA_TARGET_PATH) $(LEXILLA_TARGET_PATH)
+	$(AT)$(MAKE) $(SUBMAKEFLAGS) -C $(LEXILLA_DIRECTORY)/src DIR_O=$(LEXILLA_BUILD_PATH) LIBLEXILLA=$(LEXILLA_TARGET_PATH) $(LEXILLA_TARGET_PATH) CLANG=$(SCI_CLANG)
 
 binary: $(TARGET_BINARY) data
 	@echo +++ $(TARGET_CPU) $(BUILD_TYPE) : $(CURDIR)/$(TARGET_BINARY) +++

PowerEditor/src/MISC/Common/Common.cpp

@@ -833,15 +833,15 @@ std::wstring stringToUpper(std::wstring strToConvert)
 {
 	static const auto loc = std::locale("");
 	std::transform(strToConvert.begin(), strToConvert.end(), strToConvert.begin(),
-		[](wchar_t ch) { return std::toupper(ch, loc); });
+		[](auto ch) { return std::toupper(ch, loc); });
 	return strToConvert;
 }
 
 std::wstring stringToLower(std::wstring strToConvert)
 {
 	static const auto loc = std::locale("");
 	std::transform(strToConvert.begin(), strToConvert.end(), strToConvert.begin(),
-		[](wchar_t ch) { return std::tolower(ch, loc); });
+		[](auto ch) { return std::tolower(ch, loc); });
 	return strToConvert;
 }
 
@@ -1754,7 +1754,7 @@ bool isUnsupportedFileName(const wstring& fileName)
 				// upperize because the std::find is case sensitive unlike the Windows OS filesystem
 				static const auto& loc = std::locale::classic();
 				std::transform(fileNameOnly.begin(), fileNameOnly.end(), fileNameOnly.begin(),
-					[](wchar_t ch) { return std::toupper(ch, loc); });
+					[](auto ch) { return std::toupper(ch, loc); });
 
 				const std::vector<std::wstring> reservedWin32NamespaceDeviceList {
 				L"CON", L"PRN", L"AUX", L"NUL",
@@ -2111,11 +2111,12 @@ bool doesPathExist(const wchar_t* path, DWORD milliSec2wait, bool* isTimeoutReac
 	return (attributes.dwFileAttributes != INVALID_FILE_ATTRIBUTES);
 }
 
-
-#if defined(__GNUC__)
-#define LAMBDA_STDCALL __attribute__((__stdcall__))
+#if defined(__GNUC__) && __GNUC__ > 8
+#define WINAPI_LAMBDA_RETURN(return_t) -> return_t WINAPI
+#elif defined(__GNUC__)
+#define WINAPI_LAMBDA_RETURN(return_t) WINAPI -> return_t
 #else
-#define LAMBDA_STDCALL 
+#define WINAPI_LAMBDA_RETURN(return_t) -> return_t
 #endif
 
 // check if the window rectangle intersects with any currently active monitor's working area
@@ -2129,7 +2130,7 @@ bool isWindowVisibleOnAnyMonitor(const RECT& rectWndIn)
 	};
 
 	// callback func to check for intersection with each existing monitor
-	auto callback = []([[maybe_unused]] HMONITOR hMon, [[maybe_unused]] HDC hdc, LPRECT lprcMon, LPARAM lpInOut) -> BOOL LAMBDA_STDCALL
+	auto callback = []([[maybe_unused]] HMONITOR hMon, [[maybe_unused]] HDC hdc, LPRECT lprcMon, LPARAM lpInOut) WINAPI_LAMBDA_RETURN(BOOL)
 	{
 		Param4InOut* paramInOut = reinterpret_cast<Param4InOut*>(lpInOut);
 		RECT rectIntersection{};

PowerEditor/src/MISC/sha1/sha1.h

@@ -247,10 +247,10 @@ class CSHA1
 	// Member variables
 	UINT_32 m_state[5];
 	UINT_32 m_count[2];
-	UINT_32 m_reserved0[1]; // Memory alignment padding
+	[[maybe_unused]] UINT_32 m_reserved0[1]; // Memory alignment padding
 	UINT_8 m_buffer[64];
 	UINT_8 m_digest[20];
-	UINT_32 m_reserved1[3]; // Memory alignment padding
+	[[maybe_unused]] UINT_32 m_reserved1[3]; // Memory alignment padding
 
 	UINT_8 m_workspace[64];
 	SHA1_WORKSPACE_BLOCK* m_block; // SHA1 pointer to the byte array above

PowerEditor/src/Notepad_plus.cpp

@@ -3097,7 +3097,7 @@ void Notepad_plus::setUniModeText()
 		int cmdID = em.getIndexFromEncoding(encoding);
 		if (cmdID == -1)
 		{
-			assert(!"Encoding problem. Encoding is not added in encoding_table?");
+			assert(false && "Encoding problem. Encoding is not added in encoding_table?");
 			return;
 		}
 		cmdID += IDM_FORMAT_ENCODE;

PowerEditor/src/NppLibsVersionH-generator.bat

@@ -1,5 +1,8 @@
 @echo off
 
+setlocal
+cd /d %~dp0
+
 rem If this batch file is called from the Microsoft Visual Studio pre-build event,
 rem then the current dir for this bat-file is set to Notepad++ solution/project dir.
 rem Because in this batch file we have to go two dir-levels higher (for finding the files

PowerEditor/src/Parameters.h

@@ -370,8 +370,8 @@ struct GlobalOverride final
 
 struct StyleArray
 {
-	const auto begin() const { return _styleVect.begin(); }
-	const auto end() const { return _styleVect.end(); }
+	auto begin() const { return _styleVect.begin(); }
+	auto end() const { return _styleVect.end(); }
 	auto begin() { return _styleVect.begin(); }
 	auto end() { return _styleVect.end(); }
 	void clear() { _styleVect.clear(); }
@@ -420,7 +420,9 @@ struct StyleArray
 struct LexerStyler : public StyleArray
 {
 public:
-	LexerStyler & operator=(const LexerStyler & ls)
+	LexerStyler() noexcept = default;
+	LexerStyler(const LexerStyler& ls) noexcept = default;
+	LexerStyler& operator=(const LexerStyler& ls)
 	{
 		if (this != &ls)
 		{

PowerEditor/src/ScintillaComponent/AutoCompletion.cpp

@@ -281,7 +281,7 @@ static bool isAllDigits(const std::string& str)
 {
 	static const auto& loc = std::locale::classic();
 	return std::all_of(str.begin(), str.end(),
-		[](unsigned char c) { return std::isdigit(c, loc); });
+		[](auto c) { return std::isdigit(c, loc); });
 }
 
 static void sortInsensitive(std::vector<std::string>& wordArray)
@@ -295,7 +295,7 @@ static void sortInsensitive(std::vector<std::string>& wordArray)
 			return lexicographical_compare(
 				a.begin(), a.end(),
 				b.begin(), b.end(),
-				[](const unsigned char &ch1, const unsigned char &ch2)
+				[](const auto &ch1, const auto &ch2)
 				{
 					return std::toupper(ch1, loc) < std::toupper(ch2, loc);
 				}

PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp

@@ -4871,7 +4871,7 @@ void FindReplaceDlg::doDialog(DIALOG_TYPE whichType, bool isRTL, bool toShow)
 		enableReplaceFunc(whichType == REPLACE_DLG);
 
 	::SetFocus(toShow ? ::GetDlgItem(_hSelf, IDFINDWHAT) : (*_ppEditView)->getHSelf());
-	display(toShow, true);
+	StaticDialog::displayEnhanced(toShow);
 }
 
 LRESULT CALLBACK FindReplaceDlg::FinderProc(
@@ -4942,9 +4942,9 @@ LRESULT CALLBACK FindReplaceDlg::FinderProc(
 	return ::DefSubclassProc(hWnd, uMsg, wParam, lParam);
 }
 
-bool isUnexpectedInvisible(wchar_t ch)
+static bool isUnexpectedInvisible(wchar_t ch)
 {
-	if (ch >= 0x0000 && ch <= 0x001F) // includ EOL
+	if (ch <= 0x001F) // includ EOL
 	{
 		return (ch != L'\t'); // Tab is not considered as unexpected "invisible" characters 
 	}
@@ -4986,7 +4986,7 @@ bool isUnexpectedInvisible(wchar_t ch)
 	}
 }
 
-bool containsInvisibleChar(const std::wstring& text)
+static bool containsInvisibleChar(const std::wstring& text)
 {
 	for (wchar_t ch : text)
 	{

PowerEditor/src/ScintillaComponent/FunctionCallTip.cpp

@@ -55,8 +55,8 @@ static int testNameNoCase(const char* name1, const char* name2, int len = -1)
 
 	for (int i = 0; i < len; ++i)
 	{
-		const unsigned char char1 = name1[i];
-		const unsigned char char2 = name2[i];
+		const char char1 = name1[i];
+		const char char2 = name2[i];
 
 		if (char1 == '\0' || char2 == '\0') // null terminator check
 			return char1 - char2;