Move context settings to page

settings/ContextSettings.cpp

@@ -21,7 +21,9 @@
 
 #include "ContextSettings.hpp"
 
+#include <QMessageBox>
 #include <coreplugin/dialogs/ioptionspage.h>
+#include <coreplugin/icore.h>
 #include <utils/layoutbuilder.h>
 
 #include "QodeAssistConstants.hpp"
@@ -40,12 +42,93 @@ ContextSettings::ContextSettings()
 
     setDisplayName(Tr::tr("Context"));
 
+    readFullFile.setSettingsKey(Constants::READ_FULL_FILE);
+    readFullFile.setLabelText(Tr::tr("Read Full File"));
+    readFullFile.setDefaultValue(false);
+
+    readStringsBeforeCursor.setSettingsKey(Constants::READ_STRINGS_BEFORE_CURSOR);
+    readStringsBeforeCursor.setLabelText(Tr::tr("Read Strings Before Cursor"));
+    readStringsBeforeCursor.setRange(0, 10000);
+    readStringsBeforeCursor.setDefaultValue(50);
+
+    readStringsAfterCursor.setSettingsKey(Constants::READ_STRINGS_AFTER_CURSOR);
+    readStringsAfterCursor.setLabelText(Tr::tr("Read Strings After Cursor"));
+    readStringsAfterCursor.setRange(0, 10000);
+    readStringsAfterCursor.setDefaultValue(30);
+
+    useFilePathInContext.setSettingsKey(Constants::USE_FILE_PATH_IN_CONTEXT);
+    useFilePathInContext.setDefaultValue(false);
+    useFilePathInContext.setLabelText(Tr::tr("Use File Path in Context"));
+
+    useSpecificInstructions.setSettingsKey(Constants::USE_SPECIFIC_INSTRUCTIONS);
+    useSpecificInstructions.setDefaultValue(false);
+    useSpecificInstructions.setLabelText(Tr::tr("Use Specific Instructions"));
+
+    specificInstractions.setSettingsKey(Constants::SPECIFIC_INSTRUCTIONS);
+    specificInstractions.setDisplayStyle(Utils::StringAspect::TextEditDisplay);
+    specificInstractions.setLabelText(
+        Tr::tr("Instructions: Please keep %1 for languge name, warning, it shouldn't too big"));
+    specificInstractions.setDefaultValue(
+        "You are an expert %1 code completion AI."
+        "CRITICAL: Please provide minimal the best possible code completion suggestions.\n");
+
+    resetToDefaults.m_buttonText = Tr::tr("Reset Page to Defaults");
+
+    readSettings();
+
+    readStringsAfterCursor.setEnabled(!readFullFile());
+    readStringsBeforeCursor.setEnabled(!readFullFile());
+    specificInstractions.setEnabled(useSpecificInstructions());
+
+    setupConnection();
+
     setLayouter([this]() {
         using namespace Layouting;
-        return Column{Stretch{1}};
+        return Column{Row{readFullFile, Stretch{1}, resetToDefaults},
+                      readStringsBeforeCursor,
+                      readStringsAfterCursor,
+                      useFilePathInContext,
+                      useSpecificInstructions,
+                      specificInstractions,
+                      Stretch{1}};
     });
 }
 
+void ContextSettings::setupConnection()
+{
+    connect(&readFullFile, &Utils::BoolAspect::volatileValueChanged, this, [this]() {
+        readStringsAfterCursor.setEnabled(!readFullFile.volatileValue());
+        readStringsBeforeCursor.setEnabled(!readFullFile.volatileValue());
+    });
+    connect(&useSpecificInstructions, &Utils::BoolAspect::volatileValueChanged, this, [this]() {
+        specificInstractions.setEnabled(useSpecificInstructions.volatileValue());
+    });
+    connect(&resetToDefaults, &ButtonAspect::clicked, this, &ContextSettings::resetPageToDefaults);
+}
+
+void ContextSettings::resetPageToDefaults()
+{
+    QMessageBox::StandardButton reply;
+    reply = QMessageBox::question(
+        Core::ICore::dialogParent(),
+        Tr::tr("Reset Settings"),
+        Tr::tr("Are you sure you want to reset all settings to default values?"),
+        QMessageBox::Yes | QMessageBox::No);
+
+    if (reply == QMessageBox::Yes) {
+        resetAspect(readFullFile);
+        resetAspect(readStringsBeforeCursor);
+        resetAspect(readStringsAfterCursor);
+        resetAspect(useFilePathInContext);
+        resetAspect(useSpecificInstructions);
+        resetAspect(specificInstractions);
+    }
+
+    QMessageBox::information(Core::ICore::dialogParent(),
+                             Tr::tr("Settings Reset"),
+                             Tr::tr("All settings have been reset to their default values."));
+}
+
 class ContextSettingsPage : public Core::IOptionsPage
 {
 public:

settings/ContextSettings.hpp

@@ -21,12 +21,28 @@
 
 #include <utils/aspects.h>
 
+#include "SettingsUtils.hpp"
+
 namespace QodeAssist::Settings {
 
 class ContextSettings : public Utils::AspectContainer
 {
 public:
     ContextSettings();
+
+    Utils::BoolAspect readFullFile{this};
+    Utils::IntegerAspect readStringsBeforeCursor{this};
+    Utils::IntegerAspect readStringsAfterCursor{this};
+
+    Utils::StringAspect specificInstractions{this};
+    Utils::BoolAspect useSpecificInstructions{this};
+    Utils::BoolAspect useFilePathInContext{this};
+
+    ButtonAspect resetToDefaults{this};
+
+private:
+    void setupConnection();
+    void resetPageToDefaults();
 };
 
 ContextSettings &contextSettings();

settings/GeneralSettings.cpp

@@ -155,8 +155,8 @@ void GeneralSettings::updateProviderSettings()
     const auto provider = LLMProvidersManager::instance().getCurrentProvider();
 
     if (provider) {
-        url.setValue(provider->url());
-        endPoint.setValue(provider->completionEndpoint());
+        url.setVolatileValue(provider->url());
+        endPoint.setVolatileValue(provider->completionEndpoint());
     }
 }
 
@@ -177,7 +177,7 @@ void GeneralSettings::showModelSelectionDialog()
                                                       &ok);
 
         if (ok && !selectedModel.isEmpty()) {
-            modelName.setValue(selectedModel);
+            modelName.setVolatileValue(selectedModel);
             writeSettings();
         }
     }
@@ -206,8 +206,6 @@ void GeneralSettings::resetPageToDefaults()
     fimPrompts.setStringValue("StarCoder2");
     llmProviders.setStringValue("Ollama");
 
-    apply();
-
     QMessageBox::information(Core::ICore::dialogParent(),
                              Tr::tr("Settings Reset"),
                              Tr::tr("All settings have been reset to their default values."));

settings/SettingsUtils.hpp

@@ -28,7 +28,7 @@ namespace QodeAssist::Settings {
 template<typename AspectType>
 void resetAspect(AspectType &aspect)
 {
-    aspect.setValue(aspect.defaultValue());
+    aspect.setVolatileValue(aspect.defaultValue());
 }
 
 class ButtonAspect : public Utils::BaseAspect