Revert "merge dev to master"

3rdparty/cppdap/src/network.cpp

@@ -34,10 +34,8 @@ class Impl : public dap::net::Server {
              const OnError& onError) override {
     std::unique_lock<std::mutex> lock(mutex);
     stopWithLock();
-    // modified by ZhangTingAn:‘localhost‘ -> ‘0.0.0.0‘  receive network connections from other machines
-    // used to remote debug
     socket = std::unique_ptr<dap::Socket>(
-        new dap::Socket("0.0.0.0", std::to_string(port).c_str()));
+        new dap::Socket("localhost", std::to_string(port).c_str()));
 
     if (!socket->isOpen()) {
       onError("Failed to open socket");

3rdparty/unioncode-jsonrpccpp/libjson-rpc-cpp/cmake/FindThreads.cmake

@@ -60,8 +60,7 @@ else()
         CHECK_LIBRARY_EXISTS(pthreads pthread_create "" CMAKE_HAVE_PTHREADS_CREATE)
         if(CMAKE_HAVE_PTHREADS_CREATE)
             #          set(CMAKE_THREAD_LIBS_INIT "-lpthreads") // mozart comment.
-            if (NOT ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "mips64"
-                    AND NOT ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "sw_64")
+            if (NOT ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "mips64")
                 set(CMAKE_THREAD_LIBS_INIT "-lpthreads")
             endif()
             set(CMAKE_HAVE_THREADS_LIBRARY 1)

3rdparty/unioncode-qscintilla214/CMakeLists.txt

@@ -45,4 +45,4 @@ target_link_libraries(
     ${DtkWidget_LIBRARIES}
 )
 
-install(TARGETS ${PROJECT_NAME} ARCHIVE DESTINATION ${LIBRARY_INSTALL_PREFIX})
+install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${LIBRARY_INSTALL_PREFIX})

3rdparty/unioncode-qscintilla214/src/Qsci/qsciscintilla.h

@@ -48,35 +48,6 @@ class QsciStyle;
 class QsciStyledText;
 class QsciListBoxQt;
 
-struct FindState
-{
-    enum Status
-    {
-        Finding,
-        FindingInSelection,
-        Idle
-    };
-
-    FindState() : status(Idle) {}
-
-    Status status;
-    QString expr;
-    bool wrap;
-    bool forward;
-    int flags;
-    long startpos, startpos_orig;
-    long endpos, endpos_orig;
-    int linenum;
-    int targstart;
-    int targend;
-    bool show;
-};
-
-enum FindNextType {
-    FINDNEXTTYPE_FINDNEXT = 0,
-    FINDNEXTTYPE_REPLACENEXT,
-    FINDNEXTTYPE_FINDNEXTFORREPLACE
-};
 
 //! \brief The QsciScintilla class implements a higher level, more Qt-like,
 //! API to the Scintilla editor widget.
@@ -832,7 +803,7 @@ class QSCINTILLA_EXPORT QsciScintilla : public QsciScintillaBase
     //!
     //! \sa cancelFind(), findFirstInSelection(), findNext(), replace()
     virtual bool findFirst(const QString &expr, bool re, bool cs, bool wo,
-            bool wrap, bool forward = true, FindNextType findNextType = FINDNEXTTYPE_FINDNEXT, int line = -1, int index = -1,
+            bool wrap, bool forward = true, int line = -1, int index = -1,
             bool show = true, bool posix = false, bool cxx11 = false);
 
     //! Find the first occurrence of the string \a expr in the current
@@ -2103,8 +2074,6 @@ public slots:
     //! \sa zoomIn(), zoomOut()
     virtual void zoomTo(int size);
 
-    FindState& getLastFindState();
-
 signals:
     //! This signal is emitted whenever the cursor position changes.  \a line
     //! contains the line number and \a index contains the character index
@@ -2206,7 +2175,7 @@ private slots:
     void handleIndicatorRelease(int pos, int modifiers);
     void handleMarginClick(int pos, int margin, int modifiers);
     void handleMarginRightClick(int pos, int margin, int modifiers);
