feat: print 多参数和 promise 支持；修复终端主题设置；

Wing-summer · Wing-summer · commit 3f267665751c · 2025-05-04T11:53:30.000+08:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -210,7 +210,9 @@ set(CONTROL_SRC
     src/control/gotolinewidget.h
     src/control/gotolinewidget.cpp
     src/control/codeeditcontrolwidget.h
-    src/control/codeeditcontrolwidget.cpp)
+    src/control/codeeditcontrolwidget.cpp
+    src/control/scrollablelabel.h
+    src/control/scrollablelabel.cpp)
 
 set(CLASS_SRC
     src/class/logger.cpp
@@ -356,7 +358,8 @@ set(SCRIPT_ADDON_SRC
     src/scriptaddon/scriptjson.h
     src/scriptaddon/scriptjson.cpp
     src/scriptaddon/scriptfile.cpp
-    src/scriptaddon/scriptfile.h)
+    src/scriptaddon/scriptfile.h
+    src/scriptaddon/aspromise.hpp)
 
 # localization support
 file(
diff --git a/lang/zh_CN/winghex_zh_CN.ts b/lang/zh_CN/winghex_zh_CN.ts
diff --git a/lang/zh_TW/winghex_zh_TW.ts b/lang/zh_TW/winghex_zh_TW.ts
diff --git a/src/class/aspreprocesser.cpp b/src/class/aspreprocesser.cpp
@@ -18,6 +18,7 @@
 #include "aspreprocesser.h"
 #include "class/qascodeparser.h"
 #include "class/scriptmachine.h"
+#include "scriptaddon/aspromise.hpp"
 
 #include <QDir>
 #include <QFileInfo>
@@ -28,7 +29,8 @@ Q_GLOBAL_STATIC_WITH_ARGS(
     ({"__AS_ARRAY__", "__AS_ANY__", "__AS_GRID__", "__AS_HANDLE__",
       "__AS_MATH__", "__AS_WEAKREF__", "__AS_COROUTINE__", "__WING_FILE__",
       "__WING_STRING__", "__WING_COLOR__", "__WING_JSON__", "__WING_REGEX__",
-      "__WING_DICTIONARY__"}));
+      "__WING_DICTIONARY__", "__WING_PRINT_VAR__", "__WING_PRINT_LN__",
+      "__AS_PROMISE__"}));
 
 AsPreprocesser::AsPreprocesser(asIScriptEngine *engine) : engine(engine) {
     Q_ASSERT(engine);
@@ -656,6 +658,12 @@ int AsPreprocesser::processScriptSection(const QByteArray &script,
         }
     }
 
+    // asPromise co_await keyword expansion
+    size_t len = modifiedScript.size();
+    auto data = AsGeneratePromiseEntrypoints(modifiedScript.data(), &len);
+    modifiedScript = QByteArray(data, len);
+    asFreeMem(data);
+
     // Build the actual script
     engine->SetEngineProperty(asEP_COPY_SCRIPT_SECTIONS, true);
 
diff --git a/src/class/scriptmachine.cpp b/src/class/scriptmachine.cpp
@@ -36,6 +36,7 @@
 #include "class/qascodeparser.h"
 #include "class/settingmanager.h"
 #include "define.h"
+#include "scriptaddon/aspromise.hpp"
 #include "scriptaddon/scriptcolor.h"
 #include "scriptaddon/scriptfile.h"
 #include "scriptaddon/scriptjson.h"
@@ -142,6 +143,12 @@ bool ScriptMachine::isRunning(ConsoleMode mode) const {
     return _ctx.value(mode) != nullptr;
 }
 
