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

Rename FileEncodingProvider -> Utf8BomOptionProvider (IDEA-CR-62531)

Browse Source 
GitOrigin-RevId: 87f2a2b93e797b496cb5f8822ea1bc55d03a0e26
This commit is contained in:
Rustam Vishnyakov
2020-05-14 18:22:39 +00:00
committed by intellij-monorepo-bot
parent e19cf49315
commit 0b409db580
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-api/src/com/intellij/openapi/vfs/encoding/FileEncodingProvider.java → platform/core-api/src/com/intellij/openapi/vfs/encoding/Utf8BomOptionProvider.java
+3 -3
View File
@@ -6,10 +6,10 @@ import com.intellij.openapi.vfs.VirtualFile;
import org.jetbrains.annotations.NotNull;
/**
* Allows to overwrite project level encoding settings for a specific virtual file.
* Allows to overwrite project level UTF-8 BOM option for a specific virtual file.
*/
public interface FileEncodingProvider {
ExtensionPointName<FileEncodingProvider> EP_NAME = ExtensionPointName.create("com.intellij.fileEncodingProvider");
public interface Utf8BomOptionProvider {
ExtensionPointName<Utf8BomOptionProvider> EP_NAME = ExtensionPointName.create("com.intellij.utf8BomOptionProvider");
/**
* @param file The file to check.
platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/PersistentFSImpl.java
+2 -2
View File
@@ -19,7 +19,7 @@ import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.*;
import com.intellij.openapi.vfs.encoding.EncodingManager;
import com.intellij.openapi.vfs.encoding.EncodingProjectManager;
import com.intellij.openapi.vfs.encoding.FileEncodingProvider;
import com.intellij.openapi.vfs.encoding.Utf8BomOptionProvider;
import com.intellij.openapi.vfs.ex.temp.TempFileSystem;
import com.intellij.openapi.vfs.impl.local.LocalFileSystemImpl;
import com.intellij.openapi.vfs.impl.win32.Win32LocalFileSystem;
@@ -487,7 +487,7 @@ public final class PersistentFSImpl extends PersistentFS implements Disposable {
}
private static boolean isUtf8BomRequired(@NotNull VirtualFile file) {
for (FileEncodingProvider encodingProvider : FileEncodingProvider.EP_NAME.getExtensionList()) {
for (Utf8BomOptionProvider encodingProvider : Utf8BomOptionProvider.EP_NAME.getExtensionList()) {
if (encodingProvider.shouldAddBOMForNewUtf8File(file)) {
return true;
}
platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml
+1 -1
View File
@@ -381,6 +381,6 @@
<extensionPoint name="iconDescriptionBundle" beanClass="com.intellij.ui.IconDescriptionBundleEP" dynamic="true"/>
<extensionPoint name="fileEncodingProvider" interface="com.intellij.openapi.vfs.encoding.FileEncodingProvider" dynamic="true"/>
<extensionPoint name="utf8BomOptionProvider" interface="com.intellij.openapi.vfs.encoding.Utf8BomOptionProvider" dynamic="true"/>
</extensionPoints>
</idea-plugin>
plugins/editorconfig/resources/META-INF/plugin.xml
+1 -1
View File
@@ -90,7 +90,7 @@ To create an EditorConfig file in a directory, right-click this directory and se
<fileDocumentManagerListener implementation="org.editorconfig.configmanagement.ConfigEncodingManager"/>
<fileDocumentManagerListener implementation="org.editorconfig.configmanagement.LineEndingsManager"/>
<fileEncodingProvider implementation="org.editorconfig.configmanagement.EditorConfigFileEncodingProvider"/>
<utf8BomOptionProvider implementation="org.editorconfig.configmanagement.EditorConfigUtf8BomOptionProvider"/>
<!-- Inspections -->
<lang.inspectionSuppressor
plugins/editorconfig/src/org/editorconfig/configmanagement/EditorConfigFileEncodingProvider.java → plugins/editorconfig/src/org/editorconfig/configmanagement/EditorConfigUtf8BomOptionProvider.java
+2 -2
View File
@@ -4,7 +4,7 @@ package org.editorconfig.configmanagement;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.project.ProjectLocator;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.encoding.FileEncodingProvider;
import com.intellij.openapi.vfs.encoding.Utf8BomOptionProvider;
import org.editorconfig.Utils;
import org.editorconfig.core.EditorConfig;
import org.editorconfig.plugincomponents.SettingsProviderComponent;
@@ -12,7 +12,7 @@ import org.jetbrains.annotations.NotNull;
import java.util.List;
public class EditorConfigFileEncodingProvider implements FileEncodingProvider {
public class EditorConfigUtf8BomOptionProvider implements Utf8BomOptionProvider {
@Override
public boolean shouldAddBOMForNewUtf8File(@NotNull VirtualFile file) {
Project project = ProjectLocator.getInstance().guessProjectForFile(file);