From df8bef8395784970ae7c28eef970374d430f2a06 Mon Sep 17 00:00:00 2001 From: Rustam Vishnyakov Date: Tue, 10 Apr 2018 17:30:41 +0300 Subject: [PATCH] Migration to PsiFile-based Code Style API --- .../com/intellij/ide/fileTemplates/FileTemplateUtil.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ide/fileTemplates/FileTemplateUtil.java b/platform/lang-impl/src/com/intellij/ide/fileTemplates/FileTemplateUtil.java index 1ba53923ecfd..4754ca04d3c5 100644 --- a/platform/lang-impl/src/com/intellij/ide/fileTemplates/FileTemplateUtil.java +++ b/platform/lang-impl/src/com/intellij/ide/fileTemplates/FileTemplateUtil.java @@ -15,6 +15,7 @@ */ package com.intellij.ide.fileTemplates; +import com.intellij.application.options.CodeStyle; import com.intellij.ide.IdeBundle; import com.intellij.ide.fileTemplates.impl.CustomFileTemplate; import com.intellij.openapi.application.ApplicationManager; @@ -27,7 +28,6 @@ import com.intellij.openapi.fileTypes.FileTypes; import com.intellij.openapi.fileTypes.ex.FileTypeManagerEx; import com.intellij.openapi.project.Project; import com.intellij.openapi.project.ProjectManager; -import com.intellij.openapi.project.ex.ProjectManagerEx; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.util.ClassLoaderUtil; import com.intellij.openapi.util.ThrowableComputable; @@ -240,7 +240,7 @@ public class FileTemplateUtil { final String result = stringWriter.toString(); if (useSystemLineSeparators) { - final String newSeparator = CodeStyleSettingsManager.getSettings(ProjectManagerEx.getInstanceEx().getDefaultProject()).getLineSeparator(); + final String newSeparator = CodeStyle.getDefaultSettings().getLineSeparator(); if (!"\n".equals(newSeparator)) { return StringUtil.convertLineSeparators(result, newSeparator); } @@ -363,7 +363,7 @@ public class FileTemplateUtil { } public static String indent(String methodText, Project project, FileType fileType) { - int indent = CodeStyleSettingsManager.getSettings(project).getIndentSize(fileType); + int indent = CodeStyle.getSettings(project).getIndentSize(fileType); return methodText.replaceAll("\n", "\n" + StringUtil.repeatSymbol(' ', indent)); }