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

Browse Source
This commit is contained in:
Vladimir Krivosheev
2016-09-06 15:27:51 +02:00
parent 619705c4cc
commit a9111bc805
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/lang/java/JavaDocumentationProvider.java
+2 -2
View File
@@ -61,7 +61,7 @@ import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.HashMap;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.builtInWebServer.BuiltInWebBrowserUrlProvider;
import org.jetbrains.builtInWebServer.BuiltInWebBrowserUrlProviderKt;
import java.util.LinkedHashSet;
import java.util.List;
@@ -751,7 +751,7 @@ public class JavaDocumentationProvider extends DocumentationProviderEx implement
for (VirtualFile root : orderEntry.getFiles(JavadocOrderRootType.getInstance())) {
if (root.getFileSystem() == JarFileSystem.getInstance()) {
VirtualFile file = root.findFileByRelativePath(relPath);
List<Url> urls = file == null ? null : BuiltInWebBrowserUrlProvider.getUrls(file, project, null);
List<Url> urls = file == null ? null : BuiltInWebBrowserUrlProviderKt.getBuiltInServerUrls(file, project, null);
if (!ContainerUtil.isEmpty(urls)) {
List<String> result = new SmartList<>();
for (Url url : urls) {
platform/built-in-server/src/org/jetbrains/builtInWebServer/BuiltInWebBrowserUrlProvider.java → platform/built-in-server/src/org/jetbrains/builtInWebServer/BuiltInWebBrowserUrlProvider.kt
View File
xml/impl/src/com/intellij/ide/browsers/actions/SelectInDefaultBrowserTarget.kt
+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.
@@ -35,8 +35,8 @@ internal class SelectInDefaultBrowserTarget : SelectInTargetBase() {
val request = createOpenInBrowserRequest(selectorInFile) ?: return false
val urlProvider = WebBrowserServiceImpl.getProvider(request)
if (urlProvider == null) {
val virtualFile = request.virtualFile
return virtualFile is HttpVirtualFile || HtmlUtil.isHtmlFile(request.file) && virtualFile !is LightVirtualFile
val virtualFile = request.virtualFile ?: return false
return virtualFile is HttpVirtualFile || (HtmlUtil.isHtmlFile(request.file) && virtualFile !is LightVirtualFile)
}
return true
}