+#define INS_1 "const ?&in = null"
+#define INS_2 INS_1 ", " INS_1
+#define INS_4 INS_2 ", " INS_2
+#define INS_8 INS_4 ", " INS_4
+#define INS_16 INS_8 ", " INS_8
+
 bool ScriptMachine::configureEngine() {
     if (_engine == nullptr) {
         return false;
@@ -211,9 +218,17 @@ bool ScriptMachine::configureEngine() {
         q_check_ptr(_engine->GetTypeInfoByName("color"));
 
     // Register a couple of extra functions for the scripts
-    r = _engine->RegisterGlobalFunction("void print(? &in obj)",
-                                        asMETHOD(ScriptMachine, print),
-                                        asCALL_THISCALL_ASGLOBAL, this);
+    r = _engine->RegisterGlobalFunction(
+        "void print(const ? &in obj, const ? &in = null," INS_16 ")",
+        asFUNCTION(print), asCALL_GENERIC);
+    Q_ASSERT(r >= 0);
+    if (r < 0) {
+        return false;
+    }
+
+    r = _engine->RegisterGlobalFunction(
+        "void println(const ? &in obj, const ? &in = null," INS_16 ")",
+        asFUNCTION(println), asCALL_GENERIC);
     Q_ASSERT(r >= 0);
     if (r < 0) {
         return false;
@@ -341,18 +356,56 @@ void ScriptMachine::exceptionCallback(asIScriptContext *context) {
     }
 }
 
-void ScriptMachine::print(void *ref, int typeId) {
+void ScriptMachine::print(asIScriptGeneric *args) {
     auto context = asGetActiveContext();
     if (context) {
         ConsoleMode mode = ConsoleMode(reinterpret_cast<asPWORD>(
             context->GetUserData(AsUserDataType::UserData_ContextMode)));
 
+        auto &m = ScriptMachine::instance();
+
         MessageInfo info;
         info.mode = mode;
         info.type = MessageType::Print;
-        info.message = _debugger->toString(ref, typeId, _engine);
 
-        outputMessage(info);
+        for (int i = 0; i < args->GetArgCount(); ++i) {
+            void *ref = args->GetArgAddress(i);
+            int typeId = args->GetArgTypeId(i);
+
+            if (typeId) {
+                info.message.append(
+                    m.debugger()->toString(ref, typeId, m.engine()));
+            }
+        }
+
+        m.outputMessage(info);
+    }
+}
+
+void ScriptMachine::println(asIScriptGeneric *args) {
+    auto context = asGetActiveContext();
+    if (context) {
+        ConsoleMode mode = ConsoleMode(reinterpret_cast<asPWORD>(
+            context->GetUserData(AsUserDataType::UserData_ContextMode)));
+
+        auto &m = ScriptMachine::instance();
+
+        MessageInfo info;
+        info.mode = mode;
+        info.type = MessageType::Print;
+
+        for (int i = 0; i < args->GetArgCount(); ++i) {
+            void *ref = args->GetArgAddress(i);
+            int typeId = args->GetArgTypeId(i);
+
+            if (typeId) {
+                info.message
+                    .append(m.debugger()->toString(ref, typeId, m.engine()))
+                    .append('\n');
+            }
+        }
+
+        m.outputMessage(info);
     }
 }
 
@@ -1963,6 +2016,7 @@ void ScriptMachine::registerEngineAddon(asIScriptEngine *engine) {
     RegisterScriptFile(engine);
     registerExceptionRoutines(engine);
     registerEngineAssert(engine);
+    AsDirectPromise::Register(engine);
 }
 
 void ScriptMachine::registerEngineAssert(asIScriptEngine *engine) {
diff --git a/src/class/scriptmachine.h b/src/class/scriptmachine.h
@@ -160,7 +160,9 @@ public slots:
     QString getCallStack(asIScriptContext *context);
 
 private:
-    void print(void *ref, int typeId);
+    static void print(asIScriptGeneric *args);
+    static void println(asIScriptGeneric *args);
+
     QString getInput();
 
     bool isType(asITypeInfo *tinfo, RegisteredType type);
diff --git a/src/control/scriptingconsole.cpp b/src/control/scriptingconsole.cpp
@@ -225,7 +225,7 @@ void ScriptingConsole::applyScriptSettings() {
     auto dfont = QFont(set.consoleFontFamily());
     dfont.setPointSize(set.consoleFontSize());
 
-    auto thname = set.editorTheme();
+    auto thname = set.consoleTheme();
     if (thname.isEmpty()) {
         switch (SkinManager::instance().currentTheme()) {
         case SkinManager::Theme::Dark:
diff --git a/src/control/scriptingconsolebase.cpp b/src/control/scriptingconsolebase.cpp
@@ -1,3 +1,20 @@
+/*==============================================================================
+** Copyright (C) 2024-2027 WingSummer
+**
+** This program is free software: you can redistribute it and/or modify it under
+** the terms of the GNU Affero General Public License as published by the Free
+** Software Foundation, version 3.
+**
+** This program is distributed in the hope that it will be useful, but WITHOUT
+** ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+** FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
+** details.
+**
+** You should have received a copy of the GNU Affero General Public License
+** along with this program. If not, see <https://www.gnu.org/licenses/>.
+** =============================================================================
+*/
+
 #include "scriptingconsolebase.h"
 #include "class/wingconsolehighligher.h"
 #include "wingsyntaxhighlighter.h"
diff --git a/src/control/scriptingconsolebase.h b/src/control/scriptingconsolebase.h
@@ -1,3 +1,20 @@
+/*==============================================================================
+** Copyright (C) 2024-2027 WingSummer
+**
+** This program is free software: you can redistribute it and/or modify it under
+** the terms of the GNU Affero General Public License as published by the Free
+** Software Foundation, version 3.
+**
+** This program is distributed in the hope that it will be useful, but WITHOUT
+** ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+** FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
+** details.
+**
+** You should have received a copy of the GNU Affero General Public License
+** along with this program. If not, see <https://www.gnu.org/licenses/>.
+** =============================================================================
+*/
+
 #ifndef SCRIPTINGCONSOLEBASE_H
 #define SCRIPTINGCONSOLEBASE_H
 
diff --git a/src/control/scrollablelabel.cpp b/src/control/scrollablelabel.cpp
@@ -0,0 +1,84 @@
+/*==============================================================================
+** Copyright (C) 2024-2027 WingSummer
+**
+** This program is free software: you can redistribute it and/or modify it under
+** the terms of the GNU Affero General Public License as published by the Free
+** Software Foundation, version 3.
+**
+** This program is distributed in the hope that it will be useful, but WITHOUT
+** ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+** FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
+** details.
+**
+** You should have received a copy of the GNU Affero General Public License
+** along with this program. If not, see <https://www.gnu.org/licenses/>.
+** =============================================================================
+*/
+
+#include "scrollablelabel.h"
+
+#include <QPainter>
+#include <QScrollBar>
+#include <QWheelEvent>
+
+ScrollableLabel::ScrollableLabel(QWidget *parent) : QScrollArea(parent) {
+    setupUI();
+}
+
+void ScrollableLabel::setText(const QString &text) {
+    label.setText(text);
+    updateLabelSize();
+}
+
+QSize ScrollableLabel::sizeHint() const { return label.sizeHint(); }
+
+QSize ScrollableLabel::minimumSizeHint() const {
+    return label.minimumSizeHint();
+}
+
+void ScrollableLabel::wheelEvent(QWheelEvent *event) {
+    if (shouldScroll()) {
+        QPoint delta = event->angleDelta();
+        if (!delta.isNull()) {
+            horizontalScrollBar()->setValue(horizontalScrollBar()->value() -
+                                            delta.y());
+            event->accept();
+            return;
+        }
+    }
+    event->ignore();
+}
+
+void ScrollableLabel::resizeEvent(QResizeEvent *event) {
+    QScrollArea::resizeEvent(event);
+    updateLabelSize();
+}
+
+void ScrollableLabel::setupUI() {
+    setWidgetResizable(false);
+    setFrameShape(QFrame::NoFrame);
+    setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+
+    label.setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
+    label.setWordWrap(false);
+    label.setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+
+    setWidget(&label);
+}
+
+void ScrollableLabel::updateLabelSize() {
+    QFontMetrics fm(label.font());
+    const int textWidth = fm.horizontalAdvance(label.text());
+    const int textHeight = fm.height();
+
+    if (textWidth > width()) {
+        label.setFixedSize(textWidth, textHeight);
+    } else {
+        label.setFixedSize(width(), textHeight);
+    }
+}
+
+bool ScrollableLabel::shouldScroll() const {
+    return label.width() > viewport()->width();
+}
diff --git a/src/control/scrollablelabel.h b/src/control/scrollablelabel.h
@@ -0,0 +1,52 @@
+/*==============================================================================
+** Copyright (C) 2024-2027 WingSummer
+**
+** This program is free software: you can redistribute it and/or modify it under
+** the terms of the GNU Affero General Public License as published by the Free
+** Software Foundation, version 3.
+**
+** This program is distributed in the hope that it will be useful, but WITHOUT
+** ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+** FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
+** details.
+**
+** You should have received a copy of the GNU Affero General Public License
+** along with this program. If not, see <https://www.gnu.org/licenses/>.
+** =============================================================================
+*/
+
+#ifndef SCROLLABLELABEL_H
+#define SCROLLABLELABEL_H
+
+#include <QLabel>
+#include <QScrollArea>
+#include <QTimer>
+
+class ScrollableLabel : public QScrollArea {
+    Q_OBJECT
+
+public:
+    explicit ScrollableLabel(QWidget *parent = nullptr);
+
+    void setText(const QString &text);
+
+    QSize sizeHint() const override;
+
+    QSize minimumSizeHint() const override;
+
+protected:
+    void wheelEvent(QWheelEvent *event) override;
+
+    void resizeEvent(QResizeEvent *event) override;
+
+private:
+    QLabel label;
+
+    void setupUI();
+
+    void updateLabelSize();
+
+    bool shouldScroll() const;
+};
+
+#endif // MARQUEELABEL_H
diff --git a/src/dialog/mainwindow.cpp b/src/dialog/mainwindow.cpp
@@ -131,7 +131,7 @@ MainWindow::MainWindow(SplashDialog *splash) : FramelessMainWindow() {
         m_status->addWidget(l);
         m_status->addWidget(m_lblsellen);
 
-        _status = new QLabel(m_status);
+        _status = new ScrollableLabel(m_status);
         m_status->addPermanentWidget(_status);
 
         auto separator = new QFrame(m_status);
diff --git a/src/dialog/mainwindow.h b/src/dialog/mainwindow.h
@@ -466,7 +466,7 @@ private slots:
 private:
     Ribbon *m_ribbon = nullptr;
     ads::CDockManager *m_dock = nullptr;
-    QLabel *_status = nullptr;
+    ScrollableLabel *_status = nullptr;
 
     QString m_encoding;
 
diff --git a/src/dialog/scriptingdialog.cpp b/src/dialog/scriptingdialog.cpp
@@ -38,6 +38,7 @@
 #include <QPainter>
 #include <QPicture>
 #include <QStatusBar>
+#include <QToolTip>
 
 constexpr auto EMPTY_FUNC = [] {};
 
@@ -71,7 +72,7 @@ ScriptingDialog::ScriptingDialog(QWidget *parent)
     layout->addWidget(m_dock, 1);
 
     m_status = new QStatusBar(this);
-    _status = new QLabel(this);
+    _status = new ScrollableLabel(this);
     m_status->addPermanentWidget(_status);
     layout->addWidget(m_status);
     buildUpContent(cw);
diff --git a/src/dialog/scriptingdialog.h b/src/dialog/scriptingdialog.h
diff --git a/src/scriptaddon/aspromise.hpp b/src/scriptaddon/aspromise.hpp
