diff --git a/plugins/editorconfig/src/org/editorconfig/configmanagement/DocumentSettingsManager.java b/plugins/editorconfig/src/org/editorconfig/configmanagement/DocumentSettingsManager.java index 9560652915ee..0407840a5d3e 100644 --- a/plugins/editorconfig/src/org/editorconfig/configmanagement/DocumentSettingsManager.java +++ b/plugins/editorconfig/src/org/editorconfig/configmanagement/DocumentSettingsManager.java @@ -1,6 +1,7 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.editorconfig.configmanagement; +import com.intellij.application.options.CodeStyle; import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.ex.EditorSettingsExternalizable; import com.intellij.openapi.editor.impl.TrailingSpacesStripper; @@ -9,7 +10,6 @@ import com.intellij.openapi.fileEditor.FileDocumentManagerListener; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Key; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.psi.codeStyle.CodeStyleSettingsManager; import org.editorconfig.Utils; import org.editorconfig.core.EditorConfig; import org.editorconfig.plugincomponents.SettingsProviderComponent; @@ -50,7 +50,7 @@ public class DocumentSettingsManager implements FileDocumentManagerListener { private void applySettings(VirtualFile file) { if (file == null) return; - if (!Utils.isEnabled(CodeStyleSettingsManager.getInstance(myProject).getCurrentSettings())) { + if (!Utils.isEnabled(CodeStyle.getSettings(myProject))) { file.putUserData(TrailingSpacesStripper.OVERRIDE_STRIP_TRAILING_SPACES_KEY, null); file.putUserData(TrailingSpacesStripper.OVERRIDE_ENSURE_NEWLINE_KEY, null); return;