Allow toggling auto bracket insertion

Author: IgKh

core/katvan_aboutdialog.cpp

@@ -57,7 +57,7 @@ AboutDialog::AboutDialog(QWidget* parent)
         "<h3>Katvan</h3>"
         "<a href=\"%1\">%1</a>"
         "<p>A bare-bones editor for <i>Typst</i> files, with a bias for RTL</p>"
-        "<p>Version %2 (Qt %3; Typst %4), on %5</p>"
+        "<p>Version %2 (Qt %3; Typst %4) on %5</p>"
     )
     .arg(
         QStringLiteral("https://katvan.app"),

core/katvan_editor.cpp

@@ -703,7 +703,7 @@ void Editor::keyPressEvent(QKeyEvent* event)
             return;
         }
     }
-    if (OPENING_BRACKETS->contains(event->text())) {
+    if (OPENING_BRACKETS->contains(event->text()) && d_effectiveSettings.autoBrackets()) {
         QTextCursor cursor = textCursor();
         if (cursor.hasSelection() || cursor.atBlockEnd() || !cursor.block().text().at(cursor.positionInBlock()).isLetterOrNumber()) {
             auto closingBracket = d_codeModel->getMatchingCloseBracket(textCursor(), event->text().at(0));

core/katvan_editorsettings.cpp

@@ -116,6 +116,9 @@ void EditorSettings::parseModeLine(QString mode, EditorSettings::ModeSource sour
         else if (variable == QStringLiteral("show-control-chars")) {
             d_showControlChars = parseModeLineBool(rest);
         }
+        else if (variable == QStringLiteral("auto-brackets")) {
+            d_autoBrackets = parseModeLineBool(rest);
+        }
         else if (variable == QStringLiteral("backup-interval") && source == ModeSource::SETTINGS) {
             bool ok = false;
             int interval = rest.toInt(&ok);
@@ -184,6 +187,14 @@ QString EditorSettings::toModeLine() const
             result += QLatin1String("show-control-chars off; ");
         }
     }
+    if (d_autoBrackets) {
+        if (d_autoBrackets.value()) {
+            result += QLatin1String("auto-brackets on; ");
+        }
+        else {
+            result += QLatin1String("auto-brackets off; ");
+        }
+    }
     if (d_autoBackupInterval) {
         result += QLatin1String("backup-interval %1; ").arg(QString::number(d_autoBackupInterval.value()));
     }
@@ -242,6 +253,11 @@ bool EditorSettings::showControlChars() const
     return d_showControlChars.value_or(true);
 }
 
+bool EditorSettings::autoBrackets() const
+{
+    return d_autoBrackets.value_or(true);
+}
+
 int EditorSettings::autoBackupInterval() const
 {
     return d_autoBackupInterval.value_or(15);
@@ -273,6 +289,9 @@ void EditorSettings::mergeSettings(const EditorSettings& other)
     if (other.d_showControlChars) {
         d_showControlChars = other.d_showControlChars;
     }
+    if (other.d_autoBrackets) {
+        d_autoBrackets = other.d_autoBrackets;
+    }
 }
 
 }

core/katvan_editorsettings.h

@@ -76,6 +76,8 @@ class EditorSettings
     LineNumberStyle lineNumberStyle() const;
     bool showControlChars() const;
 
+    bool autoBrackets() const;
+
     int autoBackupInterval() const;
 
     void setFontFamily(const QString& fontFamily) { d_fontFamily = fontFamily; }
@@ -86,6 +88,7 @@ class EditorSettings
     void setTabWidth(int tabWidth) { d_tabWidth = tabWidth; }
     void setLineNumberStyle(LineNumberStyle style) { d_lineNumberStyle = style; }
     void setShowControlChars(bool show) { d_showControlChars = show; }
+    void setAutoBrackets(bool enable) { d_autoBrackets = enable; }
     void setAutoBackupInterval(int interval) { d_autoBackupInterval = interval; }
 
     bool hasFontFamily() const { return d_fontFamily.has_value(); }
@@ -96,6 +99,7 @@ class EditorSettings
     bool hasTabWidth() const { return d_tabWidth.has_value(); }
     bool hasLineNumberStyle() const { return d_lineNumberStyle.has_value(); }
     bool hasShowControlChars() const { return d_showControlChars.has_value(); }
+    bool hasAutoBrackets() const { return d_autoBrackets.has_value(); }
     bool hasAutoBackupInterval() const { return d_autoBackupInterval.has_value(); }
 
     void mergeSettings(const EditorSettings& other);
@@ -111,6 +115,7 @@ class EditorSettings
     std::optional<int> d_tabWidth;
     std::optional<LineNumberStyle> d_lineNumberStyle;
     std::optional<bool> d_showControlChars;
+    std::optional<bool> d_autoBrackets;
     std::optional<int> d_autoBackupInterval;
 };
 

