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

WEB-7728 Built-in HTTP server should be more visible

Browse Source
This commit is contained in:
Vladimir Krivosheev
2013-05-29 17:26:59 +02:00
parent aaa036f2c7
commit 48791f9945
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xml/impl/src/com/intellij/ide/browsers/impl/WebBrowserServiceImpl.java
+4 -4
View File
@@ -83,17 +83,17 @@ public class WebBrowserServiceImpl extends WebBrowserService {
@Nullable
public static WebBrowserUrlProvider getProvider(@Nullable PsiElement element) {
if (element == null) {
PsiFile psiFile = element == null ? null : element.getContainingFile();
if (psiFile == null) {
return null;
}
final List<WebBrowserUrlProvider> allProviders = Arrays.asList(WebBrowserUrlProvider.EP_NAME.getExtensions());
List<WebBrowserUrlProvider> allProviders = Arrays.asList(WebBrowserUrlProvider.EP_NAME.getExtensions());
for (WebBrowserUrlProvider urlProvider : DumbService.getInstance(element.getProject()).filterByDumbAwareness(allProviders)) {
if (urlProvider.canHandleElement(element)) {
if (urlProvider.canHandleElement(element, psiFile)) {
return urlProvider;
}
}
return null;
}
}
xml/openapi/src/com/intellij/ide/browsers/WebBrowserUrlProvider.java
+4 -5
View File
@@ -33,14 +33,13 @@ public abstract class WebBrowserUrlProvider {
super(message);
}
}
@NotNull
public abstract Url getUrl(@NotNull PsiElement element, @NotNull PsiFile psiFile, @NotNull VirtualFile virtualFile) throws BrowserException;
/**
* Invariant: element has not null containing psi file with not null virtual file
*/
public abstract boolean canHandleElement(@NotNull final PsiElement element);
public abstract boolean canHandleElement(@NotNull PsiElement element, @NotNull PsiFile psiFile);
@NotNull
public abstract Url getUrl(@NotNull PsiElement element, @NotNull PsiFile psiFile, @NotNull VirtualFile virtualFile) throws BrowserException;
@Nullable
public String getOpenInBrowserActionText(@NotNull PsiFile file) {