MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-20 13:31:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA project configuration: the great module rename

Browse Source 
Rename all modules in IntelliJ IDEA sources to ensure that they follow a consistent naming scheme.

Update references in code and comments.
This commit is contained in:
nik
2018-01-24 11:46:27 +03:00
parent f53d9ddb5b
commit 1e833720ca
54 changed files with 869 additions and 463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1073
.idea/modules.xml generated
View File

File diff suppressed because it is too large Load Diff

2
README.md
View File

@@ -19,6 +19,6 @@ To run tests apply these setting to the **default** JUnit run configuration type
* Working dir:
`<IDEA_HOME>\bin`
* VM parameters:
`-ea -Xbootclasspath/p:../out/classes/production/boot -Xmx128M -Djava.system.class.loader=com.intellij.util.lang.UrlClassLoader -Didea.config.path=../test-config -Didea.system.path=../test-system`
`-ea -Xbootclasspath/p:../out/classes/production/intellij.platform.boot -Xmx128M -Djava.system.class.loader=com.intellij.util.lang.UrlClassLoader -Didea.config.path=../test-config -Didea.system.path=../test-system`
You can find other useful information at [http://www.jetbrains.org](http://www.jetbrains.org). [Contribute section](http://www.jetbrains.org/display/IJOS/Contribute) of that site describes how you can contribute to IntelliJ IDEA.

50
java/compiler/impl/src/com/intellij/compiler/server/impl/BuildProcessClasspathManager.java
View File

@@ -30,7 +30,9 @@ import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.Nullable;
import java.io.File;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
/**
* @author nik
@@ -83,7 +85,10 @@ public class BuildProcessClasspathManager {
}
else {
//development mode: add directory out/classes/production/<jar-name> to classpath, assuming that jar-name is equal to module name
final String moduleName = FileUtil.getNameWithoutExtension(PathUtil.getFileName(relativePath));
String moduleName = FileUtil.getNameWithoutExtension(PathUtil.getFileName(relativePath));
if (OLD_TO_NEW_MODULE_NAME.containsKey(moduleName)) {
moduleName = OLD_TO_NEW_MODULE_NAME.get(moduleName);
}
File baseOutputDir = baseFile.getParentFile();
if (baseOutputDir.getName().equals("test")) {
baseOutputDir = new File(baseOutputDir.getParentFile(), "production");
@@ -149,4 +154,47 @@ public class BuildProcessClasspathManager {
}
return classpath;
}
//todo[nik] this is a temporary compatibility fix; we should update plugin layout so JAR names correspond to module names instead.
private static final Map<String, String> OLD_TO_NEW_MODULE_NAME;
static {
OLD_TO_NEW_MODULE_NAME = new LinkedHashMap<>();
OLD_TO_NEW_MODULE_NAME.put("android-jps-plugin", "intellij.android.jps");
OLD_TO_NEW_MODULE_NAME.put("ant-jps-plugin", "intellij.ant.jps");
OLD_TO_NEW_MODULE_NAME.put("aspectj-jps-plugin", "intellij.aspectj.jps");
OLD_TO_NEW_MODULE_NAME.put("devkit-jps-plugin", "intellij.devkit.jps");
OLD_TO_NEW_MODULE_NAME.put("eclipse-jps-plugin", "intellij.eclipse.jps");
OLD_TO_NEW_MODULE_NAME.put("error-prone-jps-plugin", "intellij.errorProne.jps");
OLD_TO_NEW_MODULE_NAME.put("flex-jps-plugin", "intellij.flex.jps");
OLD_TO_NEW_MODULE_NAME.put("gradle-jps-plugin", "intellij.gradle.jps");
OLD_TO_NEW_MODULE_NAME.put("grails-jps-plugin", "intellij.groovy.grails.jps");
OLD_TO_NEW_MODULE_NAME.put("groovy-jps-plugin", "intellij.groovy.jps");
OLD_TO_NEW_MODULE_NAME.put("gwt-jps-plugin", "intellij.gwt.jps");
OLD_TO_NEW_MODULE_NAME.put("google-app-engine-jps-plugin", "intellij.java.googleAppEngine.jps");
OLD_TO_NEW_MODULE_NAME.put("ui-designer-jps-plugin", "intellij.java.guiForms.jps");
OLD_TO_NEW_MODULE_NAME.put("intellilang-jps-plugin", "intellij.java.langInjection.jps");
OLD_TO_NEW_MODULE_NAME.put("dmServer-jps-plugin", "intellij.javaee.appServers.dmServer.jps");
OLD_TO_NEW_MODULE_NAME.put("weblogic-jps-plugin", "intellij.javaee.appServers.weblogic.jps");
OLD_TO_NEW_MODULE_NAME.put("webSphere-jps-plugin", "intellij.javaee.appServers.websphere.jps");
OLD_TO_NEW_MODULE_NAME.put("jpa-jps-plugin", "intellij.javaee.jpa.jps");
OLD_TO_NEW_MODULE_NAME.put("javaee-jps-plugin", "intellij.javaee.jps");
OLD_TO_NEW_MODULE_NAME.put("javaFX-jps-plugin", "intellij.javaFX.jps");
OLD_TO_NEW_MODULE_NAME.put("maven-jps-plugin", "intellij.maven.jps");
OLD_TO_NEW_MODULE_NAME.put("osmorc-jps-plugin", "intellij.osgi.jps");
OLD_TO_NEW_MODULE_NAME.put("ruby-chef-jps-plugin", "intellij.ruby.chef.jps");
OLD_TO_NEW_MODULE_NAME.put("android-common", "intellij.android.common");
OLD_TO_NEW_MODULE_NAME.put("build-common", "intellij.android.buildCommon");
OLD_TO_NEW_MODULE_NAME.put("android-rt", "intellij.android.rt");
OLD_TO_NEW_MODULE_NAME.put("sdk-common", "android.sdktools.sdk-common");
OLD_TO_NEW_MODULE_NAME.put("sdklib", "android.sdktools.sdklib");
OLD_TO_NEW_MODULE_NAME.put("layoutlib-api", "android.sdktools.layoutlib-api");
OLD_TO_NEW_MODULE_NAME.put("repository", "android.sdktools.repository");
OLD_TO_NEW_MODULE_NAME.put("manifest-merger", "android.sdktools.manifest-merger");
OLD_TO_NEW_MODULE_NAME.put("common-eclipse-util", "intellij.eclipse.common");
OLD_TO_NEW_MODULE_NAME.put("flex-shared", "intellij.flex.shared");
OLD_TO_NEW_MODULE_NAME.put("groovy-rt-constants", "intellij.groovy.constants.rt");
OLD_TO_NEW_MODULE_NAME.put("grails-compiler-patch", "intellij.groovy.grails.compilerPatch");
OLD_TO_NEW_MODULE_NAME.put("appEngine-runtime", "intellij.java.googleAppEngine.runtime");
OLD_TO_NEW_MODULE_NAME.put("common-javaFX-plugin", "intellij.javaFX.common");
}
}

2
java/debugger/impl/src/com/intellij/debugger/engine/JavaAttachDebuggerProvider.java
View File

@@ -57,7 +57,7 @@ public class JavaAttachDebuggerProvider implements XLocalAttachDebuggerProvider
Pair<String, Integer> address = getAttachAddress(processInfo);
assert address != null;
// TODO: first need to remove circular dependency with execution-impl
// TODO: first need to remove circular dependency with intellij.java.execution.impl
//RunnerAndConfigurationSettings runSettings = RunManager.getInstance(project)
// .createRunConfiguration(StringUtil.notNullize(address.first) + ":" + address.second,
// RemoteConfigurationType.getInstance().getFactory());

2
java/idea-ui/src/com/intellij/framework/library/impl/DownloadableLibraryServiceImpl.java
View File

@@ -42,7 +42,7 @@ public class DownloadableLibraryServiceImpl extends DownloadableLibraryService {
@Override
public DownloadableLibraryDescription createLibraryDescription(@NotNull String groupId, @NotNull final URL... localUrls) {
return new LibraryVersionsFetcher(groupId, localUrls) {
//todo[nik] pull up this method after moving corresponding API to lang-api
//todo[nik] pull up this method after moving corresponding API to intellij.platform.lang
@NotNull
protected FrameworkAvailabilityCondition createAvailabilityCondition(Artifact version) {
RequiredFrameworkVersion groupVersion = version.getRequiredFrameworkVersion();

4
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/JetBrainsAnnotationsExternalLibraryResolver.java
View File

@@ -45,7 +45,7 @@ public class JetBrainsAnnotationsExternalLibraryResolver extends ExternalLibrary
if (annotationsJar.exists()) {
return Collections.singletonList(FileUtil.toSystemIndependentName(annotationsJar.getAbsolutePath()));
}
return getPathsToAnnotationsDirectoriesInDevelopmentMode("annotations");
return getPathsToAnnotationsDirectoriesInDevelopmentMode("intellij.platform.annotations.java5");
}
};
@@ -57,7 +57,7 @@ public class JetBrainsAnnotationsExternalLibraryResolver extends ExternalLibrary
if (annotationsJar.exists()) {
return Collections.singletonList(FileUtil.toSystemIndependentName(annotationsJar.getAbsolutePath()));
}
return getPathsToAnnotationsDirectoriesInDevelopmentMode("annotations-java8");
return getPathsToAnnotationsDirectoriesInDevelopmentMode("intellij.platform.annotations");
}
};

26
jps/jps-builders/src/org/jetbrains/jps/cmdline/ClasspathBootstrap.java
View File

@@ -60,24 +60,24 @@ public class ClasspathBootstrap {
final Set<String> cp = ContainerUtil.newHashSet();
cp.add(getResourcePath(BuildMain.class));
cp.add(getResourcePath(ExternalJavacProcess.class)); // jps-builders-6 part
cp.add(getResourcePath(ExternalJavacProcess.class)); // intellij.platform.jps.build.javac.rt part
cp.addAll(PathManager.getUtilClassPath()); // util
cp.addAll(PathManager.getUtilClassPath()); // intellij.platform.util
cp.add(getResourcePath(Message.class)); // protobuf
cp.add(getResourcePath(NetUtil.class)); // netty
cp.add(getResourcePath(ClassWriter.class)); // asm
cp.add(getResourcePath(ClassVisitor.class)); // asm-commons
cp.add(getResourcePath(JpsModel.class)); // jps-model-api
cp.add(getResourcePath(JpsModelImpl.class)); // jps-model-impl
cp.add(getResourcePath(JpsProjectLoader.class)); // jps-model-serialization
cp.add(getResourcePath(AlienFormFileException.class)); // forms-compiler
cp.add(getResourcePath(GridConstraints.class)); // forms-rt
cp.add(getResourcePath(JpsModel.class)); // intellij.platform.jps.model
cp.add(getResourcePath(JpsModelImpl.class)); // intellij.platform.jps.model.impl
cp.add(getResourcePath(JpsProjectLoader.class)); // intellij.platform.jps.model.serialization
cp.add(getResourcePath(AlienFormFileException.class)); // intellij.java.guiForms.compiler
cp.add(getResourcePath(GridConstraints.class)); // intellij.java.guiForms.rt
cp.add(getResourcePath(CellConstraints.class)); // jGoodies-forms
cp.addAll(getInstrumentationUtilRoots());
cp.add(getResourcePath(IXMLBuilder.class)); // nano-xml
// aether-based repository libraries support
cp.add(getResourcePath(ArtifactRepositoryManager.class)); // aether-dependency-resolver
cp.add(getResourcePath(ArtifactRepositoryManager.class)); // intellij.java.aetherDependencyResolver
final String aetherPath = getResourcePath(Artifact.class); // aether-1.1.0-all.jar
cp.add(aetherPath);
cp.add(FileUtil.toSystemIndependentName(new File(new File(aetherPath).getParentFile(), "maven-aether-provider-3.3.9-all.jar").getAbsolutePath()));
@@ -203,11 +203,11 @@ public class ClasspathBootstrap {
String instrumentationUtilPath = getResourcePath(NotNullVerifyingInstrumenter.class);
File instrumentationUtil = new File(instrumentationUtilPath);
if (instrumentationUtil.isDirectory()) {
//running from sources: load classes from .../out/production/instrumentation-util-8
return Arrays.asList(instrumentationUtilPath, new File(instrumentationUtil.getParentFile(), "instrumentation-util-8").getAbsolutePath());
//running from sources: load classes from .../out/production/intellij.java.compiler.instrumentationUtil.java8
return Arrays.asList(instrumentationUtilPath, new File(instrumentationUtil.getParentFile(), "intellij.java.compiler.instrumentationUtil.java8").getAbsolutePath());
}
else {
//running from jars: instrumentation-util-8 is located in the same jar
//running from jars: intellij.java.compiler.instrumentationUtil.java8 is located in the same jar
return Collections.singletonList(instrumentationUtilPath);
}
}
@@ -216,8 +216,8 @@ public class ClasspathBootstrap {
String instrumentationPath = getResourcePath(NotNullVerifyingInstrumenter.class);
File instrumentationUtil = new File(instrumentationPath);
if (instrumentationUtil.isDirectory()) {
//running from sources: load classes from .../out/production/javac-ref-scanner-8
return Collections.singletonList(new File(instrumentationUtil.getParentFile(), "javac-ref-scanner-8").getAbsolutePath());
//running from sources: load classes from .../out/production/intellij.java.jps.javacRefScanner8
return Collections.singletonList(new File(instrumentationUtil.getParentFile(), "intellij.java.jps.javacRefScanner8").getAbsolutePath());
}
else {
return Collections.singletonList(instrumentationPath);

2
jps/model-api/src/org/jetbrains/jps/model/java/JdkVersionDetector.java
View File

@@ -41,7 +41,7 @@ public abstract class JdkVersionDetector {
@Nullable
public abstract JdkVersionInfo detectJdkVersionInfo(@NotNull String homePath, @NotNull ActionRunner actionRunner);
//todo[nik] replace with a service with different implementations for IDE process and for JPS process (need to exclude jps-builders module from IDEA classpath)
//todo[nik] replace with a service with different implementations for IDE process and for JPS process (need to exclude intellij.platform.jps.build module from IDEA classpath)
public interface ActionRunner {
Future<?> run(Runnable runnable);
}

2
jps/standalone-builder/src/org/jetbrains/jps/gant/JpsGantProjectBuilder.java
View File

@@ -48,7 +48,7 @@ import java.util.*;
import static org.jetbrains.jps.api.CmdlineRemoteProto.Message.ControllerMessage.ParametersMessage.TargetTypeBuildScope;
/**
* @deprecated use {@link org.jetbrains.intellij.build.CompilationTasks} from platform-build-scripts module for building IDEs based
* @deprecated use {@link org.jetbrains.intellij.build.CompilationTasks} from intellij.platform.buildScripts module for building IDEs based
* on IntelliJ Platform. If you need to build another project use {@link Standalone} directly.
*/
public class JpsGantProjectBuilder {

2
jps/standalone-builder/src/org/jetbrains/jps/gant/JpsGantTool.groovy
View File

@@ -30,7 +30,7 @@ import org.jetbrains.jps.model.serialization.JpsModelSerializationDataService
import org.jetbrains.jps.model.serialization.JpsProjectLoader
/**
* @deprecated use classes from {@link org.jetbrains.intellij.build} package in platform-build-scripts module for building IDEs based
* @deprecated use classes from {@link org.jetbrains.intellij.build} package in intellij.platform.buildScripts module for building IDEs based
* on IntelliJ Platform; these scripts use type-safe org.jetbrains.intellij.build.impl.LayoutBuilder to lay out modules output by JARs and
* directories.
*

4
platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/ArrangementSettingsSerializer.java
View File

@@ -34,7 +34,7 @@ public interface ArrangementSettingsSerializer {
* with {@link #serialize(ArrangementSettings, Element)}.
* <p/>
* <b>Note:</b> it's save to return {@code null} if current rearranger doesn't use custom settings (settings over those
* located at the {@code 'lang-api'}/{@code 'lang-impl'} modules).
* located at the {@code 'intellij.platform.lang'}/{@code 'intellij.platform.lang.impl'} modules).
*
* @param element serialized settings holder
* @return settings de-serialized from the given element
@@ -46,7 +46,7 @@ public interface ArrangementSettingsSerializer {
* Allows to provide custom settings serialization logic. This method is expected to be consistent with {@link #deserialize(Element)}.
* <p/>
* <b>Note:</b> it's save to return {@code null} if current rearranger doesn't use custom settings (settings over those
* located at the {@code 'lang-api'}/{@code 'lang-impl'} modules).
* located at the {@code 'intellij.platform.lang'}/{@code 'intellij.platform.lang.impl'} modules).
*
* @param settings settings to serialize
* @param holder element to hold serialized settings

3
platform/lang-api/src/com/intellij/psi/injection/ReferenceInjector.java
View File

@@ -17,7 +17,6 @@ package com.intellij.psi.injection;
import com.intellij.lang.Language;
import com.intellij.openapi.extensions.ExtensionPointName;
import com.intellij.openapi.util.Condition;
import com.intellij.openapi.util.TextRange;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiReference;
@@ -26,7 +25,7 @@ import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
/**
* This will work only in presence of IntelliLang plugin.
* This will work only in presence of intellij.platform.langInjection plugin.
*
* @author Dmitry Avdeev
*/

2
platform/lang-impl/src/com/intellij/ide/util/PlatformPackageUtil.java
View File

@@ -46,7 +46,7 @@ import java.io.File;
import java.io.IOException;
import java.util.List;
// TODO this should eventually replace PackageUtil from java-impl
// TODO this should eventually replace PackageUtil from intellij.java.impl
public class PlatformPackageUtil {
private static final Logger LOG = Logger.getInstance("com.intellij.ide.util.PlatformPackageUtil");

2
platform/lang-impl/src/com/intellij/openapi/roots/impl/libraries/LibraryKindLoader.java
View File

@@ -25,7 +25,7 @@ public class LibraryKindLoader implements ApplicationComponent {
@Override
public void initComponent() {
//todo[nik] this is temporary workaround for IDEA-98118: we need to initialize all library types to ensure that their kinds are created and registered in LibraryKind.ourAllKinds
//In order to properly fix the problem we should extract all UI-related methods from LibraryType to a separate class and move LibraryType to projectModel-impl module
//In order to properly fix the problem we should extract all UI-related methods from LibraryType to a separate class and move LibraryType to intellij.platform.projectModel.impl module
LibraryType.EP_NAME.getExtensions();
}
}

2
platform/platform-api/src/com/intellij/openapi/roots/ui/util/CompositeAppearance.java
View File

@@ -32,7 +32,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
// todo: move to lang-impl ?
// todo: move to intellij.platform.lang.impl ?
public class CompositeAppearance implements ModifiableCellAppearanceEx {
private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.roots.ui.util.CompositeAppearance");

2
platform/platform-api/src/com/intellij/openapi/roots/ui/util/SimpleTextCellAppearance.java
View File

@@ -24,7 +24,7 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
// todo: move to lang-impl ?
// todo: move to intellij.platform.lang.impl ?
public class SimpleTextCellAppearance implements ModifiableCellAppearanceEx {
private Icon myIcon;
private final SimpleTextAttributes myTextAttributes;

2
platform/platform-impl/src/com/intellij/jps/impl/JpsIdePluginManagerImpl.java
View File

@@ -37,7 +37,7 @@ public class JpsIdePluginManagerImpl extends JpsPluginManager {
public JpsIdePluginManagerImpl() {
ExtensionsArea rootArea = Extensions.getRootArea();
//todo[nik] get rid of this check: currently this class is used in jps-builders tests instead of JpsPluginManagerImpl because platform-impl module is added to classpath via testFramework
//todo[nik] get rid of this check: currently this class is used in intellij.platform.jps.build tests instead of JpsPluginManagerImpl because intellij.platform.ide.impl module is added to classpath via testFramework
if (rootArea.hasExtensionPoint(JpsPluginBean.EP_NAME.getName())) {
rootArea.getExtensionPoint(JpsPluginBean.EP_NAME).addExtensionPointListener(new ExtensionPointListener<JpsPluginBean>() {
@Override

2
platform/platform-impl/src/com/intellij/openapi/util/extensions.kt
View File

@@ -31,7 +31,7 @@
package com.intellij.openapi.util
/**
* Put here extension functions and variables for classes from util/util-rt modules
* Put here extension functions and variables for classes from util/util.rt modules
*/
operator fun <A, B> Pair<A, B>.component1() = this.first

2
platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/RemoteServersViewContributor.java
View File

@@ -12,7 +12,7 @@ import java.util.List;
/**
* This is a temporary solution to integrate JavaEE based application servers into common Remote Servers/Clouds view. It should be removed
* when remote app servers will be migrated to use remote-servers-api
* when remote app servers will be migrated to use intellij.platform.remoteServers
*
* @author nik
*/

6
platform/testGuiFramework/src/com/intellij/testGuiFramework/launcher/GuiTestLocalLauncher.kt
View File

@@ -55,7 +55,7 @@ object GuiTestLocalLauncher {
var process: Process? = null
private val TEST_GUI_FRAMEWORK_MODULE_NAME = "testGuiFramework"
private val TEST_GUI_FRAMEWORK_MODULE_NAME = "intellij.platform.testGuiFramework"
val project: JpsProject by lazy {
val home = PathManager.getHomePath()
@@ -249,7 +249,7 @@ object GuiTestLocalLauncher {
/**
* return union of classpaths for current test (get from classloader) and classpaths of main and testGuiFramework modules*
* return union of classpaths for current test (get from classloader) and classpaths of main and intellij.platform.testGuiFramework modules*
*/
private fun getFullClasspath(moduleName: String, testClassNames: List<String>): List<File> {
val classpath: MutableSet<File> = substituteAllMacro(getExtendedClasspath(moduleName))
@@ -349,7 +349,7 @@ object GuiTestLocalLauncher {
/**
* return union of classpaths for @moduleName and testGuiFramework modules
* return union of classpaths for @moduleName and intellij.platform.testGuiFramework modules
*/
private fun getExtendedClasspath(moduleName: String): MutableSet<File> {
// here we trying to analyze output path for project from classloader path and from modules classpath.

2
platform/testGuiFramework/src/com/intellij/testGuiFramework/launcher/GuiTestOptions.kt
View File

@@ -30,7 +30,7 @@ object GuiTestOptions {
fun useAppleScreenMenuBar(): Boolean = getSystemProperty("apple.laf.useScreenMenuBar", false)
fun getDebugPort(): Int = getSystemProperty("idea.gui.test.debug.port", 5009)
fun getBootClasspath(): String = getSystemProperty("idea.gui.test.bootclasspath", "../out/classes/production/boot")
fun getBootClasspath(): String = getSystemProperty("idea.gui.test.bootclasspath", "../out/classes/production/intellij.platform.boot")
fun getEncoding(): String = getSystemProperty("idea.gui.test.encoding", "UTF-8")
fun getXmxSize(): Int = getSystemProperty("idea.gui.test.xmx", 512)
//used for restarted and resumed test to qualify from what point to start

2
platform/testGuiFramework/src/com/intellij/testGuiFramework/launcher/ide/CommunityIde.kt
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.testGuiFramework.launcher.ide
class CommunityIde : IdeType(name = "IntelliJ IDEA", platformPrefix = "Idea", ideJarName = "idea.jar", mainModule = "community-guitests")
class CommunityIde : IdeType(name = "IntelliJ IDEA", platformPrefix = "Idea", ideJarName = "idea.jar", mainModule = "intellij.ideaCommunity.guiTests")

12
platform/util/src/com/intellij/openapi/application/PathManager.java
View File

@@ -490,9 +490,9 @@ public class PathManager {
@NotNull
public static Collection<String> getUtilClassPath() {
final Class<?>[] classes = {
PathManager.class, // module 'util'
Flow.class, // module 'annotations'
SystemInfoRt.class, // module 'util-rt'
PathManager.class, // module 'intellij.platform.util'
Flow.class, // module 'intellij.platform.annotations.common'
SystemInfoRt.class, // module 'intellij.platform.util.rt'
Document.class, // jDOM
Appender.class, // log4j
THashSet.class, // trove4j
@@ -513,15 +513,15 @@ public class PathManager {
final String annotationsRoot = getJarPathForClass(Flow.class);
if (annotationsRoot != null && !annotationsRoot.endsWith(".jar")) {
// We're running IDEA built from sources. Flow.class is under annotations-common, and NotNull.class is under annotations. Add both
// We're running IDEA built from sources. Flow.class is under intellij.platform.annotations.common, and NotNull.class is under intellij.platform.annotations.java5. Add both
// roots to classpath.
final File notNullRoot = new File(new File(annotationsRoot).getParentFile(), "annotations");
final File notNullRoot = new File(new File(annotationsRoot).getParentFile(), "intellij.platform.annotations.java5");
if (notNullRoot.exists()) {
classPath.add(notNullRoot.getAbsolutePath());
}
}
final String resourceRoot = getResourceRoot(PathManager.class, "/messages/CommonBundle.properties"); // platform-resources-en
final String resourceRoot = getResourceRoot(PathManager.class, "/messages/CommonBundle.properties"); // intellij.platform.resources.en
if (resourceRoot != null) {
classPath.add(new File(resourceRoot).getAbsolutePath());
}

2
platform/util/testSrc/com/intellij/util/containers/PathInternerTest.java
View File

@@ -60,7 +60,7 @@ public class PathInternerTest extends TestCase {
}
public void testContains() {
String path = "/home/peter/work/idea/community/out/production/vcs-impl/com/intellij/openapi/vcs/changes/committed/CommittedChangesViewManager$1.class";
String path = "/home/peter/work/idea/community/out/production/intellij.platform.vcs.impl/com/intellij/openapi/vcs/changes/committed/CommittedChangesViewManager$1.class";
interner.addPath(path);
assertTrue(interner.containsPath(path));
assertFalse(interner.containsPath("/foo/foo"));

4
platform/vcs-api/src/com/intellij/openapi/vcs/ChangeListColumn.java
View File

@@ -56,8 +56,8 @@ public abstract class ChangeListColumn<T extends ChangeList> {
@Override
@NotNull
public Comparator<CommittedChangeList> getComparator() {
// TODO: CommittedChangeListByDateComparator could be utilized here. But currently it is placed in vcs-impl.
// TODO: Think of either moving these ChangeListColumn instances to vcs-impl or move comparator to vcs-api.
// TODO: CommittedChangeListByDateComparator could be utilized here. But currently it is placed in intellij.platform.vcs.impl.
// TODO: Think of either moving these ChangeListColumn instances to intellij.platform.vcs.impl or move comparator to intellij.platform.vcs.
return comparing(CommittedChangeList::getCommitDate);
}
};

2
platform/vcs-api/src/com/intellij/openapi/vcs/history/DiffFromHistoryHandler.java
View File

@@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull;
/**
* This handler is called when the user selects one or two revisions in the file history and invokes "Show Diff",
* or selected one revision and invokes "Show Diff with Local"
* Default handler is implemented in {@code vcs-impl}.
* Default handler is implemented in {@code intellij.platform.vcs.impl}.
* Custom handlers should be returned via {@link VcsHistoryProvider#getHistoryDiffHandler()}.
*/
public interface DiffFromHistoryHandler {

2
platform/vcs-impl/src/com/intellij/vcsUtil/VcsImplUtil.java
View File

@@ -25,7 +25,7 @@ import org.jetbrains.annotations.NotNull;
import java.io.File;
/**
* <p>{@link VcsUtil} extension that needs access to the {@code vcs-impl} module.</p>
* <p>{@link VcsUtil} extension that needs access to the {@code intellij.platform.vcs.impl} module.</p>
*
* @author Kirill Likhodedov
*/

2
platform/vcs-log/api/src/com/intellij/vcs/log/Hash.java
View File

@@ -7,7 +7,7 @@ import org.jetbrains.annotations.NotNull;
* <p>
* <p>It is called "Hash", because in DVCSs it is represented by a SHA-hash value.</p>
* <p>
* TODO move to vcs-api
* TODO move to intellij.platform.vcs
*
* @author Kirill Likhodedov
* @author erokhins

2
platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogObjectsFactory.java
View File

@@ -6,7 +6,7 @@ import org.jetbrains.annotations.NotNull;
import java.util.List;
/**
* Use this factory to create correct instances of such commonly used vcs-log-api objects as {@link Hash} or {@link VcsShortCommitDetails}.
* Use this factory to create correct instances of such commonly used intellij.platform.vcs.log objects as {@link Hash} or {@link VcsShortCommitDetails}.
*
* @author Kirill Likhodedov
*/

2
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/DynamicRegexReplaceableByCompiledPatternInspectionBase.java
View File

@@ -111,7 +111,7 @@ public class DynamicRegexReplaceableByCompiledPatternInspectionBase extends Base
return false;
}
if (Extensions.getRootArea().hasExtensionPoint(AllowedApiFilterExtension.EP_NAME.getName())) {
//todo[nik] remove this condition when the extension point will be registered in java-analysis-impl module
//todo[nik] remove this condition when the extension point will be registered in intellij.java.analysis.impl module
return AllowedApiFilterExtension.isClassAllowed("java.util.regex.Pattern", expression);
}
return true;

2
plugins/IntelliLang/IntelliLang.xml
View File

@@ -162,7 +162,7 @@
</target>
<!-- Module IntelliLang -->
<!-- Module intellij.platform.langInjection -->
<dirname property="module.intellilang.basedir" file="${ant.file}"/>

2
plugins/IntelliLang/intellilang-jps-plugin/src/org/jetbrains/jps/intellilang/model/impl/JpsIntelliLangConfigurationImpl.java
View File

@@ -12,7 +12,7 @@ import org.jetbrains.jps.model.ex.JpsElementChildRoleBase;
*/
public class JpsIntelliLangConfigurationImpl extends JpsElementBase<JpsIntelliLangConfigurationImpl> implements
JpsIntelliLangConfiguration {
public static final JpsElementChildRole<JpsIntelliLangConfiguration> ROLE = JpsElementChildRoleBase.create("IntelliLang");
public static final JpsElementChildRole<JpsIntelliLangConfiguration> ROLE = JpsElementChildRoleBase.create("LangInjection");
private String myPatternAnnotationClassName = "org.intellij.lang.annotations.Pattern";
private InstrumentationType myInstrumentationType = InstrumentationType.ASSERT;

2
plugins/devkit/src/inspections/ComponentModuleRegistrationChecker.kt
View File

@@ -156,7 +156,7 @@ fun isIdeaPlatformModule(module: Module?): Boolean {
private fun findMatchingImplModule(module: Module): Module? {
if (module.name == "openapi") {
return ModuleManager.getInstance(module.project).findModuleByName("java-impl")
return ModuleManager.getInstance(module.project).findModuleByName("intellij.java.impl")
}
if (module.name.endsWith("-api")) {

18
plugins/devkit/src/inspections/quickfix/PluginDescriptorChooser.java
View File

@@ -53,15 +53,15 @@ public class PluginDescriptorChooser {
private static final Map<String, String> INTELLIJ_MODULES =
ContainerUtil.<String, String>immutableMapBuilder()
.put("platform-api", "PlatformExtensions.xml")
.put("platform-impl", "PlatformExtensions.xml")
.put("lang-api", "LangExtensions.xml")
.put("lang-impl", "LangExtensions.xml")
.put("vcs-api", "VcsExtensions.xml")
.put("vcs-impl", "VcsExtensions.xml")
.put("openapi", "IdeaPlugin.xml")
.put("java-impl", "IdeaPlugin.xml")
.put("java-analysis-impl", "IdeaPlugin.xml")
.put("intellij.platform.ide", "PlatformExtensions.xml")
.put("intellij.platform.ide.impl", "PlatformExtensions.xml")
.put("intellij.platform.lang", "LangExtensions.xml")
.put("intellij.platform.lang.impl", "LangExtensions.xml")
.put("intellij.platform.vcs", "VcsExtensions.xml")
.put("intellij.platform.vcs.impl", "VcsExtensions.xml")
.put("intellij.java", "IdeaPlugin.xml")
.put("intellij.java.impl", "IdeaPlugin.xml")
.put("intellij.java.analysis.impl", "IdeaPlugin.xml")
.build();
public static void show(final Project project,

4
plugins/devkit/src/projectRoots/IdeaJdk.java
View File

@@ -350,8 +350,8 @@ public class IdeaJdk extends JavaDependentSdkType implements JavaSdkType {
boolean isUltimate = vfsManager.findFileByUrl(VfsUtilCore.pathToUrl(sdkHome + "/ultimate/ultimate-resources")) != null;
Set<String> suppressedModules = ContainerUtil.newTroveSet("jps-plugin-system");
Set<String> ultimateModules = ContainerUtil.newTroveSet(
"platform-ultimate", "ultimate-resources", "ultimate-verifier",
"diagram-api", "diagram-impl", "uml-plugin");
"intellij.platform.commercial", "intellij.ideaUltimate.resources", "intellij.platform.commercial.verifier",
"intellij.diagram", "intellij.diagram.impl", "intellij.uml");
List<JpsModule> modules = JBIterable.from(model.getProject().getModules())
.filter(o -> {
if (suppressedModules.contains(o.getName())) return false;

2
plugins/devkit/testSources/inspections/InspectionDescriptionNotFoundInspectionTest.java
View File

@@ -40,7 +40,7 @@ public class InspectionDescriptionNotFoundInspectionTest extends JavaCodeInsight
moduleBuilder.addLibrary("core-api", PathUtil.getJarPathForClass(LanguageExtensionPoint.class));
moduleBuilder.addLibrary("analysis-api", PathUtil.getJarPathForClass(LocalInspectionEP.class));
moduleBuilder.addLibrary("platform-resources", Paths.get(PathUtil.getJarPathForClass(LocalInspectionEP.class))
.resolveSibling("platform-resources").toString());
.resolveSibling("intellij.platform.resources").toString());
}
@Override

2
plugins/devkit/testSources/refactoring/InspectionRenameTest.java
View File

@@ -37,7 +37,7 @@ public class InspectionRenameTest extends JavaCodeInsightFixtureTestCase {
moduleBuilder.addLibrary("core-api", PathUtil.getJarPathForClass(LanguageExtensionPoint.class));
moduleBuilder.addLibrary("analysis-api", PathUtil.getJarPathForClass(LocalInspectionEP.class));
moduleBuilder.addLibrary("platform-resources", Paths.get(PathUtil.getJarPathForClass(LocalInspectionEP.class))
.resolveSibling("platform-resources").toString());
.resolveSibling("intellij.platform.resources").toString());
moduleBuilder.addLibrary("platform-api", PathUtil.getJarPathForClass(JBList.class));
moduleBuilder.addLibrary("util", PathUtil.getJarPathForClass(Attribute.class));
}

2
plugins/github/src/org/jetbrains/plugins/github/GithubCreatePullRequestWorker.java
View File

@@ -353,7 +353,7 @@ public class GithubCreatePullRequestWorker {
@NotNull
private DiffInfo doLoadDiffInfo(@NotNull final BranchInfo branch) throws VcsException {
// TODO: make cancelable and abort old speculative requests (when git4idea will allow to do so)
// TODO: make cancelable and abort old speculative requests (when intellij.vcs.git will allow to do so)
String currentBranch = myCurrentBranch;
String targetBranch = branch.getForkInfo().getRemoteName() + "/" + branch.getRemoteName();

4
plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/GroovyBuilder.java
View File

@@ -131,8 +131,8 @@ public class GroovyBuilder extends ModuleLevelBuilder {
static List<String> getGroovyRtRoots() {
File rt = ClasspathBootstrap.getResourceFile(GroovyBuilder.class);
File constants = ClasspathBootstrap.getResourceFile(GroovyRtConstants.class);
return Arrays.asList(new File(rt.getParentFile(), rt.isFile() ? "groovy_rt.jar" : "groovy_rt").getPath(),
new File(constants.getParentFile(), constants.isFile() ? "groovy-rt-constants.jar" : "groovy-rt-constants").getPath());
return Arrays.asList(new File(rt.getParentFile(), rt.isFile() ? "groovy_rt.jar" : "intellij.groovy.rt").getPath(),
new File(constants.getParentFile(), constants.isFile() ? "groovy-rt-constants.jar" : "intellij.groovy.constants.rt").getPath());
}
public static boolean isGroovyFile(String path) {

4
plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTest.groovy
View File

@@ -904,8 +904,8 @@ class AppTest {
addGroovyLibrary(anotherModule)
PsiTestUtil.addProjectLibrary(myModule, "junit", IntelliJProjectConfiguration.getProjectLibraryClassesRootPaths("JUnit3"))
PsiTestUtil.addProjectLibrary(myModule, "cli", IntelliJProjectConfiguration.getModuleLibrary("build", "commons-cli").classesPaths)
PsiTestUtil.addProjectLibrary(anotherModule, "cli", IntelliJProjectConfiguration.getModuleLibrary("build", "commons-cli").classesPaths)
PsiTestUtil.addProjectLibrary(myModule, "cli", IntelliJProjectConfiguration.getModuleLibrary("intellij.ideaCommunity.build", "commons-cli").classesPaths)
PsiTestUtil.addProjectLibrary(anotherModule, "cli", IntelliJProjectConfiguration.getModuleLibrary("intellij.ideaCommunity.build", "commons-cli").classesPaths)
myFixture.addFileToProject("a.groovy", "class Foo extends GroovyTestCase {}")
myFixture.addFileToProject("b.groovy", "class Bar extends CliBuilder {}")

2
plugins/hg4idea/testSrc/hg4idea/test/HgPlatformTest.java
View File

@@ -34,7 +34,7 @@ import static com.intellij.openapi.vcs.Executor.touch;
import static hg4idea.test.HgExecutor.hg;
/**
* The base class for tests of hg4idea plugin.<br/>
* The base class for tests of intellij.vcs.hg plugin.<br/>
* Extend this test to write a test on Mercurial which has the following features/limitations:
* <ul>
* <li>This is a "platform test case", which means that IDEA [almost] production platform is set up before the test starts.</li>

2
plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgTest.java
View File

@@ -37,7 +37,7 @@ import java.lang.reflect.Method;
import static org.testng.Assert.assertTrue;
/**
* The ancestor of all hg4idea test cases.
* The ancestor of all intellij.vcs.hg test cases.
*
* @deprecated Use {@link HgPlatformTest}.
*/

10
plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenServerManager.java
View File

@@ -408,10 +408,10 @@ public class MavenServerManager extends RemoteObjectWrapper<MavenServer> impleme
final String root = pluginFileOrDir.getParent();
if (pluginFileOrDir.isDirectory()) {
classpath.add(new File(root, "maven-server-api"));
classpath.add(new File(root, "intellij.maven.server"));
File parentFile = getMavenPluginParentFile();
if (StringUtil.compareVersionNumbers(mavenVersion, "3") < 0) {
classpath.add(new File(root, "maven2-server-impl"));
classpath.add(new File(root, "intellij.maven.server.m2.impl"));
addDir(classpath, new File(parentFile, "maven2-server-impl/lib"));
// use bundled maven 2.2.1 for all 2.0.x version (since we use org.apache.maven.project.interpolation.StringSearchModelInterpolator introduced in 2.1.0)
if (StringUtil.compareVersionNumbers(mavenVersion, "2.1.0") < 0) {
@@ -419,14 +419,14 @@ public class MavenServerManager extends RemoteObjectWrapper<MavenServer> impleme
}
}
else {
classpath.add(new File(root, "maven3-server-common"));
classpath.add(new File(root, "intellij.maven.server.m3.common"));
addDir(classpath, new File(parentFile, "maven3-server-common/lib"));
if (StringUtil.compareVersionNumbers(mavenVersion, "3.1") < 0) {
classpath.add(new File(root, "maven30-server-impl"));
classpath.add(new File(root, "intellij.maven.server.m30.impl"));
}
else {
classpath.add(new File(root, "maven3-server-impl"));
classpath.add(new File(root, "intellij.maven.server.m3.impl"));
}
}
}

2
plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/CommandExecutor.java
View File

@@ -137,7 +137,7 @@ public class CommandExecutor {
startHandlingStreams();
}
catch (ExecutionException e) {
// TODO: currently startFailed() is not used for some real logic in svn4idea plugin
// TODO: currently startFailed() is not used for some real logic in intellij.vcs.svn plugin
listeners().startFailed(e);
throw new SvnBindException(e);
}

24
plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/SnapShooterConfigurationExtension.java
View File

@@ -58,18 +58,18 @@ public class SnapShooterConfigurationExtension extends RunConfigurationExtension
// add +1 because idea_rt.jar will be added as the last entry to the classpath
params.getProgramParametersList().prepend(Integer.toString(params.getClassPath().getPathList().size() + 1));
Set<String> paths = new TreeSet<>();
paths.add(PathUtil.getJarPathForClass(SnapShooter.class)); // ui-designer-impl
paths.add(PathUtil.getJarPathForClass(BaseComponent.class)); // appcore-api
paths.add(PathUtil.getJarPathForClass(ProjectComponent.class)); // openapi
paths.add(PathUtil.getJarPathForClass(DesignerEditorPanelFacade.class)); // platform-impl
paths.add(PathUtil.getJarPathForClass(LwComponent.class)); // UIDesignerCore
paths.add(PathUtil.getJarPathForClass(GridConstraints.class)); // forms_rt
paths.add(PathUtil.getJarPathForClass(PaletteGroup.class)); // openapi
paths.add(PathUtil.getJarPathForClass(LafManagerListener.class)); // ui-impl
paths.add(PathUtil.getJarPathForClass(DataProvider.class)); // action-system-openapi
paths.add(PathUtil.getJarPathForClass(XmlStringUtil.class)); // idea
paths.add(PathUtil.getJarPathForClass(Navigatable.class)); // pom
paths.add(PathUtil.getJarPathForClass(AreaInstance.class)); // extensions
paths.add(PathUtil.getJarPathForClass(SnapShooter.class)); // intellij.java.guiForms.designer
paths.add(PathUtil.getJarPathForClass(BaseComponent.class)); // intellij.platform.core
paths.add(PathUtil.getJarPathForClass(ProjectComponent.class)); // intellij.java
paths.add(PathUtil.getJarPathForClass(DesignerEditorPanelFacade.class)); // intellij.platform.ide.impl
paths.add(PathUtil.getJarPathForClass(LwComponent.class)); // intellij.java.guiForms.compiler
paths.add(PathUtil.getJarPathForClass(GridConstraints.class)); // intellij.java.guiForms.rt
paths.add(PathUtil.getJarPathForClass(PaletteGroup.class)); // intellij.java.guiForms.designer
paths.add(PathUtil.getJarPathForClass(LafManagerListener.class)); // intellij.platform.ide
paths.add(PathUtil.getJarPathForClass(DataProvider.class)); // intellij.platform.editor
paths.add(PathUtil.getJarPathForClass(XmlStringUtil.class)); // intellij.platform.util
paths.add(PathUtil.getJarPathForClass(Navigatable.class)); // intellij.platform.core
paths.add(PathUtil.getJarPathForClass(AreaInstance.class)); // intellij.platform.extensions
paths.add(PathUtil.getJarPathForClass(FormLayout.class)); // jgoodies
paths.addAll(PathManager.getUtilClassPath());
for(String path: paths) {

2
plugins/ui-designer/testSrc/com/intellij/uiDesigner/core/AsmCodeGeneratorTest.java
View File

@@ -77,7 +77,7 @@ public class AsmCodeGeneratorTest extends TestCase {
appendPath(cp, ApplicationManager.class);
appendPath(cp, PathManager.getResourceRoot(this.getClass(), "/messages/UIBundle.properties"));
appendPath(cp, PathManager.getResourceRoot(this.getClass(), "/RuntimeBundle.properties"));
appendPath(cp, GridLayoutManager.class); // forms_rt
appendPath(cp, GridLayoutManager.class); // intellij.java.guiForms.rt
appendPath(cp, DataProvider.class);
appendPath(cp, BaseState.class);
appendPath(cp, KDeclarationContainer.class);

2
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/context/ContextType.java
View File

@@ -26,7 +26,7 @@ public final class ContextType {
public static final ContextType PLAIN = lookupOrCreate("PLAIN", XPathVersion.V1);
public static final ContextType PLAIN_V2 = lookupOrCreate("PLAIN_V2", XPathVersion.V2);
/** @deprecated left here for compatibility with IntelliLang */
/** @deprecated left here for compatibility with intellij.platform.langInjection */
public static final ContextType INTERACTIVE = lookupOrCreate("INTERACTIVE");
private final String myName;

4
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltCommandLineState.java
View File

@@ -137,7 +137,7 @@ public class XsltCommandLineState extends CommandLineState {
vmParameters.defineProperty("xslt.smart-error-handling", String.valueOf(myXsltRunConfiguration.mySmartErrorHandling));
final PluginId pluginId = PluginManagerCore.getPluginByClassName(getClass().getName());
assert pluginId != null || System.getProperty("xslt.plugin.path") != null : "PluginId not found - development builds need to specify -Dxslt.plugin.path=../out/classes/production/xslt-rt";
assert pluginId != null || System.getProperty("xslt.plugin.path") != null : "PluginId not found - development builds need to specify -Dxslt.plugin.path=../out/classes/production/intellij.xslt.debugger.rt";
final File pluginPath;
if (pluginId != null) {
@@ -146,7 +146,7 @@ public class XsltCommandLineState extends CommandLineState {
pluginPath = descriptor.getPath();
}
else {
// -Dxslt.plugin.path=C:\work\java\intellij/ultimate\out\classes\production\xslt-rt
// -Dxslt.plugin.path=C:\work\java\intellij/ultimate\out\classes\production\intellij.xslt.debugger.rt
pluginPath = new File(System.getProperty("xslt.plugin.path"));
}

2
plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/TestBase.java
View File

@@ -43,7 +43,7 @@ public abstract class TestBase extends UsefulTestCase {
}
public static String getTestDataPath(String subPath) {
// path logic taken from RegExpSupport tests
// path logic taken from intellij.regexp tests
final String def = PluginPathManager.getPluginHomePath("xpath") + "/xpath-lang/testData";
return System.getProperty("idea.xpath.testdata-path", def) + "/" + subPath;
}

6
plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/XsltDebuggerExtension.java
View File

@@ -139,7 +139,7 @@ public class XsltDebuggerExtension extends XsltRunnerExtension {
assert descriptor != null;
pluginPath = descriptor.getPath();
} else {
// -Dxslt-debugger.plugin.path=C:\work\java\intellij/ultimate\out\classes\production\xslt-debugger-engine
// -Dxslt-debugger.plugin.path=C:\work\java\intellij/ultimate\out\classes\production\intellij.xslt.debugger.engine
pluginPath = new File(System.getProperty("xslt-debugger.plugin.path"));
}
@@ -158,7 +158,7 @@ public class XsltDebuggerExtension extends XsltRunnerExtension {
if (!(rtClasspath = new File(pluginPath, "classes")).exists()) {
if (ApplicationManagerEx.getApplicationEx().isInternal() && new File(pluginPath, "org").exists()) {
rtClasspath = pluginPath;
final File engineImplInternal = new File(pluginPath, ".." + c + "xslt-debugger-engine-impl");
final File engineImplInternal = new File(pluginPath, ".." + c + "intellij.xslt.debugger.engine.impl");
assert engineImplInternal.exists() : engineImplInternal.getAbsolutePath();
parameters.getClassPath().addTail(engineImplInternal.getAbsolutePath());
} else {
@@ -283,7 +283,7 @@ public class XsltDebuggerExtension extends XsltRunnerExtension {
File transformerFile = new File(pluginPath, "lib" + c + "rt" + c + jarFile);
if (!transformerFile.exists()) {
if (!(transformerFile = new File(pluginPath, "lib" + c + jarFile)).exists()) {
if (!(transformerFile = new File(new File(pluginPath, ".." + c + "xslt-debugger-engine-impl"), jarFile)).exists()) {
if (!(transformerFile = new File(new File(pluginPath, ".." + c + "intellij.xslt.debugger.engine.impl"), jarFile)).exists()) {
transformerFile = new File(pluginPath, jarFile);
assert transformerFile.exists() : transformerFile.getAbsolutePath();
}

2
python/pluginJava/META-INF/python-community-plugin-java.xml
View File

@@ -9,7 +9,7 @@
<projectStructureDetector implementation="com.jetbrains.python.module.PyProjectStructureDetector"/>
<moduleConfigurationEditorProvider implementation="com.jetbrains.python.module.PythonModuleConfigurationEditorProvider"/>
<completion.contributor language="Python" implementationClass="com.jetbrains.python.psi.impl.PyConstructorArgumentCompletionContributor"/>
<!-- Console folding for Jython only, thus it's located in python-plugin only -->
<!-- Console folding for Jython only, thus it's located in intellij.python.plugin only -->
<stacktrace.fold substring="*sys-package-mgr*:"/>
<sdkEditorAdditionalOptionsProvider implementation="com.jetbrains.python.PythonSdkEditorAdditionalOptionsProvider"/>
</extensions>

4
python/pluginResources/META-INF/python-plugin-dependencies.xml
View File

@@ -1,7 +1,7 @@
<idea-plugin>
<!-- This version of python-plugin-dependencies.xml is used when running IntelliJ IDEA with
Python plugin from sources. In this configuration, all auxiliary modules (python-javascript-debugger,
python-localization etc.) are loaded as separate plugins, so they mustnt' be loaded again as
Python plugin from sources. In this configuration, all auxiliary modules (intellij.python.javascript.debugger,
intellij.python.localization etc.) are loaded as separate plugins, so they mustnt' be loaded again as
parts of the Python plugin.
The version of python-plugin-dependencies.xml used in production builds can be found under the

2
resources/src/idea/RichPlatformPlugin.xml
View File

@@ -264,7 +264,7 @@
<!-- Application Configurables -->
<!-- Path Variables -->
<!-- the implementation of this configurable is in platform-impl but it's not registered in platform because
<!-- the implementation of this configurable is in intellij.platform.ide.impl but it's not registered in platform because
it's only required in full IDEA -->
<applicationConfigurable groupId="appearance" groupWeight="-10" instance="com.intellij.application.options.pathMacros.PathMacroConfigurable" id="preferences.pathVariables"
key="title.path.variables" bundle="messages.ApplicationBundle"/>

2
update-server-mock/settings.gradle
View File

@@ -1 +1 @@
rootProject.name = 'update-server-mock'
rootProject.name = 'intellij.tools.updateServerMock'