feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

TextEditor: Collect the comment position setting from highlighter

Browse Source 
Change-Id: I802b9e263a3515fe340459329a8c8d8f309cfa0e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
David Schulz
2023-09-13 14:44:07 +02:00
parent de42485b8f
commit aab39532f3
4 changed files with 76 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/texteditor/texteditor.cpp
View File

@@ -3585,11 +3585,19 @@ void TextEditorWidgetPrivate::configureGenericHighlighter(
void TextEditorWidgetPrivate::setupFromDefinition(const KSyntaxHighlighting::Definition &definition)
{
const TypingSettings::CommentPosition commentPosition
= m_document->typingSettings().m_commentPosition;
m_commentDefinition.isAfterWhitespace = commentPosition != TypingSettings::StartOfLine;
if (!definition.isValid())
return;
m_commentDefinition.singleLine = definition.singleLineCommentMarker();
m_commentDefinition.multiLineStart = definition.multiLineCommentMarker().first;
m_commentDefinition.multiLineEnd = definition.multiLineCommentMarker().second;
if (commentPosition == TypingSettings::Automatic) {
m_commentDefinition.isAfterWhitespace
= definition.singleLineCommentPosition()
== KSyntaxHighlighting::CommentPosition::AfterWhitespace;
}
q->setCodeFoldingSupported(true);
}
@@ -7698,10 +7706,8 @@ void TextEditorWidget::rewrapParagraph()
void TextEditorWidget::unCommentSelection()
{
const bool singleLine = d->m_document->typingSettings().m_preferSingleLineComments;
CommentDefinition commentDefinition = d->m_commentDefinition;
commentDefinition.isAfterWhitespace = d->m_document->typingSettings().m_preferAfterWhitespaceComments;
const MultiTextCursor cursor = Utils::unCommentSelection(multiTextCursor(),
commentDefinition,
d->m_commentDefinition,
singleLine);
setMultiTextCursor(cursor);
}
@@ -7862,6 +7868,7 @@ void TextEditorWidget::setBehaviorSettings(const BehaviorSettings &bs)
void TextEditorWidget::setTypingSettings(const TypingSettings &typingSettings)
{
d->m_document->setTypingSettings(typingSettings);
d->setupFromDefinition(d->currentDefinition());
}
void TextEditorWidget::setStorageSettings(const StorageSettings &storageSettings)
@@ -9263,6 +9270,8 @@ BaseTextEditor *TextEditorFactoryPrivate::createEditorHelper(const TextDocumentP
textEditorWidget->d->m_hoverHandlers = m_hoverHandlers;
textEditorWidget->d->m_commentDefinition = m_commentDefinition;
textEditorWidget->d->m_commentDefinition.isAfterWhitespace
= document->typingSettings().m_commentPosition != TypingSettings::StartOfLine;
QObject::connect(textEditorWidget,
&TextEditorWidget::activateEditor,