From 4982e22ec704adf0889f5c2739f77da433c24c0b Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Wed, 23 Jul 2014 17:40:16 +0400 Subject: [PATCH] Drop IDEAConfig --- .../jet/plugin/project/IDEAConfig.java | 28 ---------- .../plugin/project/ProjectStructureUtil.java | 55 ++----------------- 2 files changed, 4 insertions(+), 79 deletions(-) delete mode 100644 idea/idea-analysis/src/org/jetbrains/jet/plugin/project/IDEAConfig.java diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/IDEAConfig.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/IDEAConfig.java deleted file mode 100644 index 5029b77b0dd..00000000000 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/IDEAConfig.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2010-2013 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.jet.plugin.project; - -import com.intellij.openapi.project.Project; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.k2js.config.EcmaVersion; -import org.jetbrains.k2js.config.LibrarySourcesConfig; - -public final class IDEAConfig extends LibrarySourcesConfig { - public IDEAConfig(@NotNull Project project) { - super(project, "default", ProjectStructureUtil.getLibLocationForProject(project), EcmaVersion.defaultVersion(), false); - } -} diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ProjectStructureUtil.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ProjectStructureUtil.java index f836fd2d92b..b30ed16df16 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ProjectStructureUtil.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ProjectStructureUtil.java @@ -16,8 +16,6 @@ package org.jetbrains.jet.plugin.project; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; @@ -36,17 +34,18 @@ import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.util.CachedValue; import com.intellij.psi.util.CachedValueProvider; import com.intellij.psi.util.CachedValuesManager; -import com.intellij.util.PathUtil; import com.intellij.util.Processor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.plugin.JetFileType; -import org.jetbrains.jet.plugin.framework.JsHeaderLibraryDetectionUtil; import org.jetbrains.jet.plugin.framework.JsLibraryStdDetectionUtil; import org.jetbrains.jet.plugin.versions.KotlinRuntimeLibraryCoreUtil; -import java.util.*; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Set; public class ProjectStructureUtil { private static final Key> IS_KOTLIN_JS_MODULE = Key.create("IS_KOTLIN_JS_MODULE"); @@ -137,52 +136,6 @@ public class ProjectStructureUtil { return result.getValue(); } - @NotNull - public static List getLibLocationForProject(@NotNull Project project) { - Module[] modules = ModuleManager.getInstance(project).getModules(); - for (Module module : modules) { - if (isJsKotlinModule(module)) { - return getLibLocationForProject(module); - } - } - - return Collections.emptyList(); - } - - @NotNull - public static List getLibLocationForProject(@NotNull final Module module) { - final Set pathsToJSLib = Sets.newHashSet(); - - ApplicationManager.getApplication().runReadAction(new Runnable() { - @Override - public void run() { - ModuleRootManager.getInstance(module).orderEntries().librariesOnly().forEachLibrary(new Processor() { - @Override - public boolean process(Library library) { - boolean detected = JsHeaderLibraryDetectionUtil.isJsHeaderLibraryDetected(Arrays.asList( - library.getFiles(OrderRootType.CLASSES))); - - if (detected) { - for (VirtualFile file : library.getRootProvider().getFiles(OrderRootType.SOURCES)) { - String path = PathUtil.getLocalPath(PathUtil.getLocalFile(file)); - if (path != null) { - pathsToJSLib.add(path); - } - else { - assert !file.isValid() : "Path is expected to be null only for invalid file: " + file; - } - } - } - - return true; - } - }); - } - }); - - return Lists.newArrayList(pathsToJSLib); - } - @Nullable private static Library getJSStandardLibrary(final Module module) { return ApplicationManager.getApplication().runReadAction(new Computable() {