From 038d35fced4681c1a7cba1ae850d78075e60b36a Mon Sep 17 00:00:00 2001 From: Rick Blommers Date: Wed, 5 Mar 2025 21:10:25 +0100 Subject: [PATCH] - [v0.11.1] Regression, autoInit was invoked too late the new contructor setup of #156 --- CHANGELOG.md | 1 + edbee-lib/Doxyfile | 4 +-- edbee-lib/edbee/edbeeversion.h | 6 ++-- .../models/chardocument/chartextdocument.cpp | 3 ++ edbee-lib/edbee/models/textdocument.cpp | 2 +- edbee-lib/edbee/texteditorcontroller.cpp | 3 ++ edbee-lib/edbee/texteditorwidget.cpp | 3 -- edbee-test/edbee/models/textlinedatatest.cpp | 30 +++++++++++-------- 8 files changed, 30 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 18d2dc7..3eccfc0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Changelog +- (2025-03-05) [v0.11.1] Regression, autoInit was invoked too late the new contructor setup of #156 - (2025-03-04) Update license headers - (2025-03-04) Update doxygen so it uses Doxygen Awesome - (2025-03-04) #156, Allow creation with predefined TextEditorConfig, TextEditorController or TextDocument diff --git a/edbee-lib/Doxyfile b/edbee-lib/Doxyfile index ea8b410..ab0b171 100644 --- a/edbee-lib/Doxyfile +++ b/edbee-lib/Doxyfile @@ -48,7 +48,7 @@ PROJECT_NAME = "edbee - Qt Editor Library" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = "v0.10.0" +PROJECT_NUMBER = "v0.11.1" # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewers a @@ -74,7 +74,7 @@ PROJECT_ICON = # entered, it will be relative to the location where Doxygen was started. If # left blank the current directory will be used. -OUTPUT_DIRECTORY = "../edbee-lib-doxydocs/v0.10.0" +OUTPUT_DIRECTORY = "../edbee-lib-doxydocs/v0.11.1" # If the CREATE_SUBDIRS tag is set to YES then Doxygen will create up to 4096 # sub-directories (in 2 levels) under the output directory of each output format diff --git a/edbee-lib/edbee/edbeeversion.h b/edbee-lib/edbee/edbeeversion.h index a3ff10a..c6df143 100644 --- a/edbee-lib/edbee/edbeeversion.h +++ b/edbee-lib/edbee/edbeeversion.h @@ -3,9 +3,9 @@ #pragma once -#define EDBEE_VERSION "0.10.0" +#define EDBEE_VERSION "0.11.1" #define EDBEE_VERSION_MAJOR 0 -#define EDBEE_VERSION_MINOR 10 -#define EDBEE_VERSION_PATCH 0 +#define EDBEE_VERSION_MINOR 11 +#define EDBEE_VERSION_PATCH 1 #define EDBEE_VERSION_POSTFIX "" diff --git a/edbee-lib/edbee/models/chardocument/chartextdocument.cpp b/edbee-lib/edbee/models/chardocument/chartextdocument.cpp index 5fb667a..f8b5c33 100644 --- a/edbee-lib/edbee/models/chardocument/chartextdocument.cpp +++ b/edbee-lib/edbee/models/chardocument/chartextdocument.cpp @@ -43,6 +43,9 @@ CharTextDocument::CharTextDocument(TextEditorConfig *config, QObject *object) { Q_ASSERT_GUI_THREAD; + // auto initialize edbee if this hasn't been done already + Edbee::instance()->autoInit(); + textBuffer_ = new CharTextBuffer(); textScopes_ = new TextDocumentScopes( this ); diff --git a/edbee-lib/edbee/models/textdocument.cpp b/edbee-lib/edbee/models/textdocument.cpp index c642ad8..75bc45e 100644 --- a/edbee-lib/edbee/models/textdocument.cpp +++ b/edbee-lib/edbee/models/textdocument.cpp @@ -76,7 +76,7 @@ void TextDocument::giveLineData(int line, int field, TextLineData* dataItem) TextLineData* TextDocument::getLineData(int line, int field) { int len = lineDataManager()->length(); - Q_ASSERT( len == lineCount() ); + // Q_ASSERT( len == lineCount() ); FIXME: disabled, issue with renderer retreiving linedata Q_ASSERT( line < len ); return lineDataManager()->get( line, field ); } diff --git a/edbee-lib/edbee/texteditorcontroller.cpp b/edbee-lib/edbee/texteditorcontroller.cpp index 38fb75b..07f3bef 100644 --- a/edbee-lib/edbee/texteditorcontroller.cpp +++ b/edbee-lib/edbee/texteditorcontroller.cpp @@ -62,6 +62,9 @@ TextEditorController::TextEditorController(TextDocument *document, TextEditorWid , autoScrollToCaret_(AutoScrollAlways) , borderedTextRanges_(nullptr) { + // auto initialize edbee if this hasn't been done already + Edbee::instance()->autoInit(); + // create the keymap keyMapRef_ = Edbee::instance()->defaultKeyMap(); commandMapRef_ = Edbee::instance()->defaultCommandMap(); diff --git a/edbee-lib/edbee/texteditorwidget.cpp b/edbee-lib/edbee/texteditorwidget.cpp index 9c4554f..3e2b249 100644 --- a/edbee-lib/edbee/texteditorwidget.cpp +++ b/edbee-lib/edbee/texteditorwidget.cpp @@ -56,9 +56,6 @@ TextEditorWidget::TextEditorWidget(TextEditorController *controller, QWidget* pa , autoScrollMargin_(50) , readonly_(false) { - // auto initialize edbee if this hasn't been done already - Edbee::instance()->autoInit(); - // setup the ui scrollAreaRef_ = new class TextEditorScrollArea(this); scrollAreaRef_->setWidgetResizable(true); diff --git a/edbee-test/edbee/models/textlinedatatest.cpp b/edbee-test/edbee/models/textlinedatatest.cpp index e42e0b5..e38297b 100644 --- a/edbee-test/edbee/models/textlinedatatest.cpp +++ b/edbee-test/edbee/models/textlinedatatest.cpp @@ -43,7 +43,6 @@ class DestructorTestList : public TextLineDataList /// Tests the line data manager void TextLineDataTest::testLineDataManager() { - TextLineDataManager ldm; testEqual( filledTestString(ldm ), "-"); @@ -60,6 +59,7 @@ void TextLineDataTest::testLineDataManager() testEqual( destroyCount, 0 ); testEqual( destructCount, 0 ); + // inserting an item should move the data items ldm.fillWithEmpty(1,0,1); testEqual( filledTestString(ldm ), "--X-"); @@ -83,7 +83,7 @@ void TextLineDataTest::testLineDataManager() testEqual( filledTestString(ldm ), "--"); testEqual( destroyCount, 1 ); testEqual( destructCount, 1 ); - + qDebug() << "E"; } /// References issue #66 github @@ -98,28 +98,32 @@ void TextLineDataTest::testSetTextLineDataIssue66() TextEditorController* controller = widget.controller(); TextLineDataManager* tdm = doc->lineDataManager(); -//qDebug()<<"\n ========================================"; -//qDebug()<< "setText(a\\nb\\nc)" ; + +qDebug()<<"\n ========================================"; +qDebug()<< "setText(a\\nb\\nc)" ; doc->setText("a\nb\nc"); testEqual(filledTestString(*tdm), "---"); -// qDebug() << "- a:" << filledTestString(*tdm); + qDebug() << "- a:" << filledTestString(*tdm); -//qDebug()<<"\n ========================================"; -//qDebug()<< "setText(a\\nb)" ; +qDebug()<<"\n ========================================"; +qDebug()<< "setText(a\\nb)" ; doc->setText("a\nb"); testEqual(filledTestString(*tdm), "--"); -// qDebug() << "- b:" << filledTestString(*tdm); + qDebug() << "- b:" << filledTestString(*tdm); + qDebug() << "G"; -//qDebug()<<"\n ========================================"; -//qDebug()<< "undo()"; +qDebug()<<"\n ========================================"; +qDebug()<< "undo()"; controller->undo(); testEqual( filledTestString(*tdm), "---"); -// qDebug() << "- c:" << filledTestString(*tdm); + qDebug() << "- c:" << filledTestString(*tdm); + qDebug() << "H"; // exit(1); -//qDebug()<<"\n ========================================"; -//qDebug()<< "setText(a)"; +qDebug()<<"\n ========================================"; +qDebug()<< "setText(a)"; doc->setText("a"); + qDebug() << "I"; } } // edbee