shell/katvan_settingsdialog.cpp

@@ -124,6 +124,7 @@ EditorSettings EditorSettingsTab::settings() const
 
     settings.setIndentWidth(d_indentWidth->value());
     settings.setTabWidth(d_tabWidth->value());
+    settings.setAutoBrackets(d_autoBrackets->isChecked());
     settings.setAutoBackupInterval(d_backupInterval->value());
 
     return settings;
@@ -152,6 +153,7 @@ void EditorSettingsTab::setSettings(const EditorSettings& settings)
 
     d_indentWidth->setValue(settings.indentWidth());
     d_tabWidth->setValue(settings.tabWidth());
+    d_autoBrackets->setChecked(settings.autoBrackets());
     d_backupInterval->setValue(settings.autoBackupInterval());
 
     updateControlStates();
@@ -172,7 +174,7 @@ void EditorSettingsTab::setupUI()
     d_lineNumberStyle->addItem(tr("On Primary Side"), QVariant::fromValue(EditorSettings::LineNumberStyle::PRIMARY_ONLY));
     d_lineNumberStyle->addItem(tr("Don't Show"), QVariant::fromValue(EditorSettings::LineNumberStyle::NONE));
 
-    d_showControlChars = new QCheckBox(tr("Show Control Characters"));
+    d_showControlChars = new QCheckBox(tr("Show BiDi Control Characters"));
     if (QLibraryInfo::version() < QVersionNumber(6, 9)) {
         d_showControlChars->setEnabled(false);
         d_showControlChars->setToolTip(tr("Requires Qt version 6.9 or above"));
@@ -203,6 +205,8 @@ void EditorSettingsTab::setupUI()
     QLabel* tabWidthLabel = new QLabel(tr("Tab &Display Width:"));
     tabWidthLabel->setBuddy(d_tabWidth);
 
+    d_autoBrackets = new QCheckBox(tr("Automatically insert &closing brackets"));
+
     d_backupInterval = new QSpinBox();
     d_backupInterval->setSuffix(tr(" seconds"));
     d_backupInterval->setSpecialValueText(tr("Disabled"));
@@ -240,6 +244,10 @@ void EditorSettingsTab::setupUI()
     indentationLayout->addLayout(indentationTopLayout);
     indentationLayout->addLayout(indentationStyleLayout);
 
+    QGroupBox* behaviourGroup = new QGroupBox(tr("Behaviour"));
+    QVBoxLayout* behaviourLayout = new QVBoxLayout(behaviourGroup);
+    behaviourLayout->addWidget(d_autoBrackets);
+
     QGroupBox* autoBackupGroup = new QGroupBox(tr("Automatically Backup Unsaved Changes"));
 
     QFormLayout* autoBackupLayout = new QFormLayout(autoBackupGroup);
@@ -248,6 +256,7 @@ void EditorSettingsTab::setupUI()
     QVBoxLayout* mainLayout = new QVBoxLayout(this);
     mainLayout->addWidget(appearanceGroup);
     mainLayout->addWidget(indentationGroup);
+    mainLayout->addWidget(behaviourGroup);
     mainLayout->addWidget(autoBackupGroup);
     mainLayout->addStretch(1);
 }

shell/katvan_settingsdialog.h

@@ -88,6 +88,7 @@ private slots:
     QRadioButton* d_indentWithTabs;
     QSpinBox* d_indentWidth;
     QSpinBox* d_tabWidth;
+    QCheckBox* d_autoBrackets;
     QSpinBox* d_backupInterval;
 };
 

tests/katvan_editorsettings.t.cpp

@@ -231,6 +231,16 @@ TEST(EditorSettingsTests, TabWidth) {
     EXPECT_THAT(s5.hasTabWidth(), ::testing::IsFalse());
 }
 
+TEST(EditorSettingsTests, AutoBrackets) {
+    EditorSettings s1 { "auto-brackets ON" };
+    EXPECT_THAT(s1.hasAutoBrackets(), ::testing::IsTrue());
+    EXPECT_THAT(s1.autoBrackets(), ::testing::IsTrue());
+    EXPECT_THAT(s1.toModeLine(), ::testing::Eq(QStringLiteral("auto-brackets on;")));
+
+    EditorSettings s2 { "replace-tabs" };
+    EXPECT_THAT(s2.hasAutoBrackets(), ::testing::IsFalse());
+}
+
 TEST(EditorSettingsTests, AutoBackupInterval) {
     EditorSettings s1 { "backup-interval 10", EditorSettings::ModeSource::SETTINGS };
     EXPECT_THAT(s1.hasAutoBackupInterval(), ::testing::IsTrue());