From 3c5f1db9184ebdb59c3e704bc3c97b0fade05360 Mon Sep 17 00:00:00 2001 From: Tagir Valeev Date: Mon, 19 Feb 2024 12:27:22 +0100 Subject: [PATCH] [mod-commands] PsiUpdateImpl: set original file for code style settings GitOrigin-RevId: a97779a8674bc00b0fb9787f98913e1d71c273c3 --- .../intellij/lang/impl/modcommand/PsiUpdateImpl.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/platform/analysis-impl/src/com/intellij/lang/impl/modcommand/PsiUpdateImpl.java b/platform/analysis-impl/src/com/intellij/lang/impl/modcommand/PsiUpdateImpl.java index 60e48c7e3970..0cfcf5edade4 100644 --- a/platform/analysis-impl/src/com/intellij/lang/impl/modcommand/PsiUpdateImpl.java +++ b/platform/analysis-impl/src/com/intellij/lang/impl/modcommand/PsiUpdateImpl.java @@ -223,22 +223,26 @@ final class PsiUpdateImpl { } private static @NotNull PsiFile copyFile(Project project, PsiFile origFile) { + PsiFile file; var manager = InjectedLanguageManager.getInstance(project); boolean injectedFragment = manager.isInjectedFragment(origFile); if (!injectedFragment) { PsiElement navigationElement = origFile.getNavigationElement(); if (navigationElement != origFile && navigationElement instanceof PsiFile) { - return (PsiFile)navigationElement.copy(); + file = (PsiFile)navigationElement.copy(); + } + else { + file = (PsiFile)origFile.copy(); } - return (PsiFile)origFile.copy(); } else { - PsiFile file = PsiFileFactory.getInstance(project).createFileFromText( + file = PsiFileFactory.getInstance(project).createFileFromText( origFile.getName(), origFile.getLanguage(), manager.getUnescapedText(origFile), false, true, true, origFile.getVirtualFile()); file.putUserData(ORIGINAL_FILE_FOR_INJECTION, origFile); - return file; } + file.putUserData(PsiFileFactory.ORIGINAL_FILE, origFile); + return file; } private static class ModPsiUpdaterImpl implements ModPsiUpdater, DocumentListener, Disposable {