From 05768d000fb90daa672a30f09930b5c8726ea8b5 Mon Sep 17 00:00:00 2001 From: "Ivan.Yarkov" Date: Wed, 18 Oct 2023 18:17:48 +0300 Subject: [PATCH] RIDER-81825 fold new line symbols in sandbox editors GitOrigin-RevId: 41002ca4327321340892f941d754c05a12ccf416 --- .../xdebugger/evaluation/XDebuggerEditorsProvider.java | 3 +++ .../com/intellij/xdebugger/impl/ui/XDebuggerEditorBase.java | 2 +- .../xdebugger/impl/ui/XDebuggerExpressionComboBox.java | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/platform/xdebugger-api/src/com/intellij/xdebugger/evaluation/XDebuggerEditorsProvider.java b/platform/xdebugger-api/src/com/intellij/xdebugger/evaluation/XDebuggerEditorsProvider.java index 417cf6346a9a..d37ec5137f76 100644 --- a/platform/xdebugger-api/src/com/intellij/xdebugger/evaluation/XDebuggerEditorsProvider.java +++ b/platform/xdebugger-api/src/com/intellij/xdebugger/evaluation/XDebuggerEditorsProvider.java @@ -3,6 +3,7 @@ package com.intellij.xdebugger.evaluation; import com.intellij.lang.Language; import com.intellij.openapi.editor.Document; +import com.intellij.openapi.editor.Editor; import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.fileTypes.LanguageFileType; import com.intellij.openapi.project.Project; @@ -37,6 +38,8 @@ public abstract class XDebuggerEditorsProvider { @NotNull EvaluationMode mode) { return createDocument(project, expression.getExpression(), sourcePosition, mode); } + + public void afterEditorCreated(@Nullable Editor editor) {} @NotNull public Collection getSupportedLanguages(@NotNull Project project, @Nullable XSourcePosition sourcePosition) { diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebuggerEditorBase.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebuggerEditorBase.java index 0f9448ad63d6..d66fe34842a9 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebuggerEditorBase.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebuggerEditorBase.java @@ -333,7 +333,7 @@ public abstract class XDebuggerEditorBase implements Expandable { } } - protected static void foldNewLines(EditorEx editor) { + public static void foldNewLines(EditorEx editor) { editor.getColorsScheme().setAttributes(EditorColors.FOLDED_TEXT_ATTRIBUTES, null); editor.reinitSettings(); FoldingModelEx foldingModel = editor.getFoldingModel(); diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebuggerExpressionComboBox.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebuggerExpressionComboBox.java index 0795516e67fb..c7dc3598a102 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebuggerExpressionComboBox.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebuggerExpressionComboBox.java @@ -130,6 +130,7 @@ public class XDebuggerExpressionComboBox extends XDebuggerEditorBase { .inSmartMode(getProject()) .finishOnUiThread(ModalityState.any(), document -> { myEditor.getEditorTextField().setNewDocumentAndFileType(getFileType(text), document); + getEditorsProvider().afterEditorCreated(getEditor()); }) .coalesceBy(this) .submit(AppExecutorUtil.getAppExecutorService());