Cross-session persistent checkable menu item to disable the "proposal…

…s" experiments

examples/workbench/mainwindow.cpp

@@ -109,6 +109,8 @@ MainWindow::MainWindow() :
     addDockWidget(Qt::TopDockWidgetArea, dockValueExplorer);
     dockValueExplorer->hide();
 
+    readSettings();
+
     createActions();
     createMenus();
     createStatusBar();
@@ -139,9 +141,6 @@ MainWindow::MainWindow() :
         Qt::DirectConnection
     );
 
-
-    readSettings();
-
     setWindowTitle(tr("Ren Garden"));
     setUnifiedTitleAndToolBarOnMac(true);
 }
@@ -234,6 +233,18 @@ void MainWindow::createActions()
         Qt::DirectConnection
     );
 
+    proposalsAct = new QAction(tr("Use &Proposals "), this);
+    proposalsAct->setStatusTip(tr("Enable or disable experimental language "
+                                  "proposals curated by @HostileFork."));
+    proposalsAct->setCheckable(true);
+    proposalsAct->setChecked(console->getUseProposals());
+    connect(
+        proposalsAct, &QAction::triggered,
+        [this](bool checked) {
+            console->setUseProposals(checked);
+        }
+    );
+
     newTabAct = new QAction(tr("New &Tab"), this);
     newTabAct->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_T));
     newTabAct->setStatusTip(tr("Create a new tab (not multithreaded!)"));
@@ -341,6 +352,9 @@ void MainWindow::createMenus()
     windowMenu->addAction(watchListAct);
     windowMenu->addAction(valueExplorerAct);
 
+    languageMenu = menuBar()->addMenu(tr("&Language"));
+    languageMenu->addAction(proposalsAct);
+
     menuBar()->addSeparator();
 
     helpMenu = menuBar()->addMenu(tr("&Help"));
@@ -360,10 +374,12 @@ void MainWindow::readSettings()
     QPoint pos = settings.value("pos", QPoint(200, 200)).toPoint();
     QSize size = settings.value("size", QSize(400, 400)).toSize();
     int zoom = settings.value("zoom", 0).toInt();
+    bool useProposals = settings.value("useProposals", true).toBool();
 
     move(pos);
     resize(size);
     console->repl().setZoom(zoom);
+    console->setUseProposals(useProposals);
 }
 
 
@@ -373,6 +389,7 @@ void MainWindow::writeSettings()
     settings.setValue("pos", pos());
     settings.setValue("size", size());
     settings.setValue("zoom", console->repl().getZoom());
+    settings.setValue("useProposals", console->getUseProposals());
 }
 
 

examples/workbench/mainwindow.h

@@ -87,26 +87,28 @@ private slots:
     QDockWidget * dockValueExplorer;
 
 private:
-    QMenu * fileMenu;
-    QMenu * editMenu;
-    QMenu * windowMenu;
-    QMenu * helpMenu;
+    QAction * separatorAct;
 
+    QMenu * fileMenu;
     QAction * exitAct;
 
+    QMenu * editMenu;
     QAction * cutAct;
     QAction * copyAct;
     QAction * pasteAct;
 
+    QMenu * languageMenu;
+    QAction * proposalsAct;
+
+    QMenu * windowMenu;
     QAction * newTabAct;
     QAction * nextTabAct;
     QAction * previousTabAct;
     QAction * closeTabAct;
     QAction * watchListAct;
     QAction * valueExplorerAct;
 
-    QAction * separatorAct;
-
+    QMenu * helpMenu;
     QAction * aboutAct;
 
 private slots:

examples/workbench/renconsole.cpp

@@ -39,9 +39,9 @@ using namespace ren;
 extern bool forcingQuit;
 
 
-///
-/// WORKER OBJECT FOR HANDLING REN EVALUATIONS
-///
+//#
+//# WORKER OBJECT FOR HANDLING REN EVALUATIONS
+//#
 
 //
 // We push this item to the worker thread and let it do the actual evaluation
@@ -159,9 +159,9 @@ public slots:
 
 
 
-///
-/// CONSOLE CONSTRUCTION
-///
+//#
+//# CONSOLE CONSTRUCTION
+//#
 
 //
 // The console doesn't inherit from ReplPad, it *contains* it.  This
@@ -179,7 +179,8 @@ RenConsole::RenConsole (QWidget * parent) :
     bannerPrinted (false),
     evaluatingRepl (nullptr),
     target (none),
-    proposalsContext () // we will copy it from userContext when ready...
+    proposalsContext (), // we will copy it from userContext when ready...
+    useProposals (true)
 {
     // Set up the Evaluator so it's wired up for signals and slots
     // and on another thread from the GUI.  This technique is taken directly
@@ -596,7 +597,9 @@ void RenConsole::createNewTab() {
 
     auto pad = new ReplPad {*this, *this, this};
 
-    auto context = proposalsContext->copy();
+    Context context = useProposals
+        ? proposalsContext->copy()
+        : userContext.copy();
 
     auto emplacement = tabinfos.emplace(std::make_pair(pad,
         TabInfo {
@@ -778,9 +781,9 @@ void RenConsole::printBanner() {
 
 
 
-///
-/// REPLPAD HOOKS
-///
+//#
+//# REPLPAD HOOKS
+//#
 
 //
 // The ReplPad is language-and-evaluator agnostic.  It offers an interface
@@ -881,9 +884,9 @@ QString RenConsole::getPromptString(ReplPad & pad) {
 
 
 
-///
-/// EVALUATION RESULT HANDLER
-///
+//#
+//# EVALUATION RESULT HANDLER
+//#
 
 //
 // When the evaluator has finished running, we want to print out the
@@ -975,9 +978,9 @@ void RenConsole::handleResults(
 
 
 
-///
-/// SYNTAX-SENSITIVE HOOKS
-///
+//#
+//# SYNTAX-SENSITIVE HOOKS
+//#
 
 //
 // Ideally this would be done with separately sandboxed "Engines", a feature
@@ -1100,9 +1103,9 @@ std::pair<QString, int> RenConsole::autoComplete(
 
 
 
-///
-/// DESTRUCTOR
-///
+//#
+//# DESTRUCTOR
+//#
 
 //
 // If we try to destroy a RenConsole, there may be a worker thread still
@@ -1127,6 +1130,15 @@ RenConsole::~RenConsole() {
 }
 
 
+void RenConsole::setUseProposals(bool useProposals) {
+    this->useProposals = useProposals;
+
+    std::string command {"console system/contexts/"};
+    command += useProposals ? "proposals" : "user";
+    getTabInfo(repl()).context(command.c_str());
+}
+
+
 
 // This bit is necessary because we're defining a Q_OBJECT class in a .cpp
 // file instead of a header file (Worker)

examples/workbench/renconsole.h

@@ -172,6 +172,12 @@ public slots:
     void createNewTab();
     void tryCloseTab(int index);
     void updateTabLabels();
+
+private:
+    bool useProposals;
+public:
+    void setUseProposals(bool useProposals);
+    bool getUseProposals() { return useProposals; }
 };
 
 #endif