feat: 优化脚本控制台的使用；

Author: Wing-summer

.github/workflows/qt-build-test.yml

@@ -38,6 +38,18 @@ jobs:
       uses: github/codeql-action/init@v3
       with:
         languages: cpp
+        build-mode: manual
+        dependency-caching: true
+        config: |
+          paths-ignore:
+            - 3rdparty/angel-lsp
+            - 3rdparty/AngelScript
+            - 3rdparty/antlr4-cpp
+            - 3rdparty/cppdap
+            - 3rdparty/cpptrace
+            - 3rdparty/fmt
+            - 3rdparty/Qt-Advanced-Docking-System
+            - 3rdparty/qwindowkit
 
     - name: Install Qt
       # Installs the Qt SDK

3rdparty/AngelScript

@@ -17,7 +17,6 @@
 
 #include "QConsoleWidget.h"
 #include "QConsoleIODevice.h"
-#include "wingsyntaxhighlighter.h"
 
 #include <QAbstractItemView>
 #include <QApplication>
@@ -75,14 +74,15 @@ QIODevice *QConsoleWidget::device() const { return iodevice_; }
 
 QString QConsoleWidget::getCommandLine() {
     if (mode_ == Output)
-        return QString();
+        return {};
+
     // select text in edit zone (from the input pos to the end)
     QTextCursor textCursor = this->textCursor();
     textCursor.movePosition(QTextCursor::End);
     textCursor.setPosition(inpos_, QTextCursor::KeepAnchor);
     QString code = textCursor.selectedText();
     code.replace(QChar::ParagraphSeparator, QChar::LineFeed);
-    return code;
+    return code.trimmed();
 }
 
 void QConsoleWidget::paste() {
@@ -94,7 +94,9 @@ void QConsoleWidget::paste() {
     }
 }
 
-void QConsoleWidget::handleReturnKey() {
+void QConsoleWidget::handleReturnKey(Qt::KeyboardModifiers mod) {
+    Q_UNUSED(mod);
+
     QString code = getCommandLine();
 
     // start new block
@@ -117,7 +119,9 @@ void QConsoleWidget::handleReturnKey() {
     Q_EMIT consoleCommand(code);
 }
 
-void QConsoleWidget::handleTabKey() {
+void QConsoleWidget::handleTabKey(Qt::KeyboardModifiers mod) {
+    Q_UNUSED(mod);
+
     QTextCursor tc = this->textCursor();
     int anchor = tc.anchor();
     int position = tc.position();
@@ -251,7 +255,7 @@ void QConsoleWidget::keyPressEvent(QKeyEvent *e) {
 
     case Qt::Key_Tab:
         e->accept();
-        handleTabKey();
+        handleTabKey(e->modifiers());
         return;
 
     case Qt::Key_Home:
@@ -264,7 +268,7 @@ void QConsoleWidget::keyPressEvent(QKeyEvent *e) {
     case Qt::Key_Enter:
     case Qt::Key_Return:
         e->accept();
-        handleReturnKey();
+        handleReturnKey(e->modifiers());
         break;
 
     case Qt::Key_Escape:

3rdparty/QConsoleWidget/QConsoleWidget.cpp

@@ -92,8 +92,9 @@ class QConsoleWidget : public WingCodeEdit {
     bool canPaste() const;
     bool canCut() const;
 
-    virtual void handleReturnKey();
-    virtual void handleTabKey();
+    virtual void handleReturnKey(Qt::KeyboardModifiers mod);
+    virtual void handleTabKey(Qt::KeyboardModifiers mod);
+
     // reimp QPlainTextEdit functions
     void keyPressEvent(QKeyEvent *e) override;
     void contextMenuEvent(QContextMenuEvent *event) override;

3rdparty/QConsoleWidget/QConsoleWidget.h

@@ -8,7 +8,7 @@ set(CMAKE_AUTORCC ON)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(PROJECT_VERSION "2.2.3")
+set(PROJECT_VERSION "2.3.0-WIP")
 
 find_package(QT NAMES Qt6 REQUIRED COMPONENTS Widgets Network Concurrent
                                               PrintSupport Xml LinguistTools)
@@ -354,7 +354,9 @@ set(CLASS_SRC
     src/class/lsp.h
     src/class/resettabletimer.h
     src/class/resettabletimer.cpp
-    src/class/astype_evaluator.h)
+    src/class/astype_evaluator.h
+    src/class/angelscriptconsolevisitor.h
+    src/class/angelscriptconsolevisitor.cpp)
 
 set(INTERNAL_PLG_SRC src/class/wingangelapi.h src/class/wingangelapi.cpp
                      src/class/wingcstruct.h src/class/wingcstruct.cpp)