-    void handleModified(int pos, int mtype, const QString &text, int len,
+    void handleModified(int pos, int mtype, const char *text, int len,
             int added, int line, int foldNow, int foldPrev, int token,
             int annotationLinesAdded);
     void handlePropertyChange(const char *prop, const char *val);
@@ -2241,7 +2210,6 @@ private slots:
     int blockIndent(int line);
     IndentState getIndentState(int line);
     bool rangeIsWhitespace(long spos, long epos);
-    bool blockWordContains(long spos, long epos, const char block);
     int findStyledWord(const char *text, int style, const char *words);
 
     void checkMarker(int &markerNumber);
@@ -2280,6 +2248,27 @@ private slots:
     QByteArray styleText(const QList<QsciStyledText> &styled_text,
             char **styles, int style_offset = 0);
 
+    struct FindState
+    {
+        enum Status
+        {
+            Finding,
+            FindingInSelection,
+            Idle
+        };
+
+        FindState() : status(Idle) {}
+
+        Status status;
+        QString expr;
+        bool wrap;
+        bool forward;
+        int flags;
+        long startpos, startpos_orig;
+        long endpos, endpos_orig;
+        bool show;
+    };
+
     FindState findState;
 
     unsigned allocatedMarkers;

3rdparty/unioncode-qscintilla214/src/Qsci/qsciscintillabase.h

@@ -3694,7 +3694,7 @@ class QSCINTILLA_EXPORT QsciScintillaBase : public QAbstractScrollArea
     void SCN_MARGINRIGHTCLICK(int position, int modifiers, int margin);
 
     //!
-    void SCN_MODIFIED(int, int, QString, int, int, int, int, int, int, int);
+    void SCN_MODIFIED(int, int, const char *, int, int, int, int, int, int, int);
 
     //! This signal is emitted when the user attempts to modify read-only
     //! text.

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

@@ -313,12 +313,12 @@ QsciCommandSet::QsciCommandSet(QsciScintilla *qs) : qsci(qs)
             QT_TRANSLATE_NOOP("QsciCommand",
                     "Extend selection to end of next word")
         },
-        //{
-        //    QsciCommand::WordPartLeft,
-        //    Qt::Key_Slash | Qt::CTRL,
-        //    0,
-        //    QT_TRANSLATE_NOOP("QsciCommand", "Move left one word part")
-        //},
+        {
+            QsciCommand::WordPartLeft,
+            Qt::Key_Slash | Qt::CTRL,
+            0,
+            QT_TRANSLATE_NOOP("QsciCommand", "Move left one word part")
+        },
         {
             QsciCommand::WordPartLeftExtend,
             Qt::Key_Slash | Qt::CTRL | Qt::SHIFT,

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

@@ -40,7 +40,7 @@
 #include "Qsci/qscilexer.h"
 #include "Qsci/qscistyle.h"
 #include "Qsci/qscistyledtext.h"
-#include "BoostRegexSearch.h"
+
 
 // Make sure these match the values in Scintilla.h.  We don't #include that
 // file because it just causes more clashes.
@@ -74,8 +74,8 @@ QsciScintilla::QsciScintilla(QWidget *parent)
     connect(this,SIGNAL(SCN_MODIFYATTEMPTRO()),
              SIGNAL(modificationAttempted()));
 
-    connect(this,SIGNAL(SCN_MODIFIED(int,int,const QString &,int,int,int,int,int,int,int)),
-             SLOT(handleModified(int,int,const QString &,int,int,int,int,int,int,int)));
+    connect(this,SIGNAL(SCN_MODIFIED(int,int,const char *,int,int,int,int,int,int,int)),
+             SLOT(handleModified(int,int,const char *,int,int,int,int,int,int,int)));
     connect(this,SIGNAL(SCN_CALLTIPCLICK(int)),
              SLOT(handleCallTipClick(int)));
     connect(this,SIGNAL(SCN_CHARADDED(int)),
@@ -837,16 +837,9 @@ void QsciScintilla::autoIndentation(char ch, long pos)
         // if we have inserted a new line above by pressing return at the start
         // of this line - in other words, if the previous line is empty.
         long prev_line_length = SendScintilla(SCI_GETLINEENDPOSITION, curr_line - 1) - SendScintilla(SCI_POSITIONFROMLINE, curr_line - 1);
-        if (prev_line_length == 0)
-            return;
-
-        if (start_single && blockWordContains(curr_line_start, SendScintilla(SCI_GETLINEENDPOSITION, curr_line), block_start[0]))
-            return autoIndentation(block_start[0], pos);
-
-        if (end_single && blockWordContains(curr_line_start, SendScintilla(SCI_GETLINEENDPOSITION, curr_line), block_end[0]))
-            return autoIndentation(block_end[0], pos);
 
-        autoIndentLine(pos, curr_line, blockIndent(curr_line - 1));
+        if (prev_line_length != 0)
+            autoIndentLine(pos, curr_line, blockIndent(curr_line - 1));
     }
 }
 
@@ -945,23 +938,6 @@ bool QsciScintilla::rangeIsWhitespace(long spos, long epos)
     return true;
 }
 
-bool QsciScintilla::blockWordContains(long spos, long epos, const char block)
-{
-    while (spos < epos) {
-        char ch = SendScintilla(SCI_GETCHARAT, spos);
-        if (ch == ' ' || ch == '\t') {
-            ++spos;
-            continue;
-        } else if (ch != block) {
-            return false;
-        }
-
-        return true;
-    }
-
-    return false;
-}
-
 
 // Returns the indentation state of a line.
 QsciScintilla::IndentState QsciScintilla::getIndentState(int line)
@@ -1679,7 +1655,7 @@ void QsciScintilla::setContractedFolds(const QList<int> &folds)
 
 
 // Handle the SCN_MODIFIED notification.
