From 391ef8a877afe6526c0af28471ad464bcf3e7329 Mon Sep 17 00:00:00 2001 From: "Nikita.Ashihmin" Date: Fri, 4 Oct 2024 18:59:04 +0400 Subject: [PATCH] PY-71854 Jupyter(feat): remove decompile trash from TextPresentationTranformers GitOrigin-RevId: f64c7c455a4a8a59362ac77eab13dbe1fa5010f9 --- ...anformers.kt => TextPresentationTransformers.kt} | 13 ++++++------- .../openapi/fileEditor/impl/LoadTextUtil.java | 6 +++--- 2 files changed, 9 insertions(+), 10 deletions(-) rename platform/core-api/src/com/intellij/openapi/vfs/transformer/{TextPresentationTranformers.kt => TextPresentationTransformers.kt} (76%) diff --git a/platform/core-api/src/com/intellij/openapi/vfs/transformer/TextPresentationTranformers.kt b/platform/core-api/src/com/intellij/openapi/vfs/transformer/TextPresentationTransformers.kt similarity index 76% rename from platform/core-api/src/com/intellij/openapi/vfs/transformer/TextPresentationTranformers.kt rename to platform/core-api/src/com/intellij/openapi/vfs/transformer/TextPresentationTransformers.kt index 9fd753f0f90d..24f7bdf36962 100644 --- a/platform/core-api/src/com/intellij/openapi/vfs/transformer/TextPresentationTranformers.kt +++ b/platform/core-api/src/com/intellij/openapi/vfs/transformer/TextPresentationTransformers.kt @@ -8,7 +8,6 @@ import com.intellij.openapi.components.Service import com.intellij.openapi.components.service import com.intellij.openapi.extensions.ExtensionPointName import com.intellij.openapi.fileEditor.FileDocumentManager -import com.intellij.openapi.fileTypes.BinaryFileDecompiler import com.intellij.openapi.fileTypes.FileTypeExtension import com.intellij.openapi.fileTypes.FileTypeRegistry import com.intellij.openapi.vfs.VirtualFile @@ -17,13 +16,13 @@ import org.jetbrains.annotations.ApiStatus @ApiStatus.Internal @Service(Service.Level.APP) -class TextPresentationTranformers : FileTypeExtension(EP), Disposable.Default { +class TextPresentationTransformers : FileTypeExtension(EP), Disposable.Default { init { - val extensionPoint = ApplicationManager.getApplication().extensionArea.getExtensionPointIfRegistered(EP.name) - extensionPoint?.addChangeListener({ notifyDecompilerSetChange() }, null) + val extensionPoint = ApplicationManager.getApplication().extensionArea.getExtensionPointIfRegistered(EP.name) + extensionPoint?.addChangeListener({ notifyTextPresentationSetChange() }, null) } - private fun notifyDecompilerSetChange() { + private fun notifyTextPresentationSetChange() { val fileTypes = EP.extensionsIfPointIsRegistered.map { val key = it.key FileTypeRegistry.getInstance().getFileTypeByExtension(key) @@ -37,7 +36,7 @@ class TextPresentationTranformers : FileTypeExtension().forFileType(virtualFile.fileType) + val transformer = service().forFileType(virtualFile.fileType) if (transformer == null) { return text } @@ -47,7 +46,7 @@ class TextPresentationTranformers : FileTypeExtension().forFileType(virtualFile.fileType) + val transformer = service().forFileType(virtualFile.fileType) if (transformer == null) { return text } diff --git a/platform/core-impl/src/com/intellij/openapi/fileEditor/impl/LoadTextUtil.java b/platform/core-impl/src/com/intellij/openapi/fileEditor/impl/LoadTextUtil.java index 8a1a8a0c2b94..f30282e60b9e 100644 --- a/platform/core-impl/src/com/intellij/openapi/fileEditor/impl/LoadTextUtil.java +++ b/platform/core-impl/src/com/intellij/openapi/fileEditor/impl/LoadTextUtil.java @@ -18,7 +18,7 @@ import com.intellij.openapi.vfs.CharsetToolkit; import com.intellij.openapi.vfs.VfsUtilCore; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.encoding.EncodingRegistry; -import com.intellij.openapi.vfs.transformer.TextPresentationTranformers; +import com.intellij.openapi.vfs.transformer.TextPresentationTransformers; import com.intellij.testFramework.LightVirtualFile; import com.intellij.util.*; import com.intellij.util.text.ByteArrayCharSequence; @@ -406,7 +406,7 @@ public final class LoadTextUtil { @NotNull String text, long newModificationStamp) throws IOException { Charset existing = virtualFile.getCharset(); - text = TextPresentationTranformers.toPersistent(text, virtualFile).toString(); + text = TextPresentationTransformers.toPersistent(text, virtualFile).toString(); Pair.NonNull chosen = charsetForWriting(project, virtualFile, text, existing); Charset charset = chosen.first; byte[] buffer = chosen.second; @@ -568,7 +568,7 @@ public final class LoadTextUtil { ConvertResult result = convertBytesAndSetSeparator(bytes, bytes.length, virtualFile, saveDetectedSeparators, info, info.hardCodedCharset); if (applyTextTransformer) { - return TextPresentationTranformers.fromPersistent(result.text, virtualFile); + return TextPresentationTransformers.fromPersistent(result.text, virtualFile); } else { return result.text; }