chore: merge from develope/main

.reuse/dep5

@@ -68,21 +68,11 @@ Files: src/plugin/*
 Copyright: UnionTech Software Technology Co., Ltd.
 License: GPL-3.0-or-later
 
-# commom
-Files: src/common/*
-Copyright: UnionTech Software Technology Co., Ltd.
-License: GPL-3.0-or-later
-
 # tool
 Files: src/tool/*
 Copyright: UnionTech Software Technology Co., Ltd.
 License: GPL-3.0-or-later
 
-# service
-Files: src/*.service
-Copyright: UnionTech Software Technology Co., Ltd.
-License: GPL-3.0-or-later
-
 # FlameGraph
 Files: 3rdparty/scripts/*
 Copyright: 2013 Brendan Gregg

3rdparty/unioncode-qscintilla214/scintilla/src/Editor.cpp

@@ -5,6 +5,7 @@
 // Copyright 1998-2011 by Neil Hodgson <[email protected]>
 // The License.txt file describes the conditions under which this software may be distributed.
 
+#include <bitset>
 #include <cstddef>
 #include <cstdlib>
 #include <cassert>
@@ -2403,7 +2404,7 @@ void Editor::NotifyPainted() {
 	NotifyParent(scn);
 }
 
-void Editor::NotifyIndicatorClick(bool click, Sci::Position position, int modifiers) {
+bool Editor::NotifyIndicatorClick(bool click, Sci::Position position, int modifiers) {
 	const int mask = pdoc->decorations->AllOnFor(position);
 	if ((click && mask) || pdoc->decorations->ClickNotified()) {
 		SCNotification scn = {};
@@ -2413,6 +2414,9 @@ void Editor::NotifyIndicatorClick(bool click, Sci::Position position, int modifi
 		scn.position = position;
 		NotifyParent(scn);
 	}
+
+    std::bitset<32> flags(static_cast<ulong>(mask));
+    return flags[INDIC_COMPOSITIONTHICK];
 }
 
 bool Editor::NotifyMarginClick(Point pt, int modifiers) {
@@ -4491,9 +4495,10 @@ void Editor::ButtonDownWithModifiers(Point pt, unsigned int curTime, int modifie
 	sel.SetMoveExtends(false);
 
 	if (NotifyMarginClick(pt, modifiers))
-		return;
+        return;
 
-	NotifyIndicatorClick(true, newPos.Position(), modifiers);
+    if (NotifyIndicatorClick(true, newPos.Position(), modifiers))
+       return;
 
 	const bool inSelMargin = PointInSelMargin(pt);
 	// In margin ctrl+(double)click should always select everything

3rdparty/unioncode-qscintilla214/scintilla/src/Editor.h

@@ -430,7 +430,7 @@ class Editor : public EditModel, public DocWatcher {
 	void NotifyHotSpotReleaseClick(Sci::Position position, int modifiers);
 	bool NotifyUpdateUI();
 	void NotifyPainted();
-	void NotifyIndicatorClick(bool click, Sci::Position position, int modifiers);
+    bool NotifyIndicatorClick(bool click, Sci::Position position, int modifiers);
 	bool NotifyMarginClick(Point pt, int modifiers);
 	bool NotifyMarginRightClick(Point pt, int modifiers);
 	void NotifyNeedShown(Sci::Position pos, Sci::Position len);

3rdparty/unioncode-qscintilla214/src/qsciscintilla.cpp

@@ -54,6 +54,8 @@ const char userSeparator = '\x04';
 // The default fold margin width.
 static const int defaultFoldMarginWidth = 14;
 
+static const int MinFontZoomSize = 5;
+
 // The default set of characters that make up a word.
 static const char *defaultWordChars = "_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
 
@@ -919,6 +921,11 @@ int QsciScintilla::blockIndent(int line)
             }
             else if (line == l)
                 ind += ind_width;
+            else {
+                const auto &lineText = text(l).trimmed();
+                if (lineText.size() > 1 && lineText.endsWith(":"))
+                    ind += ind_width;
+            }
 
             return ind;
         }
@@ -1725,10 +1732,15 @@ void QsciScintilla::zoomOut(int range)
     zoomTo(SendScintilla(SCI_GETZOOM) - range);
 }
 
-
 // Zoom out a single point.
 void QsciScintilla::zoomOut()
 {
+    int value = SendScintilla(SCI_GETZOOM);
+    auto font = lex ? lex->defaultFont() : this->font();
+    auto fontSize = font.pointSize() * (100 + 10 * value) / 100;
+    if (fontSize < MinFontZoomSize)
+        return;
+
     SendScintilla(SCI_ZOOMOUT);
 }
 

CMakeLists.txt

@@ -15,13 +15,11 @@ if (NOT VERSION)
 endif()
 
 message(STATUS "build version ${VERSION}")
+option(ENABLE_SANITIZE_CHECK "Enable Sanitize Check " OFF) 
 
 set(CMAKE_VERBOSE_MAKEFILE ON)
 
-if ((NOT ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "sw_64")
-        AND (NOT ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "loongarch64")
-        AND (NOT ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "mips64")
-        AND (CMAKE_BUILD_TYPE STREQUAL "Debug"))
+if (ENABLE_SANITIZE_CHECK AND (CMAKE_BUILD_TYPE STREQUAL "Debug"))
     message("debug type open sanitize check")
     set(CMAKE_CXX_FLAGS "-fsanitize=undefined,address,leak -fno-omit-frame-pointer")
     set(CMAKE_C_FLAGS "-fsanitize=undefined,address,leak -fno-omit-frame-pointer")
@@ -31,15 +29,6 @@ if ((NOT ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "sw_64")
 #    set(CMAKE_L_FLAGS "-fsanitize=thread")
 endif()
 
-# Setup install paths
-#   /usr/bin/dde-file-manager
-#       execute bin file
-#   /usr/lib/x86_64-linux-gnu/dde-file-manager
-#       dir plugins && dir tools abv thumbnail
-#   /usr/include/dde-file-manager
-#       public *.h && private dir *.h
-#   /usr/share/dde-file-manager
-#       subdir"database  mimetypeassociations  mimetypes  templates  translations"
 set(LIBRARY_INSTALL_PREFIX "/usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/${PROJECT_NAME}")
 
 #set(ARCHIVE_INSTALL_RPEFIX "") undefined the static lib archive
@@ -66,7 +55,6 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/build/)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/build/)
 link_directories(${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
 
-# if no debug, can't out in code define key '__FUNCTION__' and so on
 add_definitions(-DQT_MESSAGELOGCONTEXT)
 
 # Setup the environment
@@ -105,17 +93,12 @@ foreach(QtModule ${QtFindModules})
     message("QtModule found ${QtModule} OK!")
 endforeach()
 
-# Use PkgConfig modules
-# You can setting mini version for "glib-2.0>=2.10 gtk+-2.0" in the list
 set(PkgConfigFindModules)
 include(FindPkgConfig)
 foreach(PkgConfigModule ${PkgConfigFindModules})
     pkg_check_modules(PkgUseModuleVal REQUIRED ${PkgConfigModule})
-    #can use target_link_libraries(xxx ${PkgUseModule})
     list(APPEND PkgUseModules ${PkgUseModuleVal_LDFLAGS})
     include_directories(${PkgUseModuleVal_INCLUDE_DIRS})
-    #    link_libraries(${PkgUseModuleVal_LIBRARIES})
-    #    link_directories(${PkgUseModuleVal_LINK_LIBRARIES})
 endforeach(PkgConfigModule)
 
 include_directories(${PROJECT_SOURCE_DIR}/src)