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

show file-level annotation for EC instead of notification

Browse Source 
#WEB-14144 fixed
This commit is contained in:
Dennis Ushakov
2014-11-26 18:19:37 +03:00
parent 3b6014f740
commit 507aaad51e
10 changed files with 159 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/editorconfig/src/icons/EditorconfigIcons.java
+17
View File
@@ -0,0 +1,17 @@
package icons;
import com.intellij.openapi.util.IconLoader;
import javax.swing.*;
/**
* NOTE THIS FILE IS AUTO-GENERATED
* DO NOT EDIT IT BY HAND, run build/scripts/icons.gant instead
*/
public class EditorconfigIcons {
private static Icon load(String path) {
return IconLoader.getIcon(path, EditorconfigIcons.class);
}
public static final Icon Editorconfig = load("/org/editorconfig/icons/editorconfig.png"); // 16x16
}
plugins/editorconfig/src/org/editorconfig/Utils.java
-4
View File
@@ -27,10 +27,6 @@ public class Utils {
EditorConfigNotifier.getInstance().error(project, configValue, "\"" + configValue + "\" is not a valid value" + (!configKey.isEmpty() ? " for " + configKey : "") + " for file " + filePath);
}
public static void appliedConfigMessage(Project project, String configValue, String configKey, String filePath) {
EditorConfigNotifier.getInstance().info(project, "Applied .editorconfig settings");
}
public static String getFilePath(Project project, VirtualFile file) {
if (!file.isInLocalFileSystem()) {
return project.getBasePath() + "/" + file.getNameWithoutExtension() + "." + file.getFileType().getDefaultExtension();
plugins/editorconfig/src/org/editorconfig/annotations/EditorConfigAnnotator.java
+126
View File
@@ -0,0 +1,126 @@
package org.editorconfig.annotations;
import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer;
import com.intellij.codeInsight.intention.IntentionAction;
import com.intellij.ide.util.PropertiesComponent;
import com.intellij.lang.annotation.Annotation;
import com.intellij.lang.annotation.AnnotationHolder;
import com.intellij.lang.annotation.Annotator;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.markup.GutterIconRenderer;
import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.codeStyle.CodeStyleSettings;
import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.ObjectUtils;
import icons.EditorconfigIcons;
import org.editorconfig.Utils;
import org.editorconfig.core.EditorConfig;
import org.editorconfig.plugincomponents.SettingsProviderComponent;
import org.editorconfig.settings.EditorConfigSettings;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import java.util.List;
/**
* @author Dennis.Ushakov
*/
public class EditorConfigAnnotator implements Annotator {
private static final String EDITOR_CONFIG_ACCEPTED = "editor.config.accepted";
@Override
public void annotate(@NotNull PsiElement element, @NotNull AnnotationHolder holder) {
PsiFile file = ObjectUtils.tryCast(element, PsiFile.class);
if (file == null) {
return;
}
final Project project = file.getProject();
final CodeStyleSettings settings = CodeStyleSettingsManager.getInstance(project).getCurrentSettings();
if (!Utils.isEnabled(settings) || PropertiesComponent.getInstance(project).getBoolean(EDITOR_CONFIG_ACCEPTED, false)) return;
final List<EditorConfig.OutPair> pairs = SettingsProviderComponent.getInstance().getOutPairs(project, Utils.getFilePath(project, file.getVirtualFile()));
if (!pairs.isEmpty()) {
final Annotation annotation = holder.createInfoAnnotation(file, "EditorConfig is overriding Code Style settings for this file");
annotation.setFileLevelAnnotation(true);
annotation.setGutterIconRenderer(new MyGutterIconRenderer());
annotation.registerFix(new IntentionAction() {
@NotNull
@Override
public String getText() {
return "Disable EditorConfig support";
}
@NotNull
@Override
public String getFamilyName() {
return "EditorConfig";
}
@Override
public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file) {
return true;
}
@Override
public void invoke(@NotNull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
settings.getCustomSettings(EditorConfigSettings.class).ENABLED = false;
DaemonCodeAnalyzer.getInstance(project).restart();
}
@Override
public boolean startInWriteAction() {
return false;
}
});
annotation.registerFix(new IntentionAction() {
@NotNull
@Override
public String getText() {
return "Dismiss";
}
@NotNull
@Override
public String getFamilyName() {
return "EditorConfig";
}
@Override
public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file) {
return false;
}
@Override
public void invoke(@NotNull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
PropertiesComponent.getInstance(project).setValue(EDITOR_CONFIG_ACCEPTED, "true");
DaemonCodeAnalyzer.getInstance(project).restart();
}
@Override
public boolean startInWriteAction() {
return false;
}
});
}
}
private static class MyGutterIconRenderer extends GutterIconRenderer {
@NotNull
@Override
public Icon getIcon() {
return EditorconfigIcons.Editorconfig;
}
@Override
public boolean equals(Object obj) {
return obj instanceof MyGutterIconRenderer;
}
@Override
public int hashCode() {
return EditorconfigIcons.Editorconfig.hashCode();
}
}
}
plugins/editorconfig/src/org/editorconfig/configmanagement/EditorConfigIndentOptionsProvider.java
-4
View File
@@ -66,7 +66,6 @@ public class EditorConfigIndentOptionsProvider extends FileIndentOptionsProvider
final String calculatedTabWidth = calculateTabWidth(tabWidth, indentSize);
if (!calculatedIndentSize.isEmpty()) {
if (applyIndentSize(indentOptions, calculatedIndentSize)) {
Utils.appliedConfigMessage(project, calculatedIndentSize, indentSizeKey, filePath);
changed = true;
} else {
Utils.invalidConfigMessage(project, calculatedIndentSize, indentSizeKey, filePath);
@@ -74,7 +73,6 @@ public class EditorConfigIndentOptionsProvider extends FileIndentOptionsProvider
}
if (!calculatedContinuationSize.isEmpty()) {
if (applyContinuationIndentSize(indentOptions, calculatedContinuationSize)) {
Utils.appliedConfigMessage(project, calculatedContinuationSize, continuationSizeKey, filePath);
changed = true;
}
else {
@@ -83,7 +81,6 @@ public class EditorConfigIndentOptionsProvider extends FileIndentOptionsProvider
}
if (!calculatedTabWidth.isEmpty()) {
if (applyTabWidth(indentOptions, calculatedTabWidth)) {
Utils.appliedConfigMessage(project, calculatedTabWidth, tabWidthKey, filePath);
changed = true;
}
else {
@@ -92,7 +89,6 @@ public class EditorConfigIndentOptionsProvider extends FileIndentOptionsProvider
}
if (!indentStyle.isEmpty()) {
if (applyIndentStyle(indentOptions, indentStyle)) {
Utils.appliedConfigMessage(project, indentStyle, indentStyleKey, filePath);
changed = true;
}
else {
plugins/editorconfig/src/org/editorconfig/configmanagement/EditorSettingsManager.java
-1
View File
@@ -84,7 +84,6 @@ public class EditorSettingsManager extends FileDocumentManagerAdapter {
}
else {
file.putUserData(userDataKey, data);
Utils.appliedConfigMessage(myProject, configValue, editorConfigKey, file.getCanonicalPath());
}
}
}
plugins/editorconfig/src/org/editorconfig/configmanagement/EncodingManager.java
-1
View File
@@ -67,7 +67,6 @@ public class EncodingManager extends FileDocumentManagerAdapter {
if (newCharset != null) {
if (Comparing.equal(newCharset, file.getCharset())) return;
encodingProjectManager.setEncoding(file, newCharset);
Utils.appliedConfigMessage(myProject, charset, charsetKey, filePath);
} else {
Utils.invalidConfigMessage(myProject, charset, charsetKey, filePath);
}
plugins/editorconfig/src/org/editorconfig/configmanagement/LineEndingsManager.java
-1
View File
@@ -84,7 +84,6 @@ public class LineEndingsManager extends FileDocumentManagerAdapter {
statusBarUpdated = true;
updateStatusBar();
}
Utils.appliedConfigMessage(myProject, lineEndings, lineEndingsKey, filePath);
}
}
catch (IllegalArgumentException e) {
plugins/editorconfig/src/org/editorconfig/icons/editorconfig.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 584 B

plugins/editorconfig/src/org/editorconfig/icons/editorconfig@2x.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

plugins/editorconfig/src/org/editorconfig/plugincomponents/SettingsProviderComponent.java
+16 -1
View File
@@ -1,7 +1,11 @@
package org.editorconfig.plugincomponents;
import com.intellij.lang.LanguageAnnotators;
import com.intellij.openapi.components.ApplicationComponent;
import com.intellij.openapi.components.ServiceManager;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.fileTypes.FileTypeManager;
import com.intellij.openapi.fileTypes.LanguageFileType;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleManager;
import com.intellij.openapi.project.Project;
@@ -13,6 +17,7 @@ import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.util.CachedValueProvider;
import com.intellij.psi.util.CachedValuesManager;
import org.editorconfig.Utils;
import org.editorconfig.annotations.EditorConfigAnnotator;
import org.editorconfig.core.EditorConfig;
import org.editorconfig.core.EditorConfig.OutPair;
import org.editorconfig.core.EditorConfigException;
@@ -24,8 +29,18 @@ import java.util.*;
public class SettingsProviderComponent implements ApplicationComponent {
private EditorConfig editorConfig;
public SettingsProviderComponent() {
public SettingsProviderComponent(FileTypeManager manager) {
editorConfig = new EditorConfig();
registerAnnotator(manager);
}
public void registerAnnotator(FileTypeManager manager) {
final EditorConfigAnnotator annotator = new EditorConfigAnnotator();
for (FileType type : manager.getRegisteredFileTypes()) {
if (type instanceof LanguageFileType) {
LanguageAnnotators.INSTANCE.addExplicitExtension(((LanguageFileType)type).getLanguage(), annotator);
}
}
}
public static SettingsProviderComponent getInstance() {