Fixed code quality issues

Author: Kaspar-Metsa

scripts/build-wasm.sh

@@ -5,8 +5,8 @@ set -e
 # IMPORTANT: Change this path to match your emsdk installation location
 source "$HOME/dev/emsdk/emsdk_env.sh"
 
-# Paths - automatically detect script location
-MMAPPER_SRC="$(cd "$(dirname "$0")" && pwd)"
+# Paths - automatically detect project root (parent of scripts directory)
+MMAPPER_SRC="$(cd "$(dirname "$0")/.." && pwd)"
 QT_WASM="$MMAPPER_SRC/6.5.3/wasm_multithread"
 QT_HOST="$MMAPPER_SRC/6.5.3/macos"
 

src/configuration/HotkeyManager.cpp

@@ -253,6 +253,7 @@ QString HotkeyManager::normalizeKeyString(const QString &keyString)
     QStringList parts = keyString.split('+', Qt::SkipEmptyParts);
 
     if (parts.isEmpty()) {
+        qWarning() << "HotkeyManager: empty or invalid key string:" << keyString;
         return QString();
     }
 
@@ -279,13 +280,16 @@ QString HotkeyManager::normalizeKeyString(const QString &keyString)
             hasAlt = true;
         } else if (upperPart == "META" || upperPart == "CMD" || upperPart == "COMMAND") {
             hasMeta = true;
+        } else {
+            qWarning() << "HotkeyManager: unrecognized modifier:" << part << "in:" << keyString;
         }
     }
 
     // Validate the base key
     QString upperBaseKey = baseKey.toUpper();
     if (!isValidBaseKey(upperBaseKey)) {
-        return QString(); // Invalid key name
+        qWarning() << "HotkeyManager: invalid base key:" << baseKey << "in:" << keyString;
+        return QString();
     }
 
     // Add modifiers in canonical order

src/preferences/clientpage.cpp

@@ -128,9 +128,8 @@ ClientPage::ClientPage(QWidget *parent)
     });
 
     connect(ui->commandSeparatorLineEdit, &QLineEdit::textChanged, this, [](const QString &text) {
-        if (!text.isEmpty()) {
-            setConfig().integratedClient.commandSeparator = text;
-        }
+        // Keep config in sync with the UI, including when the separator is cleared
+        setConfig().integratedClient.commandSeparator = text;
     });
 
     ui->commandSeparatorLineEdit->setValidator(new CustomSeparatorValidator(this));

tests/TestHotkeyManager.cpp

@@ -5,6 +5,8 @@
 
 #include "../src/configuration/HotkeyManager.h"
 
+#include <QSettings>
+#include <QStringList>
 #include <QtTest/QtTest>
 
 TestHotkeyManager::TestHotkeyManager() = default;
@@ -372,4 +374,111 @@ void TestHotkeyManager::invalidKeyValidationTest()
     QVERIFY(manager.hasHotkey("HYPHEN"));
 }
 
+void TestHotkeyManager::duplicateKeyBehaviorTest()
+{
+    HotkeyManager manager;
+
+    // Test that duplicate keys in imported content use the last definition
+    QString contentWithDuplicates = "_hotkey F1 first\n"
+                                    "_hotkey F2 middle\n"
+                                    "_hotkey F1 second\n";
+
+    manager.importFromCliFormat(contentWithDuplicates);
+
+    // getCommand should return the last definition
+    QCOMPARE(manager.getCommand("F1"), QString("second"));
+    QCOMPARE(manager.getCommand("F2"), QString("middle"));
+
+    // Test that setHotkey replaces existing entry
+    manager.importFromCliFormat("_hotkey F1 original\n");
+    QCOMPARE(manager.getCommand("F1"), QString("original"));
+    QCOMPARE(manager.getAllHotkeys().size(), 1);
+
+    manager.setHotkey("F1", "replaced");
+    QCOMPARE(manager.getCommand("F1"), QString("replaced"));
+    QCOMPARE(manager.getAllHotkeys().size(), 1); // Still 1, not 2
+}
+
+void TestHotkeyManager::commentPreservationTest()
+{
+    HotkeyManager manager;
+
+    // Test that comments and formatting survive import/export round trip
+    const QString cliFormat = "# Leading comment\n"
+                              "\n"
+                              "# Section header\n"
+                              "_hotkey F1 open\n"
+                              "\n"
+                              "# Another comment\n"
+                              "_hotkey F2 close\n";
+
+    manager.importFromCliFormat(cliFormat);
+    const QString exported = manager.exportToCliFormat();
+
+    // Verify comments are preserved in export
+    QVERIFY(exported.contains("# Leading comment"));
+    QVERIFY(exported.contains("# Section header"));
+    QVERIFY(exported.contains("# Another comment"));
+
+    // Verify hotkeys are still correct
+    QVERIFY(exported.contains("_hotkey F1 open"));
+    QVERIFY(exported.contains("_hotkey F2 close"));
+
+    // Verify order is preserved (comments before their hotkeys)
+    int posLeading = exported.indexOf("# Leading comment");
+    int posSection = exported.indexOf("# Section header");
+    int posF1 = exported.indexOf("_hotkey F1");
+    int posAnother = exported.indexOf("# Another comment");
+    int posF2 = exported.indexOf("_hotkey F2");
+
+    QVERIFY(posLeading < posSection);
+    QVERIFY(posSection < posF1);
+    QVERIFY(posF1 < posAnother);
+    QVERIFY(posAnother < posF2);
+}
+
+void TestHotkeyManager::settingsPersistenceTest()
+{
+    // Use a unique organization/app name to avoid conflicts with real settings
+    const QString testOrg = "MMapperTest";
+    const QString testApp = "HotkeyManagerTest";
+
+    // Clean up any existing test settings
+    QSettings cleanupSettings(testOrg, testApp);
+    cleanupSettings.clear();
+    cleanupSettings.sync();
+
+    {
+        // Create a manager and set some hotkeys
+        HotkeyManager manager;
+        manager.importFromCliFormat("# Test config\n"
+                                    "_hotkey F1 look\n"
+                                    "_hotkey CTRL+F2 attack\n");
+
+        QCOMPARE(manager.getCommand("F1"), QString("look"));
+        QCOMPARE(manager.getCommand("CTRL+F2"), QString("attack"));
+
+        // Save to settings
+        manager.saveToSettings();
+    }
+
+    {
+        // Create a new manager and load from settings
+        HotkeyManager manager;
+        manager.loadFromSettings();
+
+        // Verify hotkeys were persisted
+        QCOMPARE(manager.getCommand("F1"), QString("look"));
+        QCOMPARE(manager.getCommand("CTRL+F2"), QString("attack"));
+
+        // Verify comment was preserved
+        QString exported = manager.exportToCliFormat();
+        QVERIFY(exported.contains("# Test config"));
+    }
+
+    // Clean up test settings
+    cleanupSettings.clear();
+    cleanupSettings.sync();
+}
+
 QTEST_MAIN(TestHotkeyManager)

tests/TestHotkeyManager.h

@@ -24,4 +24,7 @@ private Q_SLOTS:
     void removeHotkeyTest();
     void hasHotkeyTest();
     void invalidKeyValidationTest();
+    void duplicateKeyBehaviorTest();
+    void commentPreservationTest();
+    void settingsPersistenceTest();
 };