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

Cleanup (typo)

Browse Source
This commit is contained in:
Roman Shevchenko
2016-03-04 19:05:06 +01:00
parent eedfac90df
commit ddb631cf15
14 changed files with 39 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/daemon/impl/JavaLineMarkerProvider.java
+6 -6
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -205,7 +205,7 @@ public class JavaLineMarkerProvider extends LineMarkerProviderDescriptor {
}
PsiElement range = getMethodRange(method);
ArrowUpLineMarkerInfo upInfo = new ArrowUpLineMarkerInfo(range, AllIcons.Gutter.ImplementingMethod, MarkerType.SIBLING_OVERRIDING_METHOD,
Pass.UPDATE_OVERRIDEN_MARKERS);
Pass.UPDATE_OVERRIDDEN_MARKERS);
LineMarkerInfo info = NavigateAction.setNavigateAction(upInfo, "Go to super method", IdeActions.ACTION_GOTO_SUPER);
result.add(info);
}
@@ -254,7 +254,7 @@ public class JavaLineMarkerProvider extends LineMarkerProviderDescriptor {
}
MarkerType type = MarkerType.SUBCLASSED_CLASS;
LineMarkerInfo info = new LineMarkerInfo<PsiElement>(range, range.getTextRange(),
icon, Pass.UPDATE_OVERRIDEN_MARKERS, type.getTooltip(),
icon, Pass.UPDATE_OVERRIDDEN_MARKERS, type.getTooltip(),
type.getNavigationHandler(),
GutterIconRenderer.Alignment.RIGHT);
NavigateAction.setNavigateAction(info, aClass.isInterface() ? "Go to implementation(s)" : "Go to subclass(es)", IdeActions.ACTION_GOTO_IMPLEMENTATION);
@@ -313,9 +313,9 @@ public class JavaLineMarkerProvider extends LineMarkerProviderDescriptor {
final MarkerType type = MarkerType.OVERRIDDEN_METHOD;
final Icon icon = overrides ? AllIcons.Gutter.OverridenMethod : AllIcons.Gutter.ImplementedMethod;
LineMarkerInfo<PsiElement> info = new LineMarkerInfo<PsiElement>(range, range.getTextRange(),
icon, Pass.UPDATE_OVERRIDEN_MARKERS, type.getTooltip(),
type.getNavigationHandler(),
GutterIconRenderer.Alignment.RIGHT);
icon, Pass.UPDATE_OVERRIDDEN_MARKERS, type.getTooltip(),
type.getNavigationHandler(),
GutterIconRenderer.Alignment.RIGHT);
NavigateAction.setNavigateAction(info, overrides ? "Go to overriding methods" : "Go to implementation(s)", IdeActions.ACTION_GOTO_IMPLEMENTATION);
result.add(info);
}
java/java-impl/src/com/intellij/codeInsight/daemon/impl/RecursiveCallLineMarkerProvider.java
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -94,7 +94,7 @@ public class RecursiveCallLineMarkerProvider extends LineMarkerProviderDescripto
super(methodCall,
methodCall.getTextRange(),
AllIcons.Gutter.RecursiveMethod,
Pass.UPDATE_OVERRIDEN_MARKERS,
Pass.UPDATE_OVERRIDDEN_MARKERS,
FunctionUtil.<PsiMethodCallExpression, String>constant("Recursive call"),
null,
GutterIconRenderer.Alignment.RIGHT
java/testFramework/src/com/intellij/codeInsight/daemon/DaemonAnalyzerTestCase.java
+3 -3
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -333,7 +333,7 @@ public abstract class DaemonAnalyzerTestCase extends CodeInsightTestCase {
TIntArrayList toIgnore = new TIntArrayList();
if (!doTestLineMarkers()) {
toIgnore.add(Pass.UPDATE_OVERRIDEN_MARKERS);
toIgnore.add(Pass.UPDATE_OVERRIDDEN_MARKERS);
toIgnore.add(Pass.VISIBLE_LINE_MARKERS);
toIgnore.add(Pass.LINE_MARKERS);
}
@@ -347,7 +347,7 @@ public abstract class DaemonAnalyzerTestCase extends CodeInsightTestCase {
toIgnore.add(Pass.WHOLE_FILE_LOCAL_INSPECTIONS);
toIgnore.add(Pass.POPUP_HINTS);
toIgnore.add(Pass.UPDATE_ALL);
toIgnore.add(Pass.UPDATE_OVERRIDEN_MARKERS);
toIgnore.add(Pass.UPDATE_OVERRIDDEN_MARKERS);
toIgnore.add(Pass.VISIBLE_LINE_MARKERS);
}
platform/analysis-impl/src/com/intellij/codeHighlighting/Pass.java
+7 -3
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ public interface Pass {
int UPDATE_FOLDING = 1;
int POPUP_HINTS = 3;
int UPDATE_ALL = 4;
int UPDATE_OVERRIDEN_MARKERS = 6;
int UPDATE_OVERRIDDEN_MARKERS = 6;
int LOCAL_INSPECTIONS = 7;
int EXTERNAL_TOOLS = 8;
int WOLF = 9;
@@ -29,4 +29,8 @@ public interface Pass {
int WHOLE_FILE_LOCAL_INSPECTIONS = 12;
int LAST_PASS = WHOLE_FILE_LOCAL_INSPECTIONS;
}
/** @deprecated use {@link #UPDATE_OVERRIDDEN_MARKERS} (to be removed in IDEA 17) */
@SuppressWarnings({"unused", "SpellCheckingInspection"})
int UPDATE_OVERRIDEN_MARKERS = UPDATE_OVERRIDDEN_MARKERS;
}
platform/analysis-impl/src/com/intellij/codeHighlighting/TextEditorHighlightingPassRegistrar.java
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -88,7 +88,7 @@ public abstract class TextEditorHighlightingPassRegistrar {
case LAST:
//todo
ids = new int[]{Pass.UPDATE_ALL,
Pass.UPDATE_FOLDING, Pass.UPDATE_OVERRIDEN_MARKERS,
Pass.UPDATE_FOLDING, Pass.UPDATE_OVERRIDDEN_MARKERS,
Pass.EXTERNAL_TOOLS,
Pass.LOCAL_INSPECTIONS, Pass.POPUP_HINTS};
break;
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/SlowLineMarkersPassFactory.java
+4 -4
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@ import org.jetbrains.annotations.Nullable;
public class SlowLineMarkersPassFactory extends AbstractProjectComponent implements DirtyScopeTrackingHighlightingPassFactory {
public SlowLineMarkersPassFactory(Project project, TextEditorHighlightingPassRegistrar highlightingPassRegistrar) {
super(project);
highlightingPassRegistrar.registerTextEditorHighlightingPass(this, null, new int[]{Pass.UPDATE_ALL}, false, Pass.UPDATE_OVERRIDEN_MARKERS);
highlightingPassRegistrar.registerTextEditorHighlightingPass(this, null, new int[]{Pass.UPDATE_ALL}, false, Pass.UPDATE_OVERRIDDEN_MARKERS);
}
@Override
@@ -54,11 +54,11 @@ public class SlowLineMarkersPassFactory extends AbstractProjectComponent impleme
}
private static TextRange calculateRangeToProcess(Editor editor) {
return FileStatusMap.getDirtyTextRange(editor, Pass.UPDATE_OVERRIDEN_MARKERS);
return FileStatusMap.getDirtyTextRange(editor, Pass.UPDATE_OVERRIDDEN_MARKERS);
}
@Override
public int getPassId() {
return Pass.UPDATE_OVERRIDEN_MARKERS;
return Pass.UPDATE_OVERRIDDEN_MARKERS;
}
}
plugins/groovy/src/org/jetbrains/plugins/groovy/codeInsight/GroovyLineMarkerProvider.java
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -253,7 +253,7 @@ public class GroovyLineMarkerProvider extends JavaLineMarkerProvider {
final MarkerType type = element instanceof GrField ? GroovyMarkerTypes.OVERRIDEN_PROPERTY_TYPE
: GroovyMarkerTypes.GR_OVERRIDEN_METHOD;
LineMarkerInfo info = new LineMarkerInfo<PsiElement>(range, range.getTextRange(), icon, Pass.UPDATE_OVERRIDEN_MARKERS, type.getTooltip(),
LineMarkerInfo info = new LineMarkerInfo<PsiElement>(range, range.getTextRange(), icon, Pass.UPDATE_OVERRIDDEN_MARKERS, type.getTooltip(),
type.getNavigationHandler(), GutterIconRenderer.Alignment.RIGHT);
result.add(info);
}
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/JavaFxRelatedItemLineMarkerProvider.java
+2 -2
View File
@@ -77,8 +77,8 @@ public class JavaFxRelatedItemLineMarkerProvider extends RelatedItemLineMarkerPr
if (targets.isEmpty()) return;
result.add(new RelatedItemLineMarkerInfo<PsiField>(field, field.getNameIdentifier().getTextRange(),
AllIcons.FileTypes.Xml, Pass.UPDATE_OVERRIDEN_MARKERS, null,
new JavaFXIdIconNavigationHandler(), GutterIconRenderer.Alignment.LEFT,
AllIcons.FileTypes.Xml, Pass.UPDATE_OVERRIDDEN_MARKERS, null,
new JavaFXIdIconNavigationHandler(), GutterIconRenderer.Alignment.LEFT,
targets));
}
}
python/educational-python/src/com/jetbrains/python/edu/PyExecuteFileLineMarkerProvider.java
+1 -1
View File
@@ -61,7 +61,7 @@ public class PyExecuteFileLineMarkerProvider implements LineMarkerProvider {
Icon icon = PlatformUtils.isPyCharmEducational() ? AllIcons.Actions.Execute : actions.get(0).getTemplatePresentation().getIcon();
final LineMarkerInfo<PsiElement> markerInfo = new LineMarkerInfo<PsiElement>(
file, file.getTextRange(), icon, Pass.UPDATE_OVERRIDEN_MARKERS,
file, file.getTextRange(), icon, Pass.UPDATE_OVERRIDDEN_MARKERS,
new Function<PsiElement, String>() {
@Override
public String fun(PsiElement e) {
python/src/com/jetbrains/python/codeInsight/PyLineMarkerProvider.java
+3 -3
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -232,7 +232,7 @@ public class PyLineMarkerProvider implements LineMarkerProvider, PyLineSeparator
private static void collectInheritingClasses(final PyClass element, final Collection<LineMarkerInfo> result) {
if (PyClassInheritorsSearch.search(element, false).findFirst() != null) {
result
.add(new LineMarkerInfo<PyClass>(element, element.getTextOffset(), AllIcons.Gutter.OverridenMethod, Pass.UPDATE_OVERRIDEN_MARKERS,
.add(new LineMarkerInfo<PyClass>(element, element.getTextOffset(), AllIcons.Gutter.OverridenMethod, Pass.UPDATE_OVERRIDDEN_MARKERS,
ourSubclassTooltipProvider, ourSubclassNavigator));
}
}
@@ -264,7 +264,7 @@ public class PyLineMarkerProvider implements LineMarkerProvider, PyLineSeparator
if (candidates.isEmpty()) break;
}
for (PyFunction func : overridden) {
result.add(new LineMarkerInfo<PyFunction>(func, func.getTextOffset(), AllIcons.Gutter.OverridenMethod, Pass.UPDATE_OVERRIDEN_MARKERS,
result.add(new LineMarkerInfo<PyFunction>(func, func.getTextOffset(), AllIcons.Gutter.OverridenMethod, Pass.UPDATE_OVERRIDDEN_MARKERS,
ourOverridingMethodTooltipProvider,
ourOverridingMethodNavigator));
}
python/src/com/jetbrains/python/codeInsight/userSkeletons/PyUserSkeletonsLineMarkerProvider.java
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -54,7 +54,7 @@ public class PyUserSkeletonsLineMarkerProvider implements LineMarkerProvider {
final PyElement skeleton = getUserSkeleton(element);
if (skeleton != null) {
result.add(new LineMarkerInfo<PsiElement>(
element, element.getTextRange(), ICON, Pass.UPDATE_OVERRIDEN_MARKERS,
element, element.getTextRange(), ICON, Pass.UPDATE_OVERRIDDEN_MARKERS,
new Function<PsiElement, String>() {
@Override
public String fun(PsiElement e) {
python/src/com/jetbrains/python/pyi/PyiRelatedItemLineMarkerProvider.java
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -50,7 +50,7 @@ public class PyiRelatedItemLineMarkerProvider extends RelatedItemLineMarkerProvi
if (pythonStub != null) {
final List<GotoRelatedItem> relatedItems = GotoRelatedItem.createItems(Collections.singletonList(pythonStub));
result.add(new RelatedItemLineMarkerInfo<PsiElement>(
element, element.getTextRange(), ICON, Pass.UPDATE_OVERRIDEN_MARKERS,
element, element.getTextRange(), ICON, Pass.UPDATE_OVERRIDDEN_MARKERS,
new Function<PsiElement, String>() {
@Override
public String fun(PsiElement element) {
xml/dom-impl/src/com/intellij/codeInsight/navigation/NavigationGutterIconBuilder.java
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -210,7 +210,7 @@ public class NavigationGutterIconBuilder<T> {
final String tooltip = renderer.getTooltipText();
NotNullLazyValue<Collection<? extends GotoRelatedItem>> gotoTargets = createGotoTargetsThunk(myLazy, myGotoRelatedItemProvider,
evaluateAndForget(myTargets));
return new RelatedItemLineMarkerInfo<PsiElement>(element, element.getTextRange(), renderer.getIcon(), Pass.UPDATE_OVERRIDEN_MARKERS,
return new RelatedItemLineMarkerInfo<PsiElement>(element, element.getTextRange(), renderer.getIcon(), Pass.UPDATE_OVERRIDDEN_MARKERS,
tooltip == null ? null : new ConstantFunction<PsiElement, String>(tooltip),
renderer.isNavigateAction() ? renderer : null, renderer.getAlignment(),
gotoTargets);
xml/relaxng/test/org/intellij/plugins/relaxNG/HighlightingTestBase.java
+1 -1
View File
@@ -181,7 +181,7 @@ public abstract class HighlightingTestBase extends UsefulTestCase implements Ide
Pass.POPUP_HINTS,
Pass.UPDATE_ALL,
Pass.UPDATE_FOLDING,
Pass.UPDATE_OVERRIDEN_MARKERS,
Pass.UPDATE_OVERRIDDEN_MARKERS,
Pass.VISIBLE_LINE_MARKERS,
} : new int[]{Pass.EXTERNAL_TOOLS};
return CodeInsightTestFixtureImpl.instantiateAndRun(myTestFixture.getFile(), editor, ignore, false);