From c821ba04cbfd9075827eb5ba37fd69cb93af6172 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Wed, 9 Oct 2013 17:13:58 +0400 Subject: [PATCH] moved to analysis --- .../InconsistentLineSeparatorsInspection.java | 11 +++-------- .../AbstractConvertLineSeparatorsAction.java | 17 ++++++++--------- .../codeInspection/LossyEncodingInspection.java | 3 +-- 3 files changed, 12 insertions(+), 19 deletions(-) rename platform/{platform-impl => analysis-impl}/src/com/intellij/codeStyle/InconsistentLineSeparatorsInspection.java (91%) rename platform/{platform-impl => editor-ui-ex}/src/com/intellij/codeStyle/AbstractConvertLineSeparatorsAction.java (90%) diff --git a/platform/platform-impl/src/com/intellij/codeStyle/InconsistentLineSeparatorsInspection.java b/platform/analysis-impl/src/com/intellij/codeStyle/InconsistentLineSeparatorsInspection.java similarity index 91% rename from platform/platform-impl/src/com/intellij/codeStyle/InconsistentLineSeparatorsInspection.java rename to platform/analysis-impl/src/com/intellij/codeStyle/InconsistentLineSeparatorsInspection.java index de31bc2d7d92..97e0261987e4 100644 --- a/platform/platform-impl/src/com/intellij/codeStyle/InconsistentLineSeparatorsInspection.java +++ b/platform/analysis-impl/src/com/intellij/codeStyle/InconsistentLineSeparatorsInspection.java @@ -19,6 +19,7 @@ import com.intellij.codeInspection.LocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; import com.intellij.codeInspection.ProblemDescriptor; import com.intellij.codeInspection.ProblemsHolder; +import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.openapi.fileEditor.impl.LoadTextUtil; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; @@ -46,10 +47,7 @@ public class InconsistentLineSeparatorsInspection extends LocalInspectionTool { } final Project project = holder.getProject(); - final String projectLineSeparator = CodeStyleFacade.getInstance(project).getLineSeparator(); - if (projectLineSeparator == null) { - return; - } + final String projectLineSeparator = FileDocumentManager.getInstance().getLineSeparator(null, project); final VirtualFile virtualFile = file.getVirtualFile(); if (virtualFile == null || !AbstractConvertLineSeparatorsAction.shouldProcess(virtualFile, project)) { @@ -88,10 +86,7 @@ public class InconsistentLineSeparatorsInspection extends LocalInspectionTool { return; } - final String lineSeparator = CodeStyleFacade.getInstance(project).getLineSeparator(); - if (lineSeparator == null) { - return; - } + final String lineSeparator = FileDocumentManager.getInstance().getLineSeparator(null, project); final VirtualFile virtualFile = ((PsiFile)psiElement).getVirtualFile(); if (virtualFile != null) { diff --git a/platform/platform-impl/src/com/intellij/codeStyle/AbstractConvertLineSeparatorsAction.java b/platform/editor-ui-ex/src/com/intellij/codeStyle/AbstractConvertLineSeparatorsAction.java similarity index 90% rename from platform/platform-impl/src/com/intellij/codeStyle/AbstractConvertLineSeparatorsAction.java rename to platform/editor-ui-ex/src/com/intellij/codeStyle/AbstractConvertLineSeparatorsAction.java index d09b3a2643a9..8f54a068385a 100644 --- a/platform/platform-impl/src/com/intellij/codeStyle/AbstractConvertLineSeparatorsAction.java +++ b/platform/editor-ui-ex/src/com/intellij/codeStyle/AbstractConvertLineSeparatorsAction.java @@ -21,12 +21,12 @@ import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.editor.Document; import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.openapi.fileEditor.impl.LoadTextUtil; -import com.intellij.openapi.fileTypes.FileTypeManager; +import com.intellij.openapi.fileTypes.FileTypeRegistry; import com.intellij.openapi.module.Module; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.FileIndexFacade; import com.intellij.openapi.util.text.StringUtil; -import com.intellij.openapi.vfs.VfsUtil; +import com.intellij.openapi.vfs.VfsUtilCore; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.LineSeparator; import com.intellij.util.Processor; @@ -40,14 +40,13 @@ import java.io.IOException; * @author Nikolai Matveev */ public abstract class AbstractConvertLineSeparatorsAction extends AnAction { - - private static Logger LOG = Logger.getInstance("#com.intellij.codeStyle.AbstractConvertLineSeparatorsAction"); + private static final Logger LOG = Logger.getInstance("#com.intellij.codeStyle.AbstractConvertLineSeparatorsAction"); @NotNull private final String mySeparator; protected AbstractConvertLineSeparatorsAction(@Nullable String text, @NotNull LineSeparator separator) { - this(separator.toString() + " - " + text, separator.getSeparatorString()); + this(separator + " - " + text, separator.getSeparatorString()); } protected AbstractConvertLineSeparatorsAction(@Nullable String text, @NotNull String separator) { @@ -98,9 +97,9 @@ public abstract class AbstractConvertLineSeparatorsAction extends AnAction { projectVirtualDirectory = null; } - final FileTypeManager fileTypeManager = FileTypeManager.getInstance(); + final FileTypeRegistry fileTypeManager = FileTypeRegistry.getInstance(); for (VirtualFile file : virtualFiles) { - VfsUtil.processFilesRecursively( + VfsUtilCore.processFilesRecursively( file, new Processor() { @Override @@ -115,7 +114,7 @@ public abstract class AbstractConvertLineSeparatorsAction extends AnAction { @Override public Boolean convert(VirtualFile dir) { return !dir.equals(projectVirtualDirectory) - && !fileTypeManager.isFileIgnored(dir.getName()); // Exclude files like '.git' + && !fileTypeManager.isFileIgnored(dir); // Exclude files like '.git' } } ); @@ -125,7 +124,7 @@ public abstract class AbstractConvertLineSeparatorsAction extends AnAction { public static boolean shouldProcess(@NotNull VirtualFile file, @NotNull Project project) { if (file.isDirectory() || !file.isWritable() - || FileTypeManager.getInstance().isFileIgnored(file) + || FileTypeRegistry.getInstance().isFileIgnored(file) || file.getFileType().isBinary() || file.equals(project.getProjectFile()) || file.equals(project.getWorkspaceFile())) diff --git a/platform/lang-impl/src/com/intellij/codeInspection/LossyEncodingInspection.java b/platform/lang-impl/src/com/intellij/codeInspection/LossyEncodingInspection.java index c4dbc5663add..7ec8be737e37 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/LossyEncodingInspection.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/LossyEncodingInspection.java @@ -22,7 +22,6 @@ */ package com.intellij.codeInspection; -import com.intellij.codeStyle.CodeStyleFacade; import com.intellij.ide.DataManager; import com.intellij.lang.injection.InjectedLanguageManager; import com.intellij.lang.properties.charset.Native2AsciiCharset; @@ -153,7 +152,7 @@ public class LossyEncodingInspection extends LocalInspectionTool { if (separator == null) { separator = documentManager.isDocumentUnsaved(document) ? FileDocumentManagerImpl.getLineSeparator(document, virtualFile) : - CodeStyleFacade.getInstance(project).getLineSeparator(); + FileDocumentManager.getInstance().getLineSeparator(null, project); } String toSave = StringUtil.convertLineSeparators(text, separator); byte[] bom = virtualFile.getBOM();