Merge remote-tracking branch 'origin/master' into eldar/cidr-debugger

# Conflicts:
#	CIDR/clion/src/com/jetbrains/cidr/cpp/toolchains/MSVC.java

GitOrigin-RevId: f3593b526d1870f32b3f1451cab0c6a653e5beb5
This commit is contained in:
Eldar Abusalimov
2019-06-08 14:27:05 +03:00
committed by intellij-monorepo-bot
parent c9c165702a
commit 1120c30a56
2631 changed files with 13603 additions and 189220 deletions

View File

@@ -16,6 +16,7 @@
package com.jetbrains.python.documentation;
import com.intellij.openapi.extensions.ExtensionPointName;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiNamedElement;
import org.jetbrains.annotations.NotNull;
@@ -33,6 +34,17 @@ public interface PythonDocumentationLinkProvider {
@Nullable
String getExternalDocumentationUrl(PsiElement element, PsiElement originalElement);
/**
* This method was used to provide the fallback URL in case the one returned by {@link #getExternalDocumentationUrl(PsiElement, PsiElement)}
* doesn't exist. This check is not performed any longer to avoid UI sluggishness.
*
* @deprecated Do your best to provide a valid URL in {@link #getExternalDocumentationUrl(PsiElement, PsiElement)}. To be removed in 2019.2.
*/
@Deprecated
default String getExternalDocumentationRoot(Sdk sdk) {
return "";
}
@Nullable
default Function<Document, String> quickDocExtractor(@NotNull PsiNamedElement namedElement) {
return null;