MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Migration to new CodeStyle API

Browse Source
This commit is contained in:
Rustam Vishnyakov
2018-03-27 18:10:09 +03:00
parent 30adb975c9
commit 772b52fcb8
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-api/src/com/intellij/application/options/CodeStyle.java
+2 -2
View File
@@ -214,7 +214,7 @@ public class CodeStyle {
/**
* @return A global application-level line separator. By default line separator is the same as defined in the system.
*/
public String getDefaultLineSeparator() {
public static String getDefaultLineSeparator() {
return getDefaultSettings().getLineSeparator();
}
@@ -222,7 +222,7 @@ public class CodeStyle {
* @param project The project to get a configured line separator for.
* @return The line separator configured for the project or system line separator if not defined.
*/
public String getLineSeparator(@NotNull Project project) {
public static String getLineSeparator(@NotNull Project project) {
return getSettings(project).getLineSeparator();
}
plugins/editorconfig/src/org/editorconfig/Utils.java
+3 -3
View File
@@ -1,6 +1,6 @@
package org.editorconfig;
import com.intellij.codeStyle.CodeStyleFacade;
import com.intellij.application.options.CodeStyle;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.ex.EditorSettingsExternalizable;
@@ -18,8 +18,8 @@ import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
import com.intellij.psi.search.FileTypeIndex;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.util.LineSeparator;
import org.editorconfig.configmanagement.EditorConfigIndentOptionsProvider;
import org.editorconfig.configmanagement.DocumentSettingsManager;
import org.editorconfig.configmanagement.EditorConfigIndentOptionsProvider;
import org.editorconfig.configmanagement.EncodingManager;
import org.editorconfig.configmanagement.LineEndingsManager;
import org.editorconfig.core.EditorConfig.OutPair;
@@ -107,7 +107,7 @@ public class Utils {
}
private static String getLineEndings(Project project) {
final String separator = CodeStyleFacade.getInstance(project).getLineSeparator();
final String separator = CodeStyle.getLineSeparator(project);
for (LineSeparator s : LineSeparator.values()) {
if (separator.equals(s.getSeparatorString())) {
return LineEndingsManager.lineEndingsKey + "=" + s.name().toLowerCase(Locale.US) + "\n";