-void QsciScintilla::handleModified(int pos, int mtype, const QString &text,
+void QsciScintilla::handleModified(int pos, int mtype, const char *text,
         int len, int added, int line, int foldNow, int foldPrev, int token,
         int annotationLinesAdded)
 {
@@ -1744,15 +1720,10 @@ void QsciScintilla::zoomTo(int size)
     SendScintilla(SCI_SETZOOM, size);
 }
 
-FindState &QsciScintilla::getLastFindState()
-{
-    return findState;
-}
-
 
 // Find the first occurrence of a string.
 bool QsciScintilla::findFirst(const QString &expr, bool re, bool cs, bool wo,
-        bool wrap, bool forward, FindNextType findNextType, int line, int index, bool show, bool posix,
+        bool wrap, bool forward, int line, int index, bool show, bool posix,
         bool cxx11)
 {
     if (expr.isEmpty())
@@ -1773,21 +1744,6 @@ bool QsciScintilla::findFirst(const QString &expr, bool re, bool cs, bool wo,
         (posix ? SCFIND_POSIX : 0) |
         (cxx11 ? SCFIND_CXX11REGEX : 0);
 
-    switch (findNextType)
-    {
-    case FINDNEXTTYPE_FINDNEXT:
-        findState.flags |= SCFIND_REGEXP_EMPTYMATCH_ALL | SCFIND_REGEXP_SKIPCRLFASONE;
-        break;
-
-    case FINDNEXTTYPE_REPLACENEXT:
-        findState.flags |= SCFIND_REGEXP_EMPTYMATCH_NOTAFTERMATCH | SCFIND_REGEXP_SKIPCRLFASONE;
-        break;
-
-    case FINDNEXTTYPE_FINDNEXTFORREPLACE:
-        findState.flags |= SCFIND_REGEXP_EMPTYMATCH_ALL | SCFIND_REGEXP_EMPTYMATCH_ALLOWATSTART | SCFIND_REGEXP_SKIPCRLFASONE;
-        break;
-    }
-
     if (line < 0 || index < 0)
         findState.startpos = SendScintilla(SCI_GETCURRENTPOS);
     else
@@ -1887,7 +1843,7 @@ bool QsciScintilla::doFind()
         pos = simpleFind();
     }
 
-    if (pos < 0)
+    if (pos == -1)
     {
         // Restore the original selection.
         if (findState.status == FindState::FindingInSelection)
@@ -1910,16 +1866,11 @@ bool QsciScintilla::doFind()
 
         for (int i = startLine; i <= endLine; ++i)
             SendScintilla(SCI_ENSUREVISIBLEENFORCEPOLICY, i);
-    } else {
-        findState.linenum = -1;
     }
 
     // Now set the selection.
     SendScintilla(SCI_SETSEL, targstart, targend);
 
-    findState.targstart = targstart;
-    findState.targend = targend;
-
     // Finally adjust the start position so that we don't find the same one
     // again.
     if (findState.forward)
@@ -1934,9 +1885,7 @@ bool QsciScintilla::doFind()
 // Do a simple find between the start and end positions.
 int QsciScintilla::simpleFind()
 {
-    if (findState.forward && (findState.startpos >= findState.endpos))
-        return -1;
-    else if (!findState.forward && (findState.startpos == findState.endpos))
+    if (findState.startpos == findState.endpos)
         return -1;
 
     SendScintilla(SCI_SETTARGETSTART, findState.startpos);
@@ -1957,9 +1906,6 @@ void QsciScintilla::replace(const QString &replaceStr)
     long start = SendScintilla(SCI_GETSELECTIONSTART);
     long orig_len = SendScintilla(SCI_GETSELECTIONEND) - start;
 
-    findState.targstart = start;
-    findState.targend = start + orig_len;
-
     SendScintilla(SCI_TARGETFROMSELECTION);
 
     int cmd = (findState.flags & SCFIND_REGEXP) ? SCI_REPLACETARGETRE : SCI_REPLACETARGET;
@@ -2003,11 +1949,6 @@ void QsciScintilla::handleIndicatorClick(int pos, int modifiers)
     int line, index;
 
     lineIndexFromPosition(pos, &line, &index);
-    if (pos != oldPos)
-    {
-        oldPos = pos;
-        emit cursorPositionChanged(line, index);
-    }
 
     emit indicatorClicked(line, index, Qt::KeyboardModifiers(state));
 }

CMakeLists.txt

@@ -61,9 +61,9 @@ message(STATUS "TOOLS_INSTALL_PATH ${TOOLS_INSTALL_PATH}")
 message(STATUS "CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH}")
 
 # build runtime path
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/build/)
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/build/)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/build/)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/build/${CMAKE_BUILD_TYPE})
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/build/${CMAKE_BUILD_TYPE})
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/build/${CMAKE_BUILD_TYPE})
 link_directories(${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
 
 # if no debug, can't out in code define key '__FUNCTION__' and so on

README.md

@@ -151,7 +151,3 @@ deepin-unioncode 在 [GPL-3.0-or-later](LICENSE.txt)下发布。
 - AI 问答
 
   ![codegeex-answer](./docs/rc/codegeex-answer.png)
-
-访问统计:
-
-![](https://profile-counter.glitch.me/deepin-unioncode/count.svg)