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

Author: Wing-summer

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

@@ -6,10 +6,10 @@ permissions:
 on:
   push:
     branches:
-    - main
+      - main
   pull_request:
     branches:
-    - main
+      - main
 
 env:
   BUILD_TYPE: Release
@@ -29,40 +29,82 @@ jobs:
             arch: win64_msvc2022_64
 
     steps:
-    - uses: actions/checkout@v3
-      with:
-        submodules: 'recursive'
-        token: ${{ secrets.CONTRIBUTORS_TOKEN }}
+      - uses: actions/checkout@v3
+        with:
+          submodules: 'recursive'
+          token: ${{ secrets.CONTRIBUTORS_TOKEN }}
 
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
-      with:
-        languages: cpp
+      - name: Initialize CodeQL (only on Linux)
+        if: ${{ matrix.os == 'ubuntu-latest' }}
+        uses: github/codeql-action/init@v3
+        with:
+          languages: cpp
 
-    - name: Install Qt
-      # Installs the Qt SDK
-      uses: jurplel/install-qt-action@v4
-      with:
-        version: 6.8.1
-        host: ${{ matrix.os == 'windows-latest' && 'windows' || 'linux' }}
-        target: 'desktop'
-        arch: ${{ matrix.arch }}
-        modules: ${{ matrix.os == 'windows-latest' && 'qtactiveqt' || '' }}
-        cache: true
+      - name: Install Qt
+        # Installs the Qt SDK
+        uses: jurplel/install-qt-action@v4
+        with:
+          version: 6.8.1
+          host: ${{ matrix.os == 'windows-latest' && 'windows' || 'linux' }}
+          target: 'desktop'
+          arch: ${{ matrix.arch }}
+          modules: ${{ matrix.os == 'windows-latest' && 'qtactiveqt' || '' }}
+          cache: true
 
-    - name: Configure CMake
-      # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
-      # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
-      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+      - name: Configure CMake
+        # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
+        # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
+        run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
 
-    - name: Build
-      # Build your program with the given configuration
-      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
+      - name: Build
+        # Build your program with the given configuration
+        run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
 
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      - uses: actions/upload-artifact@v4
+        with:
+          name: WingHexExplorer2-${{ matrix.os == 'windows-latest' && 'windows' || 'linux' }}-build-cache
+          path: ${{github.workspace}}/build
 
-    - uses: actions/upload-artifact@v4
-      with:
-        name: WingHexExplorer2-${{ matrix.os == 'windows-latest' && 'windows' || 'linux' }}-${{ matrix.qt_version }}-build-cache
-        path: ${{github.workspace}}/build
+      - name: Perform CodeQL analysis (produce SARIF)
+        if: ${{ matrix.os == 'ubuntu-latest' }}
+        uses: github/codeql-action/analyze@v3
+        with:
+          output: codeql-results
+          upload: false
+
+      - name: Filter SARIF (exclude third-party dirs)
+        if: ${{ matrix.os == 'ubuntu-latest' }}
+        uses: advanced-security/filter-sarif@v1
+        with:
+          patterns: |
+            +**/*.c
+            +**/*.cpp
+            +**/*.cc
+            +**/*.cxx
+            +**/*.h
+            +**/*.hpp
+            +**/*.hh
+            -3rdparty/angel-lsp/**
+            -3rdparty/AngelScript/**
+            -3rdparty/antlr4-cpp/**
+            -3rdparty/cppdap/**
+            -3rdparty/cpptrace/**
+            -3rdparty/fmt/**
+            -3rdparty/Qt-Advanced-Docking-System/**
+            -3rdparty/qwindowkit/**
+          input: codeql-results/cpp.sarif
+          output: codeql-results/cpp.sarif
+
+      - name: Upload filtered SARIF to GitHub Code Scanning
+        if: ${{ matrix.os == 'ubuntu-latest' }}
+        uses: github/codeql-action/upload-sarif@v3
+        with:
+          sarif_file: codeql-results/cpp.sarif
+
+      - name: Attach CodeQL SARIF artifact
+        if: ${{ matrix.os == 'ubuntu-latest' }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: codeql-results
+          path: codeql-results
+          retention-days: 1

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)