From 9fbda7b65cc2ae3d171809fde7d8f6d61252ca3a Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Wed, 29 May 2013 16:24:51 +0200 Subject: [PATCH] init WEB-7728 Built-in HTTP server should be more visible Created JS Debug configuration MUST use remote url instead of local file --- .../intellij/ide/browsers/impl/WebBrowserServiceImpl.java | 6 +++--- .../com/intellij/ide/browsers/WebBrowserUrlProvider.java | 5 +---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/xml/impl/src/com/intellij/ide/browsers/impl/WebBrowserServiceImpl.java b/xml/impl/src/com/intellij/ide/browsers/impl/WebBrowserServiceImpl.java index 67dba80e0d6b..6e5732038185 100644 --- a/xml/impl/src/com/intellij/ide/browsers/impl/WebBrowserServiceImpl.java +++ b/xml/impl/src/com/intellij/ide/browsers/impl/WebBrowserServiceImpl.java @@ -58,8 +58,7 @@ public class WebBrowserServiceImpl extends WebBrowserService { WebBrowserUrlProvider provider = getProvider(psiElement); if (provider != null) { try { - // I (develar) don't want to change API right now, so, just wrap result - return Urls.newFromIdea(provider.getUrl(psiElement, psiFile, virtualFile)); + return provider.getUrl(psiElement, psiFile, virtualFile); } catch (WebBrowserUrlProvider.BrowserException e) { if (!HtmlUtil.isHtmlFile(psiFile)) { @@ -71,12 +70,13 @@ public class WebBrowserServiceImpl extends WebBrowserService { return Urls.newFromVirtualFile(virtualFile); } + @Override @Nullable public Url getUrlToOpen(@NotNull PsiElement psiElement) { try { return getUrlToOpen(psiElement, false); } - catch (WebBrowserUrlProvider.BrowserException e) { + catch (WebBrowserUrlProvider.BrowserException ignored) { return null; } } diff --git a/xml/openapi/src/com/intellij/ide/browsers/WebBrowserUrlProvider.java b/xml/openapi/src/com/intellij/ide/browsers/WebBrowserUrlProvider.java index e5795d1d6db5..720d14c8eeca 100644 --- a/xml/openapi/src/com/intellij/ide/browsers/WebBrowserUrlProvider.java +++ b/xml/openapi/src/com/intellij/ide/browsers/WebBrowserUrlProvider.java @@ -35,10 +35,7 @@ public abstract class WebBrowserUrlProvider { } @NotNull - /** - * URL must not be encoded (space as is) - */ - public abstract String getUrl(@NotNull PsiElement element, @NotNull PsiFile psiFile, @NotNull VirtualFile virtualFile) throws BrowserException; + 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