MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-08 15:09:39 +07:00
Code Issues Packages Projects Releases Wiki Activity

cleanup: typo

Browse Source
This commit is contained in:
Alexey Kudravtsev
2013-04-26 14:30:24 +04:00
parent 1b2c40fb58
commit bfbc311d28
6 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
java/java-tests/testSrc/com/intellij/codeInsight/daemon/UnusedImportsTest.java
View File

@@ -1,6 +1,6 @@
package com.intellij.codeInsight.daemon;
import com.intellij.codeInsight.daemon.impl.analysis.FileHighlighingSetting;
import com.intellij.codeInsight.daemon.impl.analysis.FileHighlightingSetting;
import com.intellij.codeInsight.daemon.impl.analysis.HighlightingSettingsPerFile;
import com.intellij.codeInspection.LocalInspectionTool;
import com.intellij.codeInspection.unusedImport.UnusedImportLocalInspection;
@@ -16,14 +16,14 @@ public class UnusedImportsTest extends DaemonAnalyzerTestCase {
public void test1() throws Exception { doTest(); }
public void test2() throws Exception { doTest(); }
public void testWithHighlightingOff() throws Exception {
configureByFile(BASE_PATH + "/" + getTestName(false) + ".java");
final PsiFile file = getFile();
final HighlightingSettingsPerFile settingsPerFile = HighlightingSettingsPerFile.getInstance(myProject);
final FileHighlighingSetting oldSetting = settingsPerFile.getHighlightingSettingForRoot(file);
final FileHighlightingSetting oldSetting = settingsPerFile.getHighlightingSettingForRoot(file);
try {
settingsPerFile.setHighlightingSettingForRoot(file, FileHighlighingSetting.NONE);
settingsPerFile.setHighlightingSettingForRoot(file, FileHighlightingSetting.NONE);
doDoTest(true, false, false);
}
finally {

8
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/HectorComponent.java
View File

@@ -17,7 +17,7 @@
package com.intellij.codeInsight.daemon.impl;
import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer;
import com.intellij.codeInsight.daemon.impl.analysis.FileHighlighingSetting;
import com.intellij.codeInsight.daemon.impl.analysis.FileHighlightingSetting;
import com.intellij.codeInsight.daemon.impl.analysis.HighlightLevelUtil;
import com.intellij.lang.Language;
import com.intellij.openapi.Disposable;
@@ -284,13 +284,13 @@ public class HectorComponent extends JPanel {
assert root != null : "No root in " + viewProvider + " for " + language;
int value = slider.getValue();
if (value == 1) {
HighlightLevelUtil.forceRootHighlighting(root, FileHighlighingSetting.SKIP_HIGHLIGHTING);
HighlightLevelUtil.forceRootHighlighting(root, FileHighlightingSetting.SKIP_HIGHLIGHTING);
}
else if (value == 2) {
HighlightLevelUtil.forceRootHighlighting(root, FileHighlighingSetting.SKIP_INSPECTION);
HighlightLevelUtil.forceRootHighlighting(root, FileHighlightingSetting.SKIP_INSPECTION);
}
else {
HighlightLevelUtil.forceRootHighlighting(root, FileHighlighingSetting.FORCE_HIGHLIGHTING);
HighlightLevelUtil.forceRootHighlighting(root, FileHighlightingSetting.FORCE_HIGHLIGHTING);
}
}
final DaemonCodeAnalyzer analyzer = DaemonCodeAnalyzer.getInstance(myFile.getProject());

2
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/analysis/DefaultHighlightingSettingProvider.java
View File

@@ -37,5 +37,5 @@ public abstract class DefaultHighlightingSettingProvider {
public static final ExtensionPointName<DefaultHighlightingSettingProvider> EP_NAME = ExtensionPointName.create("com.intellij.defaultHighlightingSettingProvider");
@Nullable
public abstract FileHighlighingSetting getDefaultSetting(@NotNull Project project, @NotNull VirtualFile file);
public abstract FileHighlightingSetting getDefaultSetting(@NotNull Project project, @NotNull VirtualFile file);
}

2
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/analysis/FileHighlighingSetting.java → platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/analysis/FileHighlightingSetting.java
View File

@@ -16,7 +16,7 @@
package com.intellij.codeInsight.daemon.impl.analysis;
public enum FileHighlighingSetting {
public enum FileHighlightingSetting {
NONE,
SKIP_HIGHLIGHTING,
FORCE_HIGHLIGHTING,

10
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightLevelUtil.java
View File

@@ -43,8 +43,8 @@ public class HighlightLevelUtil {
final HighlightingSettingsPerFile component = HighlightingSettingsPerFile.getInstance(psiRoot.getProject());
if (component == null) return true;
final FileHighlighingSetting settingForRoot = component.getHighlightingSettingForRoot(psiRoot);
return settingForRoot != FileHighlighingSetting.SKIP_HIGHLIGHTING;
final FileHighlightingSetting settingForRoot = component.getHighlightingSettingForRoot(psiRoot);
return settingForRoot != FileHighlightingSetting.SKIP_HIGHLIGHTING;
}
public static boolean shouldInspect(@NotNull PsiElement psiRoot) {
@@ -65,11 +65,11 @@ public class HighlightLevelUtil {
final HighlightingSettingsPerFile component = HighlightingSettingsPerFile.getInstance(project);
if (component == null) return true;
final FileHighlighingSetting settingForRoot = component.getHighlightingSettingForRoot(psiRoot);
return settingForRoot != FileHighlighingSetting.SKIP_INSPECTION;
final FileHighlightingSetting settingForRoot = component.getHighlightingSettingForRoot(psiRoot);
return settingForRoot != FileHighlightingSetting.SKIP_INSPECTION;
}
public static void forceRootHighlighting(@NotNull PsiElement root, @NotNull FileHighlighingSetting level) {
public static void forceRootHighlighting(@NotNull PsiElement root, @NotNull FileHighlightingSetting level) {
final HighlightingSettingsPerFile component = HighlightingSettingsPerFile.getInstance(root.getProject());
if (component == null) return;

46
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightingSettingsPerFile.java
View File

@@ -43,57 +43,57 @@ public class HighlightingSettingsPerFile implements PersistentStateComponent<Ele
return ServiceManager.getService(project, HighlightingSettingsPerFile.class);
}
private final Map<VirtualFile, FileHighlighingSetting[]> myHighlightSettings = new HashMap<VirtualFile, FileHighlighingSetting[]>();
private final Map<VirtualFile, FileHighlightingSetting[]> myHighlightSettings = new HashMap<VirtualFile, FileHighlightingSetting[]>();
private final Map<PsiFile, InspectionProfile> myProfileSettings = new WeakHashMap<PsiFile, InspectionProfile>();
public FileHighlighingSetting getHighlightingSettingForRoot(@NotNull PsiElement root){
public FileHighlightingSetting getHighlightingSettingForRoot(@NotNull PsiElement root){
final PsiFile containingFile = root.getContainingFile();
final VirtualFile virtualFile = containingFile.getVirtualFile();
FileHighlighingSetting[] fileHighlighingSettings = myHighlightSettings.get(virtualFile);
FileHighlightingSetting[] fileHighlightingSettings = myHighlightSettings.get(virtualFile);
final int index = PsiUtilBase.getRootIndex(root);
if(fileHighlighingSettings == null || fileHighlighingSettings.length <= index) {
if(fileHighlightingSettings == null || fileHighlightingSettings.length <= index) {
return getDefaultHighlightingSetting(root.getProject(), virtualFile);
}
return fileHighlighingSettings[index];
return fileHighlightingSettings[index];
}
private static FileHighlighingSetting getDefaultHighlightingSetting(Project project, final VirtualFile virtualFile) {
private static FileHighlightingSetting getDefaultHighlightingSetting(Project project, final VirtualFile virtualFile) {
if (virtualFile != null) {
DefaultHighlightingSettingProvider[] providers = DefaultHighlightingSettingProvider.EP_NAME.getExtensions();
List<DefaultHighlightingSettingProvider> filtered =
DumbService.getInstance(project).filterByDumbAwareness(Arrays.asList(providers));
for (DefaultHighlightingSettingProvider p : filtered) {
FileHighlighingSetting setting = p.getDefaultSetting(project, virtualFile);
FileHighlightingSetting setting = p.getDefaultSetting(project, virtualFile);
if (setting != null) {
return setting;
}
}
}
return FileHighlighingSetting.FORCE_HIGHLIGHTING;
return FileHighlightingSetting.FORCE_HIGHLIGHTING;
}
public static FileHighlighingSetting[] getDefaults(@NotNull PsiFile file){
public static FileHighlightingSetting[] getDefaults(@NotNull PsiFile file){
final int rootsCount = file.getViewProvider().getLanguages().size();
final FileHighlighingSetting[] fileHighlighingSettings = new FileHighlighingSetting[rootsCount];
for (int i = 0; i < fileHighlighingSettings.length; i++) {
fileHighlighingSettings[i] = FileHighlighingSetting.FORCE_HIGHLIGHTING;
final FileHighlightingSetting[] fileHighlightingSettings = new FileHighlightingSetting[rootsCount];
for (int i = 0; i < fileHighlightingSettings.length; i++) {
fileHighlightingSettings[i] = FileHighlightingSetting.FORCE_HIGHLIGHTING;
}
return fileHighlighingSettings;
return fileHighlightingSettings;
}
public void setHighlightingSettingForRoot(@NotNull PsiElement root, @NotNull FileHighlighingSetting setting) {
public void setHighlightingSettingForRoot(@NotNull PsiElement root, @NotNull FileHighlightingSetting setting) {
final PsiFile containingFile = root.getContainingFile();
final VirtualFile virtualFile = containingFile.getVirtualFile();
if (virtualFile == null) return;
FileHighlighingSetting[] defaults = myHighlightSettings.get(virtualFile);
FileHighlightingSetting[] defaults = myHighlightSettings.get(virtualFile);
int rootIndex = PsiUtilBase.getRootIndex(root);
if (defaults != null && rootIndex >= defaults.length) defaults = null;
if (defaults == null) defaults = getDefaults(containingFile);
defaults[rootIndex] = setting;
boolean toRemove = true;
for (FileHighlighingSetting aDefault : defaults) {
if (aDefault != FileHighlighingSetting.NONE) toRemove = false;
for (FileHighlightingSetting aDefault : defaults) {
if (aDefault != FileHighlightingSetting.NONE) toRemove = false;
}
if (!toRemove) {
myHighlightSettings.put(virtualFile, defaults);
@@ -112,13 +112,13 @@ public class HighlightingSettingsPerFile implements PersistentStateComponent<Ele
if (url == null) continue;
final VirtualFile fileByUrl = VirtualFileManager.getInstance().findFileByUrl(url);
if (fileByUrl != null) {
final List<FileHighlighingSetting> settings = new ArrayList<FileHighlighingSetting>();
final List<FileHighlightingSetting> settings = new ArrayList<FileHighlightingSetting>();
int index = 0;
while (child.getAttributeValue(ROOT_ATT_PREFIX + index) != null) {
final String attributeValue = child.getAttributeValue(ROOT_ATT_PREFIX + index++);
settings.add(Enum.valueOf(FileHighlighingSetting.class, attributeValue));
settings.add(Enum.valueOf(FileHighlightingSetting.class, attributeValue));
}
myHighlightSettings.put(fileByUrl, settings.toArray(new FileHighlighingSetting[settings.size()]));
myHighlightSettings.put(fileByUrl, settings.toArray(new FileHighlightingSetting[settings.size()]));
}
}
}
@@ -126,15 +126,15 @@ public class HighlightingSettingsPerFile implements PersistentStateComponent<Ele
@Override
public Element getState() {
final Element element = new Element("state");
for (Map.Entry<VirtualFile, FileHighlighingSetting[]> entry : myHighlightSettings.entrySet()) {
for (Map.Entry<VirtualFile, FileHighlightingSetting[]> entry : myHighlightSettings.entrySet()) {
final Element child = new Element(SETTING_TAG);
final VirtualFile vFile = entry.getKey();
if (!vFile.isValid()) continue;
child.setAttribute(FILE_ATT, vFile.getUrl());
for (int i = 0; i < entry.getValue().length; i++) {
final FileHighlighingSetting fileHighlighingSetting = entry.getValue()[i];
child.setAttribute(ROOT_ATT_PREFIX + i, fileHighlighingSetting.toString());
final FileHighlightingSetting fileHighlightingSetting = entry.getValue()[i];
child.setAttribute(ROOT_ATT_PREFIX + i, fileHighlightingSetting.toString());
}
element.addContent(child);
}