Revert all workarounds for #3706 and apply a fix

sandman7920 · sandman7920 · commit 1fa0eb9acebe · 2024-08-31T00:51:40.000+03:00
Let's hope :)
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
@@ -79,35 +79,11 @@ MainWindow::MainWindow(QWidget* parent)
 
     activateFields(false);
     updateRecentFileActions();
-    QApplication::processEvents();
-
-    auto update_structure = [this] {
-        const auto docks = allTableBrowserDocks();
-        std::vector<sqlb::ObjectIdentifier> old_tables;
-        old_tables.reserve(docks.size());
-        for(const auto &dock: docks) {
-            old_tables.push_back(dock->tableBrowser()->currentlyBrowsedTableName());
-        }
-
-        dbStructureModel->reloadData();
-        // Process all waiting events before we call populateStructure,
-        // giving the Application a chance to attach all Widgets.
-        // See #3706
-        QApplication::processEvents();
-        populateStructure(old_tables);
-    };
 
     if (!Settings::getValue("tmp", "fileWillBeOpenedFromCLI").toBool() &&
         Settings::getValue("General", "autoLoadLastDBFileAtStartup").toBool()) {
         recentFileActs[0]->trigger();
-        update_structure();
-        if (ui->mainTab->currentWidget() == ui->browser)
-            refreshTableBrowsers();
     }
-
-    connect(&db, &DBBrowserDB::structureUpdated, this, [update_structure = std::move(update_structure)]() {
-        update_structure();
-    });
 }
 
 MainWindow::~MainWindow()
@@ -160,6 +136,15 @@ void MainWindow::init()
 
     // Set up DB structure tab
     dbStructureModel = new DbStructureModel(db, this);
+    connect(&db, &DBBrowserDB::structureUpdated, this, [this]() {
+        std::vector<sqlb::ObjectIdentifier> old_tables;
+        for(const auto& d : allTableBrowserDocks())
+            old_tables.push_back(d->tableBrowser()->currentlyBrowsedTableName());
+
+        dbStructureModel->reloadData();
+
+        populateStructure(old_tables);
+    });
     ui->dbTreeWidget->setModel(dbStructureModel);
     ui->dbTreeWidget->setColumnWidth(DbStructureModel::ColumnName, 300);
     ui->dbTreeWidget->setColumnHidden(DbStructureModel::ColumnObjectType, true);
diff --git a/src/SqlUiLexer.cpp b/src/SqlUiLexer.cpp
@@ -195,7 +195,12 @@ void SqlUiLexer::setupAutoCompletion()
         listFunctions.append(keyword.first);
     }
 
-    autocompleteApi->prepare();
+    // Push the QsciAPIs::prepare method call to the
+    // execution queue, callers should receive
+    // callbacks in order.
+    QMetaObject::invokeMethod(this, [this] {
+        autocompleteApi->prepare();
+    }, Qt::QueuedConnection);
 }
 
 void SqlUiLexer::setTableNames(const QualifiedTablesMap& tables)

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,12 @@ void SqlUiLexer::setupAutoCompletion()`
`195`	`195`	`listFunctions.append(keyword.first);`
`196`	`196`	`}`
`197`	`197`
`198`		`- autocompleteApi->prepare();`
	`198`	`+ // Push the QsciAPIs::prepare method call to the`
	`199`	`+ // execution queue, callers should receive`
	`200`	`+ // callbacks in order.`
	`201`	`+ QMetaObject::invokeMethod(this, [this] {`
	`202`	`+ autocompleteApi->prepare();`
	`203`	`+ }, Qt::QueuedConnection);`
`199`	`204`	`}`
`200`	`205`
`201`	`206`	`void SqlUiLexer::setTableNames(const QualifiedTablesMap& tables)`