From 6ede9d61a0f4bc6bc27b883579e8b410b2e7ea38 Mon Sep 17 00:00:00 2001 From: Rustam Vishnyakov Date: Fri, 29 Dec 2017 16:49:30 +0300 Subject: [PATCH] Migration to PsiFile-based code style API --- .../lang-api/src/com/intellij/codeInsight/TailType.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/platform/lang-api/src/com/intellij/codeInsight/TailType.java b/platform/lang-api/src/com/intellij/codeInsight/TailType.java index 35051a01d223..d9ce0fea8ec7 100644 --- a/platform/lang-api/src/com/intellij/codeInsight/TailType.java +++ b/platform/lang-api/src/com/intellij/codeInsight/TailType.java @@ -13,6 +13,7 @@ // limitations under the License. package com.intellij.codeInsight; +import com.intellij.application.options.CodeStyle; import com.intellij.codeInsight.completion.InsertionContext; import com.intellij.lang.Language; import com.intellij.openapi.editor.CaretModel; @@ -22,7 +23,6 @@ import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiFile; -import com.intellij.psi.codeStyle.CodeStyleSettingsManager; import com.intellij.psi.codeStyle.CommonCodeStyleSettings; import com.intellij.psi.util.PsiUtilCore; import com.intellij.util.text.CharArrayUtil; @@ -99,10 +99,7 @@ public abstract class TailType { protected static CommonCodeStyleSettings getLocalCodeStyleSettings(Editor editor, int tailOffset) { final PsiFile psiFile = getFile(editor); Language language = PsiUtilCore.getLanguageAtOffset(psiFile, tailOffset); - - final Project project = editor.getProject(); - assert project != null; - return CodeStyleSettingsManager.getSettings(project).getCommonSettings(language); + return CodeStyle.getLanguageSettings(psiFile, language); } protected static FileType getFileType(Editor editor) {