Reverted directory for New document

Author: midenok

kdevplatform/interfaces/idocumentcontroller.h

@@ -103,7 +103,6 @@ class KDEVPLATFORMINTERFACES_EXPORT IDocumentController: public QObject {
      */
     virtual KTextEditor::View* activeTextDocumentView() const = 0;
 
-    virtual QUrl nextEmptyDocumentUrl() const = 0;
     virtual void updateDirectoryHint(const QString&) = 0;
 
 public Q_SLOTS:

kdevplatform/shell/documentcontroller.cpp

@@ -1004,7 +1004,10 @@ QStringList DocumentController::documentTypes() const
 
 static const QRegularExpression& emptyDocumentPattern()
 {
-    static const QRegularExpression pattern(QStringLiteral("^/(.+/)?%1(?:\\s\\((\\d+)\\))?$").arg(EMPTY_DOCUMENT_URL));
+    /* A hack that binds empty document to directory tree.
+     * It must be always bound to root dir, otherwise it may clash with existing
+     * files. */
+    static const QRegularExpression pattern(QStringLiteral("^/%1(?:\\s\\((\\d+)\\))?$").arg(EMPTY_DOCUMENT_URL));
     return pattern;
 }
 
@@ -1021,11 +1024,13 @@ void DocumentController::updateDirectoryHint(const QString& path)
 QString DocumentController::currentDirectory() const
 {
     if ( activeDocument() ) {
-        QUrl url = activeDocument()->url().adjusted(
-            QUrl::RemoveScheme |
-            QUrl::RemoveFilename |
-            QUrl::StripTrailingSlash);
-        return url.toString();
+        QUrl url = activeDocument()->url();
+        if (!isEmptyDocumentUrl(url)) {
+            return url.adjusted(
+                QUrl::RemoveScheme |
+                QUrl::RemoveFilename |
+                QUrl::StripTrailingSlash).toString();
+        }
     }
     if (!d->directoryHint.isEmpty()) {
         return d->directoryHint;
@@ -1036,7 +1041,7 @@ QString DocumentController::currentDirectory() const
     return QString();
 }
 
-QUrl DocumentController::nextEmptyDocumentUrl() const
+QUrl DocumentController::nextEmptyDocumentUrl()
 {
     int nextEmptyDocNumber = 0;
     const auto& pattern = emptyDocumentPattern();
@@ -1054,9 +1059,9 @@ QUrl DocumentController::nextEmptyDocumentUrl() const
 
     QUrl url;
     if (nextEmptyDocNumber > 0)
-        url = QUrl::fromLocalFile(currentDirectory() + '/' + QStringLiteral("%1 (%2)").arg(EMPTY_DOCUMENT_URL).arg(nextEmptyDocNumber));
+        url = QUrl::fromLocalFile(QStringLiteral("/%1 (%2)").arg(EMPTY_DOCUMENT_URL).arg(nextEmptyDocNumber));
     else
-        url = QUrl::fromLocalFile(currentDirectory() + '/' + EMPTY_DOCUMENT_URL);
+        url = QUrl::fromLocalFile('/' + EMPTY_DOCUMENT_URL);
     return url;
 }
 

kdevplatform/shell/documentcontroller.h

@@ -102,7 +102,7 @@ class KDEVPLATFORMSHELL_EXPORT DocumentController: public IDocumentController {
 
     /**checks that url is an url of empty document*/
     static bool isEmptyDocumentUrl(const QUrl &url);
-    QUrl nextEmptyDocumentUrl() const override;
+    static QUrl nextEmptyDocumentUrl();
     void updateDirectoryHint(const QString& path) override;
     QString currentDirectory() const;
 

kdevplatform/shell/mainwindow_actions.cpp

@@ -187,8 +187,7 @@ void MainWindowPrivate::toggleFullScreen(bool fullScreen)
 
 void MainWindowPrivate::fileNew()
 {
-    auto doc = Core::self()->documentControllerInternal();
-    doc->openDocument(doc->nextEmptyDocumentUrl());
+    Core::self()->documentControllerInternal()->openDocument(DocumentController::nextEmptyDocumentUrl());
 }
 
 void MainWindowPrivate::viewAddNewToolView()

kdevplatform/shell/tests/test_documentcontroller.cpp

@@ -176,14 +176,14 @@ QUrl TestDocumentController::createFile(const QTemporaryDir& dir, const QString&
 
 void TestDocumentController::testEmptyUrl()
 {
-    const auto first = m_subject->nextEmptyDocumentUrl();
+    const auto first = DocumentController::nextEmptyDocumentUrl();
     QVERIFY(DocumentController::isEmptyDocumentUrl(first));
-    QCOMPARE(m_subject->nextEmptyDocumentUrl(), first);
+    QCOMPARE(DocumentController::nextEmptyDocumentUrl(), first);
 
     auto doc = m_subject->openDocumentFromText(QString());
     QCOMPARE(doc->url(), first);
 
-    const auto second = m_subject->nextEmptyDocumentUrl();
+    const auto second = DocumentController::nextEmptyDocumentUrl();
     QVERIFY(first != second);
     QVERIFY(DocumentController::isEmptyDocumentUrl(second));