From a8cf7a3f2f0e823db0d7e8860f5b4cf72dc9be1f Mon Sep 17 00:00:00 2001 From: Rustam Vishnyakov Date: Tue, 10 Apr 2018 17:19:56 +0300 Subject: [PATCH] Migration to PsiFile-based Code Style API --- .../generation/CommentByLineCommentHandler.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/generation/CommentByLineCommentHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/generation/CommentByLineCommentHandler.java index ee6517d9d009..9f54c79003b8 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/generation/CommentByLineCommentHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/generation/CommentByLineCommentHandler.java @@ -27,8 +27,6 @@ import com.intellij.openapi.util.registry.Registry; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; -import com.intellij.psi.codeStyle.CodeStyleSettings; -import com.intellij.psi.codeStyle.CodeStyleSettingsManager; import com.intellij.psi.codeStyle.CommonCodeStyleSettings; import com.intellij.psi.impl.source.tree.injected.InjectedCaret; import com.intellij.psi.util.PsiUtilBase; @@ -46,14 +44,12 @@ import java.util.List; import java.util.Map; public class CommentByLineCommentHandler extends MultiCaretCodeInsightActionHandler { - private Project myProject; private final List myBlocks = new ArrayList<>(); @Override // first pass - adjacent carets are grouped into blocks public void invoke(@NotNull Project project, @NotNull Editor editor, @NotNull Caret caret, @NotNull PsiFile file) { - myProject = project; file = file.getViewProvider().getPsi(file.getViewProvider().getBaseLanguage()); PsiElement context = InjectedLanguageManager.getInstance(file.getProject()).getInjectionHost(file); @@ -135,8 +131,6 @@ public class CommentByLineCommentHandler extends MultiCaretCodeInsightActionHand public void postInvoke() { FeatureUsageTracker.getInstance().triggerFeatureUsed("codeassists.comment.line"); - CodeStyleSettings codeStyleSettings = CodeStyleSettingsManager.getSettings(myProject); - // second pass - determining whether we need to comment or to uncomment boolean allLinesCommented = true; for (Block block : myBlocks) { @@ -158,7 +152,7 @@ public class CommentByLineCommentHandler extends MultiCaretCodeInsightActionHand block.blockSuitableCommenter = getBlockSuitableCommenter(psiFile, offset, endOffset); Language lineStartLanguage = getLineStartLanguage(block.editor, psiFile, startLine); - CommonCodeStyleSettings languageSettings = codeStyleSettings.getCommonSettings(lineStartLanguage); + CommonCodeStyleSettings languageSettings = CodeStyle.getLanguageSettings(psiFile, lineStartLanguage); block.commentWithIndent = !languageSettings.LINE_COMMENT_AT_FIRST_COLUMN; block.addSpace = languageSettings.LINE_COMMENT_ADD_SPACE;