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

Revert "DocumentationProvider @NotNull"

Browse Source 
This reverts commit 413cee78
This commit is contained in:
peter
2018-10-23 15:55:13 +02:00
parent 4a31ed81f3
commit 91075ca81d
22 changed files with 22 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
json/src/com/jetbrains/jsonSchema/impl/JsonSchemaDocumentationProvider.java
+1 -1
View File
@@ -177,7 +177,7 @@ public class JsonSchemaDocumentationProvider implements DocumentationProvider {
@Nullable
@Override
public PsiElement getDocumentationElementForLookupItem(@NotNull PsiManager psiManager, @NotNull Object object, @NotNull PsiElement element) {
public PsiElement getDocumentationElementForLookupItem(PsiManager psiManager, Object object, PsiElement element) {
if ((element instanceof JsonProperty || isWhitespaceOrComment(element) && element.getParent() instanceof JsonObject) && object instanceof String) {
return new FakeDocElement(element instanceof JsonProperty ? ((JsonProperty)element).getNameElement() : element, StringUtil.unquoteString((String)object));
}
platform/lang-api/src/com/intellij/lang/documentation/CompositeDocumentationProvider.java
+1 -1
View File
@@ -143,7 +143,7 @@ public class CompositeDocumentationProvider extends DocumentationProviderEx impl
}
@Override
public PsiElement getDocumentationElementForLookupItem(@NotNull PsiManager psiManager, @NotNull Object object, @NotNull PsiElement element) {
public PsiElement getDocumentationElementForLookupItem(PsiManager psiManager, Object object, PsiElement element) {
for (DocumentationProvider provider : getAllProviders()) {
PsiElement result = provider.getDocumentationElementForLookupItem(psiManager, object, element);
if (result != null) {
platform/lang-api/src/com/intellij/lang/documentation/DocumentationProvider.java
+1 -2
View File
@@ -22,7 +22,6 @@ import com.intellij.openapi.extensions.ExtensionPointName;
import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiManager;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.List;
@@ -91,7 +90,7 @@ public interface DocumentationProvider {
String generateDoc(PsiElement element, @Nullable PsiElement originalElement);
@Nullable
PsiElement getDocumentationElementForLookupItem(@NotNull PsiManager psiManager, @NotNull Object object, @NotNull PsiElement element);
PsiElement getDocumentationElementForLookupItem(PsiManager psiManager, Object object, PsiElement element);
/**
* Returns the target element for a link in a documentation comment. The link needs to use the
platform/lang-api/src/com/intellij/lang/documentation/DocumentationProviderEx.java
+1 -1
View File
@@ -46,7 +46,7 @@ public class DocumentationProviderEx implements DocumentationProvider {
}
@Override
public PsiElement getDocumentationElementForLookupItem(@NotNull PsiManager psiManager, @NotNull Object object, @NotNull PsiElement element) {
public PsiElement getDocumentationElementForLookupItem(PsiManager psiManager, Object object, PsiElement element) {
return null;
}
platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplateDocumentationProvider.java
+1 -1
View File
@@ -17,7 +17,7 @@ import javax.swing.*;
public class LiveTemplateDocumentationProvider extends AbstractDocumentationProvider {
@Override
public PsiElement getDocumentationElementForLookupItem(@NotNull PsiManager psiManager, @NotNull Object object, @NotNull PsiElement element) {
public PsiElement getDocumentationElementForLookupItem(PsiManager psiManager, Object object, PsiElement element) {
if (object instanceof LiveTemplateLookupElementImpl) {
TemplateImpl template = ((LiveTemplateLookupElementImpl)object).getTemplate();
final TemplateImpl templateFromSettings = TemplateSettings.getInstance().getTemplate(template.getKey(), template.getGroupName());
platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/StructuralSearchTemplateDocumentationProvider.java
+1 -1
View File
@@ -17,7 +17,7 @@ import javax.swing.*;
public class StructuralSearchTemplateDocumentationProvider extends AbstractDocumentationProvider {
@Override
public PsiElement getDocumentationElementForLookupItem(@NotNull PsiManager psiManager, @NotNull Object object, @NotNull PsiElement element) {
public PsiElement getDocumentationElementForLookupItem(PsiManager psiManager, Object object, PsiElement element) {
if (object instanceof Configuration) {
return new ConfigurationElement((Configuration)object, psiManager);
}
plugins/ant/src/com/intellij/lang/ant/doc/AntDomDocumentationProvider.java
+1 -2
View File
@@ -37,7 +37,6 @@ import com.intellij.util.xml.DomElement;
import com.intellij.util.xml.DomTarget;
import com.intellij.util.xml.reflect.DomChildrenDescription;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.File;
@@ -254,7 +253,7 @@ public class AntDomDocumentationProvider implements DocumentationProvider {
}
@Override
public PsiElement getDocumentationElementForLookupItem(@NotNull PsiManager psiManager, @NotNull Object object, @NotNull PsiElement element) {
public PsiElement getDocumentationElementForLookupItem(PsiManager psiManager, Object object, PsiElement element) {
return null;
}
plugins/gradle/java/src/documentation/GradleDocumentationProvider.java
+1 -2
View File
@@ -24,7 +24,6 @@ import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiManager;
import com.intellij.psi.PsiMethod;
import com.intellij.psi.util.PsiTreeUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.plugins.gradle.util.GradleConstants;
import org.jetbrains.plugins.gradle.util.GradleDocumentationBundle;
@@ -75,7 +74,7 @@ public class GradleDocumentationProvider implements DocumentationProvider {
@Nullable
@Override
public PsiElement getDocumentationElementForLookupItem(@NotNull PsiManager psiManager, @NotNull Object object, @NotNull PsiElement element) {
public PsiElement getDocumentationElementForLookupItem(PsiManager psiManager, Object object, PsiElement element) {
final PsiFile file = element.getContainingFile();
if (file == null || !FileUtilRt.extensionEquals(file.getName(), GradleConstants.EXTENSION)) return null;
final String doc = findDoc(element, object);
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/documentation/GroovyDocumentationProvider.java
+1 -1
View File
@@ -426,7 +426,7 @@ public class GroovyDocumentationProvider implements CodeDocumentationProvider, E
@Override
@Nullable
public PsiElement getDocumentationElementForLookupItem(@NotNull PsiManager psiManager, @NotNull Object object, @NotNull PsiElement element) {
public PsiElement getDocumentationElementForLookupItem(PsiManager psiManager, Object object, PsiElement element) {
if (object instanceof GroovyResolveResult) {
return ((GroovyResolveResult)object).getElement();
}
plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenModelDocumentationProvider.java
+1 -1
View File
@@ -56,7 +56,7 @@ public class MavenModelDocumentationProvider implements DocumentationProvider, E
}
@Override
public PsiElement getDocumentationElementForLookupItem(@NotNull PsiManager psiManager, @NotNull Object object, @NotNull PsiElement element) {
public PsiElement getDocumentationElementForLookupItem(PsiManager psiManager, Object object, PsiElement element) {
return null;
}
plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenPluginModelDocumentationProvider.java
+1 -2
View File
@@ -18,7 +18,6 @@ package org.jetbrains.idea.maven.dom;
import com.intellij.lang.documentation.DocumentationProvider;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiManager;
import org.jetbrains.annotations.NotNull;
import java.util.List;
@@ -39,7 +38,7 @@ public class MavenPluginModelDocumentationProvider implements DocumentationProvi
}
@Override
public PsiElement getDocumentationElementForLookupItem(@NotNull PsiManager psiManager, @NotNull Object object, @NotNull PsiElement element) {
public PsiElement getDocumentationElementForLookupItem(PsiManager psiManager, Object object, PsiElement element) {
return null;
}
plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenPomXmlDocumentationProvider.java
+1 -2
View File
@@ -21,7 +21,6 @@ import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiManager;
import com.intellij.xml.util.documentation.XmlDocumentationProvider;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.List;
@@ -76,7 +75,7 @@ public class MavenPomXmlDocumentationProvider implements DocumentationProvider {
@Nullable
@Override
public PsiElement getDocumentationElementForLookupItem(@NotNull PsiManager psiManager, @NotNull Object object, @NotNull PsiElement element) {
public PsiElement getDocumentationElementForLookupItem(PsiManager psiManager, Object object, PsiElement element) {
if (!isFromPomXml(element)) return null;
return myDelegate.getDocumentationElementForLookupItem(psiManager, object, element);
plugins/tasks/tasks-core/src/com/intellij/tasks/doc/TaskDocumentationProvider.java
+1 -2
View File
@@ -24,7 +24,6 @@ import com.intellij.tasks.Comment;
import com.intellij.tasks.Task;
import com.intellij.xml.util.XmlStringUtil;
import com.petebevin.markdown.MarkdownProcessor;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Collections;
@@ -71,7 +70,7 @@ public class TaskDocumentationProvider extends AbstractDocumentationProvider imp
}
@Override
public PsiElement getDocumentationElementForLookupItem(@NotNull PsiManager psiManager, @NotNull Object object, @NotNull PsiElement element) {
public PsiElement getDocumentationElementForLookupItem(PsiManager psiManager, Object object, PsiElement element) {
return object instanceof Task ? new TaskPsiElement(psiManager, (Task)object): null;
}
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltDocumentationProvider.java
+1 -1
View File
@@ -195,7 +195,7 @@ public class XsltDocumentationProvider implements DocumentationProvider {
@Override
@Nullable
public PsiElement getDocumentationElementForLookupItem(@NotNull PsiManager mgr, @NotNull Object object, @NotNull PsiElement psiElement) {
public PsiElement getDocumentationElementForLookupItem(PsiManager mgr, Object object, PsiElement psiElement) {
if (object instanceof String) {
if (psiElement instanceof XmlElement) {
final XmlTag tag = PsiTreeUtil.getParentOfType(psiElement, XmlTag.class);
plugins/yaml/src/org/jetbrains/yaml/meta/impl/YamlDocumentationProviderBase.java
+1 -1
View File
@@ -56,7 +56,7 @@ public abstract class YamlDocumentationProviderBase extends AbstractDocumentatio
}
@Override
public PsiElement getDocumentationElementForLookupItem(@NotNull PsiManager psiManager, @NotNull Object object, @NotNull PsiElement contextElement) {
public PsiElement getDocumentationElementForLookupItem(PsiManager psiManager, Object object, PsiElement contextElement) {
if (object instanceof ForcedCompletionPath) { // deep completion
return createFromCompletionPath((ForcedCompletionPath)object, contextElement);
}
plugins/yaml/src/org/jetbrains/yaml/schema/YamlJsonSchemaDocumentationProvider.java
+1 -1
View File
@@ -48,7 +48,7 @@ public class YamlJsonSchemaDocumentationProvider extends DocumentationProviderEx
@Nullable
@Override
public PsiElement getDocumentationElementForLookupItem(@NotNull PsiManager psiManager, @NotNull Object object, @NotNull PsiElement element) {
public PsiElement getDocumentationElementForLookupItem(PsiManager psiManager, Object object, PsiElement element) {
return null;
}
python/src/com/jetbrains/python/console/PydevDocumentationProvider.java
+1 -2
View File
@@ -25,7 +25,6 @@ import com.jetbrains.python.documentation.PyDocumentationBuilder;
import com.jetbrains.python.psi.PyElement;
import com.jetbrains.python.psi.PyReferenceExpression;
import com.jetbrains.python.psi.PyUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
/**
@@ -34,7 +33,7 @@ import org.jetbrains.annotations.Nullable;
public class PydevDocumentationProvider extends AbstractDocumentationProvider {
@Override
public PsiElement getDocumentationElementForLookupItem(@NotNull final PsiManager psiManager, @NotNull final Object object, @NotNull final PsiElement element) {
public PsiElement getDocumentationElementForLookupItem(final PsiManager psiManager, final Object object, final PsiElement element) {
if (object instanceof PydevConsoleElement){
return (PydevConsoleElement) object;
}
xml/dom-impl/src/com/intellij/util/xml/DomDocumentationProvider.java
+1 -2
View File
@@ -21,7 +21,6 @@ import com.intellij.pom.PomTargetPsiElement;
import com.intellij.psi.DelegatePsiTarget;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiManager;
import org.jetbrains.annotations.NotNull;
import java.util.List;
@@ -61,7 +60,7 @@ public class DomDocumentationProvider implements DocumentationProvider {
}
@Override
public PsiElement getDocumentationElementForLookupItem(@NotNull final PsiManager psiManager, @NotNull final Object object, @NotNull final PsiElement element) {
public PsiElement getDocumentationElementForLookupItem(final PsiManager psiManager, final Object object, final PsiElement element) {
return null;
}
xml/impl/src/com/intellij/xml/util/documentation/HtmlDocumentationProvider.java
+1 -2
View File
@@ -37,7 +37,6 @@ import com.intellij.xml.XmlElementDescriptor;
import com.intellij.xml.util.ColorSampleLookupValue;
import com.intellij.xml.util.XmlUtil;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Collections;
@@ -262,7 +261,7 @@ public class HtmlDocumentationProvider implements DocumentationProvider {
}
@Override
public PsiElement getDocumentationElementForLookupItem(@NotNull PsiManager psiManager, @NotNull Object object, @NotNull PsiElement element) {
public PsiElement getDocumentationElementForLookupItem(PsiManager psiManager, Object object, PsiElement element) {
PsiElement result = createNavigationElementHTML(psiManager, object.toString(),element);
DocumentationProvider styleProvider = getStyleProvider();
xml/impl/src/com/intellij/xml/util/documentation/XmlDocumentationProvider.java
+1 -1
View File
@@ -316,7 +316,7 @@ public class XmlDocumentationProvider implements DocumentationProvider {
}
@Override
public PsiElement getDocumentationElementForLookupItem(@NotNull final PsiManager psiManager, @NotNull Object object, @NotNull PsiElement element) {
public PsiElement getDocumentationElementForLookupItem(final PsiManager psiManager, Object object, PsiElement element) {
if (object instanceof XmlExtension.TagInfo) {
return ((XmlExtension.TagInfo)object).getDeclaration();
xml/relaxng/src/org/intellij/plugins/relaxNG/RngDocumentationProvider.java
+1 -2
View File
@@ -33,7 +33,6 @@ import org.intellij.plugins.relaxNG.model.descriptors.CompositeDescriptor;
import org.intellij.plugins.relaxNG.model.descriptors.RngElementDescriptor;
import org.intellij.plugins.relaxNG.model.descriptors.RngXmlAttributeDescriptor;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.kohsuke.rngom.digested.DElementPattern;
@@ -139,7 +138,7 @@ public class RngDocumentationProvider implements DocumentationProvider {
@Override
@Nullable
public PsiElement getDocumentationElementForLookupItem(@NotNull PsiManager psiManager, @NotNull Object object, @NotNull PsiElement element) {
public PsiElement getDocumentationElementForLookupItem(PsiManager psiManager, Object object, PsiElement element) {
return null;
}
xml/relaxng/src/org/intellij/plugins/relaxNG/compact/RngCompactLanguage.java
+1 -1
View File
@@ -154,7 +154,7 @@ public class RngCompactLanguage extends Language {
@Override
@Nullable
public PsiElement getDocumentationElementForLookupItem(@NotNull PsiManager psiManager, @NotNull Object object, @NotNull PsiElement element) {
public PsiElement getDocumentationElementForLookupItem(PsiManager psiManager, Object object, PsiElement element) {
return null;
}