MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-21 05:51:25 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'a85b798667f6a81500b21eda3c8d508a28cb969c' into slava/out_of_process_sim_and_dev

Browse Source 
GitOrigin-RevId: ccfc7bb2ab1846fbf2c169f6262ffa412f3efb80
This commit is contained in:
Vyacheslav Karpukhin
2019-06-12 19:23:33 +02:00
committed by intellij-monorepo-bot
parent 7afa5ca0ac
commit e4effb75b9
278 changed files with 2439 additions and 3773 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/modules.xml generated
View File

@@ -571,7 +571,6 @@
<module fileurl="file://$PROJECT_DIR$/platform/external-system-api/intellij.platform.externalSystem.iml" filepath="$PROJECT_DIR$/platform/external-system-api/intellij.platform.externalSystem.iml" />
<module fileurl="file://$PROJECT_DIR$/platform/external-system-impl/intellij.platform.externalSystem.impl.iml" filepath="$PROJECT_DIR$/platform/external-system-impl/intellij.platform.externalSystem.impl.iml" />
<module fileurl="file://$PROJECT_DIR$/platform/external-system-rt/intellij.platform.externalSystem.rt.iml" filepath="$PROJECT_DIR$/platform/external-system-rt/intellij.platform.externalSystem.rt.iml" />
<module fileurl="file://$PROJECT_DIR$/platform/external-system-impl/intellij.platform.externalSystem.tests.iml" filepath="$PROJECT_DIR$/platform/external-system-impl/intellij.platform.externalSystem.tests.iml" />
<module fileurl="file://$PROJECT_DIR$/platform/icons/intellij.platform.icons.iml" filepath="$PROJECT_DIR$/platform/icons/intellij.platform.icons.iml" />
<module fileurl="file://$PROJECT_DIR$/platform/platform-api/intellij.platform.ide.iml" filepath="$PROJECT_DIR$/platform/platform-api/intellij.platform.ide.iml" />
<module fileurl="file://$PROJECT_DIR$/platform/platform-impl/intellij.platform.ide.impl.iml" filepath="$PROJECT_DIR$/platform/platform-impl/intellij.platform.ide.impl.iml" />
@@ -664,7 +663,6 @@
<module fileurl="file://$PROJECT_DIR$/python/python-community-configure/intellij.python.configure.iml" filepath="$PROJECT_DIR$/python/python-community-configure/intellij.python.configure.iml" />
<module fileurl="file://$PROJECT_DIR$/python/python-copyright/intellij.python.copyright.iml" filepath="$PROJECT_DIR$/python/python-copyright/intellij.python.copyright.iml" />
<module fileurl="file://$PROJECT_DIR$/python/intellij.python.helpers.iml" filepath="$PROJECT_DIR$/python/intellij.python.helpers.iml" />
<module fileurl="file://$PROJECT_DIR$/python/helpers/tests/intellij.python.helpers.tests.iml" filepath="$PROJECT_DIR$/python/helpers/tests/intellij.python.helpers.tests.iml" />
<module fileurl="file://$PROJECT_DIR$/python/IntelliLang-python/intellij.python.langInjection.iml" filepath="$PROJECT_DIR$/python/IntelliLang-python/intellij.python.langInjection.iml" />
<module fileurl="file://$PROJECT_DIR$/python/psi-api/intellij.python.psi.iml" filepath="$PROJECT_DIR$/python/psi-api/intellij.python.psi.iml" />
<module fileurl="file://$PROJECT_DIR$/python/intellij.python.pydev.iml" filepath="$PROJECT_DIR$/python/intellij.python.pydev.iml" />

2
build.txt
View File

@@ -1 +1 @@
193.SNAPSHOT
192.SNAPSHOT

5
build/dependencies/gradle.properties
View File

@@ -2,7 +2,8 @@
# kotlinPluginBuild format: <plugin-version>[:<channel>], e.g. 1.3.20-release-IJ2018.3-1 or 1.3.20-eap-100-IJ2018.3-1:EAP
kotlinPluginBuild=1.3.31-release-IJ2019.2-1
jetSignBuild=42.30
jdkBuild=11_0_3b304.2
secondJreVersion=11
secondJreBuild=11_0_3b304.2
bundledMavenVersion=3.6.1
secondJreBuild=u212b1586.4
jdkBuild=u212b1586.4
gradleApiVersion=5.2.1

5
build/dependencies/setupJbre.gradle
View File

@@ -5,14 +5,15 @@ import java.util.concurrent.TimeUnit
task setupJbre()
def targetOs = System.getProperty("intellij.build.target.os", "all")
def jreVersion = System.getProperty("intellij.build.bundled.jre.version", "11").toInteger()
def jreVersion = System.getProperty("intellij.build.bundled.jre.version", "8").toInteger()
def jreBuild = System.getProperty("intellij.build.bundled.jre.build", jdkBuild)
def jrePrefix = System.getProperty("intellij.build.bundled.jre.prefix")
createJbreTasks(jreBuild, jreVersion, targetOs, jrePrefix)
if (System.getProperty('intellij.build.bundle.second.jre', 'false').toBoolean()) {
def secondJreBuild = System.getProperty("intellij.build.bundled.second.jre.build", secondJreBuild)
createJbreTasks(secondJreBuild, 8, targetOs)
def secondJreVersion = System.getProperty("intellij.build.bundled.second.jre.version", secondJreVersion).toInteger()
createJbreTasks(secondJreBuild, secondJreVersion, targetOs)
}
/**

2
build/dependencies/setupJdk.gradle
View File

@@ -11,7 +11,7 @@ cleanSetupJdks.dependsOn('cleanSetupJdk', 'cleanSetupJdk16', 'cleanDownloadJdk')
project.ext.jdkRepo = 'https://cache-redirector.jetbrains.com/intellij-jbr'
project.ext.jdkVersion = System.getProperty('intellij.build.jdk.version', '8').toInteger()
def isModular = jdkVersion > 8
project.ext.build = isModular ? jdkBuild : secondJreBuild
project.ext.build = isModular ? secondJreBuild : jdkBuild
def setupJbrSdk = System.getProperty('intellij.build.jbr.setupSdk', 'false').toBoolean()
project.ext.jdkArtifactPrefix = isModular && !setupJbrSdk ? 'jbr-' : 'jbrsdk-'

8
build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy
View File

@@ -97,13 +97,9 @@ abstract class BaseIdeaProperties extends ProductProperties {
//for compatibility with generated Ant build.xml files which refer to this file
productLayout.additionalPlatformJars.
putAll("javac2.jar",
["intellij.java.compiler.antTasks", "intellij.java.guiForms.compiler", "intellij.java.guiForms.rt",
"intellij.java.compiler.instrumentationUtil", "intellij.java.compiler.instrumentationUtil.java8",
"intellij.java.jps.javacRefScanner8"])
putAll("javac2.jar", ["intellij.java.compiler.antTasks", "intellij.java.guiForms.compiler", "intellij.java.guiForms.rt", "intellij.java.compiler.instrumentationUtil", "intellij.java.compiler.instrumentationUtil.java8", "intellij.java.jps.javacRefScanner8"])
productLayout.additionalPlatformJars.put("resources.jar", "intellij.java.ide.resources")
productLayout.additionalPlatformJars.put("external-system-rt.jar", "intellij.platform.externalSystem.rt")
productLayout.platformLayoutCustomizer = { PlatformLayout layout ->
layout.customize {
@@ -143,4 +139,4 @@ abstract class BaseIdeaProperties extends ProductProperties {
//for compatibility with users projects which refer to IDEA_HOME/lib/annotations.jar
context.ant.move(file: "$targetDirectory/lib/annotations-java5.jar", tofile: "$targetDirectory/lib/annotations.jar")
}
}
}

2
community-resources/src/idea/IdeaApplicationInfo.xml
View File

@@ -1,7 +1,7 @@
<component xmlns="http://jetbrains.org/intellij/schema/application-info"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://jetbrains.org/intellij/schema/application-info http://jetbrains.org/intellij/schema/ApplicationInfo.xsd">
<version major="2019" minor="3" eap="true" suffix="Snapshot"/>
<version major="2019" minor="2" eap="true" suffix="Snapshot"/>
<company name="JetBrains s.r.o." url="https://www.jetbrains.com"/>
<build number="IC-__BUILD__" date="__BUILD_DATE__"/>
<logo url="/idea_community_logo.png" textcolor="ffffff" progressColor="ffffff" progressX="117" progressY="280" progressHeight="3" />

1
java/compiler/impl/intellij.java.compiler.impl.iml
View File

@@ -30,7 +30,6 @@
<orderEntry type="library" name="protobuf" level="project" />
<orderEntry type="library" name="netty-codec-http" level="project" />
<orderEntry type="module" module-name="intellij.platform.vcs.impl" />
<orderEntry type="module" module-name="intellij.platform.externalSystem" />
</component>
<component name="copyright">
<Base>

1
java/compiler/openapi/intellij.java.compiler.iml
View File

@@ -11,7 +11,6 @@
<orderEntry type="module" module-name="intellij.platform.projectModel.impl" />
<orderEntry type="library" name="JDOM" level="project" />
<orderEntry type="module" module-name="intellij.platform.util.ui" />
<orderEntry type="module" module-name="intellij.platform.externalSystem" />
</component>
<component name="copyright">
<Base>

17
java/compiler/openapi/src/com/intellij/openapi/externalSystem/project/PackagingModifiableModel.java
View File

@@ -1,17 +0,0 @@
// Copyright 2000-2019 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.openapi.externalSystem.project;
import com.intellij.openapi.externalSystem.service.project.ModifiableModel;
import com.intellij.packaging.artifacts.ModifiableArtifactModel;
import com.intellij.packaging.elements.PackagingElementResolvingContext;
import org.jetbrains.annotations.NotNull;
public interface PackagingModifiableModel extends ModifiableModel {
@NotNull
ModifiableArtifactModel getModifiableArtifactModel();
@NotNull
PackagingElementResolvingContext getPackagingElementResolvingContext();
ArtifactExternalDependenciesImporter getArtifactExternalDependenciesImporter();
}

1
java/execution/impl/intellij.java.execution.impl.iml
View File

@@ -22,7 +22,6 @@
<orderEntry type="library" name="intellij-test-discovery" level="project" />
<orderEntry type="library" scope="RUNTIME" name="precompiled_jshell-frontend" level="project" />
<orderEntry type="module" module-name="intellij.platform.externalSystem" />
<orderEntry type="module" module-name="intellij.platform.externalSystem.impl" />
<orderEntry type="library" name="gson" level="project" />
<orderEntry type="library" name="jackson" level="project" />
<orderEntry type="library" name="miglayout-swing" level="project" />

77
java/execution/impl/src/com/intellij/execution/ExternalSystemRunConfigurationJavaExtension.java
View File

@@ -1,77 +0,0 @@
// Copyright 2000-2019 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.execution;
import com.intellij.execution.configurations.*;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.externalSystem.service.execution.ExternalSystemProcessHandler;
import com.intellij.openapi.externalSystem.service.execution.ExternalSystemRunConfiguration;
import com.intellij.openapi.externalSystem.service.execution.ExternalSystemRunConfigurationExtension;
import com.intellij.openapi.options.SettingsEditorGroup;
import org.jdom.Element;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@ApiStatus.Experimental
public class ExternalSystemRunConfigurationJavaExtension implements ExternalSystemRunConfigurationExtension {
private static final Logger LOG = Logger.getInstance(ExternalSystemRunConfigurationJavaExtension.class);
@Override
public void readExternal(@NotNull ExternalSystemRunConfiguration configuration, @NotNull Element element) {
JavaRunConfigurationExtensionManager javaRunConfigurationExtensionManager = JavaRunConfigurationExtensionManager.getInstanceOrNull();
if (javaRunConfigurationExtensionManager != null) {
javaRunConfigurationExtensionManager.readExternal(configuration, element);
}
}
@Override
public void writeExternal(@NotNull ExternalSystemRunConfiguration configuration, @NotNull Element element) {
JavaRunConfigurationExtensionManager javaRunConfigurationExtensionManager = JavaRunConfigurationExtensionManager.getInstanceOrNull();
if (javaRunConfigurationExtensionManager != null) {
javaRunConfigurationExtensionManager.writeExternal(configuration, element);
}
}
@Override
public void appendEditors(@NotNull ExternalSystemRunConfiguration configuration,
@NotNull SettingsEditorGroup<ExternalSystemRunConfiguration> group) {
JavaRunConfigurationExtensionManager javaRunConfigurationExtensionManager = JavaRunConfigurationExtensionManager.getInstanceOrNull();
if (javaRunConfigurationExtensionManager != null) {
javaRunConfigurationExtensionManager.appendEditors(configuration, group);
}
}
@Override
public void attachToProcess(@NotNull ExternalSystemRunConfiguration configuration,
@NotNull ExternalSystemProcessHandler processHandler,
@Nullable RunnerSettings settings) {
JavaRunConfigurationExtensionManager javaRunConfigurationExtensionManager = JavaRunConfigurationExtensionManager.getInstanceOrNull();
if (javaRunConfigurationExtensionManager != null) {
javaRunConfigurationExtensionManager.attachExtensionsToProcess(configuration, processHandler, settings);
}
}
@Override
public void updateVMParameters(@NotNull ExternalSystemRunConfiguration configuration,
@NotNull SimpleJavaParameters javaParameters,
@Nullable RunnerSettings settings,
@NotNull Executor executor) {
final JavaParameters extensionsJP = new JavaParameters();
for (RunConfigurationExtension ext : RunConfigurationExtension.EP_NAME.getExtensionList()) {
try {
ext.updateJavaParameters(configuration, extensionsJP, settings, executor);
}
catch (ExecutionException e) {
LOG.error(e);
}
}
copy(extensionsJP.getVMParametersList(), javaParameters.getVMParametersList());
}
private static void copy(@NotNull ParametersList from, @NotNull ParametersList to) {
to.addAll(from.getParameters());
for (ParamsGroup group : from.getParamsGroups()) {
to.addParamsGroup(group);
}
}
}

9
java/execution/impl/src/com/intellij/execution/RunConfigurationExtension.java
View File

@@ -19,15 +19,14 @@ public abstract class RunConfigurationExtension extends RunConfigurationExtensio
new ExtensionPointName<>("com.intellij.runConfigurationExtension");
@ApiStatus.Experimental
public <T extends RunConfigurationBase> void updateJavaParameters(@NotNull final T configuration,
@NotNull final JavaParameters params,
public <T extends RunConfigurationBase> void updateJavaParameters(final T configuration,
final JavaParameters params,
RunnerSettings runnerSettings,
@NotNull final Executor executor) throws ExecutionException {
updateJavaParameters(configuration, params, runnerSettings);
updateJavaParameters(configuration,params,runnerSettings);
}
public abstract <T extends RunConfigurationBase> void updateJavaParameters(@NotNull final T configuration,
@NotNull final JavaParameters params, RunnerSettings runnerSettings) throws ExecutionException;
public abstract <T extends RunConfigurationBase> void updateJavaParameters(final T configuration, final JavaParameters params, RunnerSettings runnerSettings) throws ExecutionException;
@Override
protected void patchCommandLine(@NotNull RunConfigurationBase configuration,

5
java/execution/impl/src/com/intellij/execution/application/BaseJavaApplicationCommandLineState.java
View File

@@ -18,14 +18,14 @@ import org.jetbrains.annotations.NotNull;
* @author nik
*/
public abstract class BaseJavaApplicationCommandLineState<T extends RunConfigurationBase&CommonJavaRunConfigurationParameters> extends JavaCommandLineState {
@NotNull protected final T myConfiguration;
protected final T myConfiguration;
public BaseJavaApplicationCommandLineState(ExecutionEnvironment environment, @NotNull final T configuration) {
super(environment);
myConfiguration = configuration;
}
protected void setupJavaParameters(@NotNull JavaParameters params) throws ExecutionException {
protected void setupJavaParameters(JavaParameters params) throws ExecutionException {
JavaParametersUtil.configureConfiguration(params, myConfiguration);
for (RunConfigurationExtension ext : RunConfigurationExtension.EP_NAME.getExtensionList()) {
@@ -53,7 +53,6 @@ public abstract class BaseJavaApplicationCommandLineState<T extends RunConfigura
return super.createCommandLine().withInput(InputRedirectAware.getInputFile(myConfiguration));
}
@NotNull
protected T getConfiguration() {
return myConfiguration;
}

2
java/execution/impl/src/com/intellij/execution/scratch/JavaScratchConfiguration.java
View File

@@ -81,7 +81,7 @@ public class JavaScratchConfiguration extends ApplicationConfiguration {
}
@Override
protected void setupJavaParameters(@NotNull JavaParameters params) throws ExecutionException {
protected void setupJavaParameters(JavaParameters params) throws ExecutionException {
super.setupJavaParameters(params);
final File scrachesOutput = JavaScratchCompilationSupport.getScratchOutputDirectory(getProject());
if (scrachesOutput != null) {

2
java/execution/impl/src/com/intellij/execution/testDiscovery/TestDiscoveryExtension.java
View File

@@ -75,7 +75,7 @@ public class TestDiscoveryExtension extends RunConfigurationExtension {
}
@Override
public void updateJavaParameters(@NotNull RunConfigurationBase configuration, @NotNull JavaParameters params, RunnerSettings runnerSettings) {
public void updateJavaParameters(RunConfigurationBase configuration, JavaParameters params, RunnerSettings runnerSettings) {
if (runnerSettings != null || !isApplicableFor(configuration)) {
return;
}

15
java/ide-resources/resources/META-INF/JavaIdePlugin.xml
View File

@@ -45,6 +45,16 @@
</xi:include>
<xi:include href="/META-INF/coverage-common-plugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
<module value="com.intellij.modules.externalSystem"/>
<xi:include href="/componentSets/ExternalSystemComponents.xml" xpointer="xpointer(/idea-plugin/*)"/>
<extensionPoints>
<xi:include href="/META-INF/ExternalSystemExtensionPoints.xml" xpointer="xpointer(/idea-plugin/extensionPoints/*)"/>
</extensionPoints>
<extensions defaultExtensionNs="com.intellij">
<xi:include href="/META-INF/ExternalSystemExtensions.xml" xpointer="xpointer(/idea-plugin/extensions/*)"/>
</extensions>
<xi:include href="/idea/ExternalSystemActions.xml" xpointer="xpointer(/idea-plugin/*)"/>
<extensions defaultExtensionNs="com.intellij">
<applicationInitializedListener implementation="com.intellij.internal.statistic.updater.StatisticsJobsScheduler"/>
@@ -151,10 +161,5 @@
<action id="ConsoleView.FoldLinesLikeThis" class="com.intellij.execution.console.FoldLinesLikeThis" text="Fold Lines Like This">
<add-to-group group-id="ConsoleEditorPopupMenu" anchor="after" relative-to-action="$SearchWeb"/>
</action>
<action id="ExternalSystem.AttachProject"
class="com.intellij.openapi.externalSystem.action.AttachExternalProjectAction">
<add-to-group group-id="ExternalSystemView.ActionsToolbar.LeftPanel" anchor="after" relative-to-action="ExternalSystem.RefreshAllProjects"/>
</action>
</actions>
</idea-plugin>

2
java/idea-ui/intellij.java.ui.iml
View File

@@ -16,7 +16,5 @@
<orderEntry type="module" module-name="intellij.platform.vcs.impl" />
<orderEntry type="library" name="Guava" level="project" />
<orderEntry type="library" name="jna" level="project" />
<orderEntry type="module" module-name="intellij.platform.externalSystem" />
<orderEntry type="module" module-name="intellij.platform.externalSystem.impl" />
</component>
</module>

276
java/idea-ui/src/com/intellij/openapi/externalSystem/service/project/PackagingModifiableModelImpl.java
View File

@@ -1,276 +0,0 @@
// Copyright 2000-2019 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.openapi.externalSystem.service.project;
import com.intellij.facet.Facet;
import com.intellij.facet.FacetModel;
import com.intellij.facet.FacetTypeId;
import com.intellij.openapi.application.ReadAction;
import com.intellij.openapi.externalSystem.project.ArtifactExternalDependenciesImporter;
import com.intellij.openapi.externalSystem.project.PackagingModifiableModel;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.ModuleRootModel;
import com.intellij.openapi.roots.ProjectModelExternalSource;
import com.intellij.openapi.roots.libraries.Library;
import com.intellij.openapi.roots.libraries.LibraryTable;
import com.intellij.openapi.roots.libraries.LibraryTablesRegistrar;
import com.intellij.openapi.roots.ui.configuration.FacetsProvider;
import com.intellij.openapi.roots.ui.configuration.ModulesProvider;
import com.intellij.packaging.artifacts.*;
import com.intellij.packaging.elements.CompositePackagingElement;
import com.intellij.packaging.elements.ManifestFileProvider;
import com.intellij.packaging.elements.PackagingElementResolvingContext;
import com.intellij.packaging.impl.artifacts.DefaultManifestFileProvider;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Collection;
import java.util.List;
public class PackagingModifiableModelImpl implements PackagingModifiableModel {
private final Project myProject;
private final IdeModifiableModelsProvider myModelsProvider;
private ModifiableArtifactModel myModifiableArtifactModel;
private MyPackagingElementResolvingContext myPackagingElementResolvingContext;
private final ArtifactExternalDependenciesImporter myArtifactExternalDependenciesImporter;
public PackagingModifiableModelImpl(@NotNull Project project, @NotNull IdeModifiableModelsProvider modifiableModelsProvider) {
myProject = project;
myModelsProvider = modifiableModelsProvider;
myArtifactExternalDependenciesImporter = new ArtifactExternalDependenciesImporterImpl();
}
@Override
@NotNull
public ModifiableArtifactModel getModifiableArtifactModel() {
if (myModifiableArtifactModel == null) {
myModifiableArtifactModel = myModelsProvider instanceof IdeUIModifiableModelsProvider
?
((IdeUIModifiableModelsProvider)myModelsProvider).getModifiableArtifactModel()
: doGetModifiableArtifactModel();
}
return myModifiableArtifactModel;
}
private ModifiableArtifactModel doGetModifiableArtifactModel() {
return ReadAction.compute(() -> {
ArtifactManager artifactManager = ArtifactManager.getInstance(myProject);
return artifactManager != null ? artifactManager.createModifiableModel() : new DummyArtifactModel();
});
}
@NotNull
@Override
public PackagingElementResolvingContext getPackagingElementResolvingContext() {
if (myPackagingElementResolvingContext == null) {
myPackagingElementResolvingContext = new MyPackagingElementResolvingContext();
}
return myPackagingElementResolvingContext;
}
@Override
public ArtifactExternalDependenciesImporter getArtifactExternalDependenciesImporter() {
return myArtifactExternalDependenciesImporter;
}
@Override
public void commit() {
myArtifactExternalDependenciesImporter.applyChanges(getModifiableArtifactModel(), getPackagingElementResolvingContext());
if (myModifiableArtifactModel != null) {
myModifiableArtifactModel.commit();
}
}
@Override
public void dispose() {
if (myModifiableArtifactModel != null) {
myModifiableArtifactModel.dispose();
}
}
private class MyPackagingElementResolvingContext implements PackagingElementResolvingContext {
private final ModulesProvider myModulesProvider = new MyModulesProvider();
private final MyFacetsProvider myFacetsProvider = new MyFacetsProvider();
private final ManifestFileProvider myManifestFileProvider = new DefaultManifestFileProvider(this);
@Override
@NotNull
public Project getProject() {
return myProject;
}
@Override
@NotNull
public ArtifactModel getArtifactModel() {
return PackagingModifiableModelImpl.this.getModifiableArtifactModel();
}
@Override
@NotNull
public ModulesProvider getModulesProvider() {
return myModulesProvider;
}
@Override
@NotNull
public FacetsProvider getFacetsProvider() {
return myFacetsProvider;
}
@Override
public Library findLibrary(@NotNull String level, @NotNull String libraryName) {
if (level.equals(LibraryTablesRegistrar.PROJECT_LEVEL)) {
return myModelsProvider.getLibraryByName(libraryName);
}
final LibraryTable table = LibraryTablesRegistrar.getInstance().getLibraryTableByLevel(level, myProject);
return table != null ? table.getLibraryByName(libraryName) : null;
}
@NotNull
@Override
public ManifestFileProvider getManifestFileProvider() {
return myManifestFileProvider;
}
}
private class MyModulesProvider implements ModulesProvider {
@Override
@NotNull
public Module[] getModules() {
return myModelsProvider.getModules();
}
@Override
public Module getModule(@NotNull String name) {
return myModelsProvider.findIdeModule(name);
}
@Override
public ModuleRootModel getRootModel(@NotNull Module module) {
return myModelsProvider.getModifiableRootModel(module);
}
@NotNull
@Override
public FacetModel getFacetModel(@NotNull Module module) {
return myModelsProvider.getModifiableFacetModel(module);
}
}
private class MyFacetsProvider implements FacetsProvider {
@Override
@NotNull
public Facet[] getAllFacets(Module module) {
return myModelsProvider.getModifiableFacetModel(module).getAllFacets();
}
@Override
@NotNull
public <F extends Facet> Collection<F> getFacetsByType(Module module, FacetTypeId<F> type) {
return myModelsProvider.getModifiableFacetModel(module).getFacetsByType(type);
}
@Override
public <F extends Facet> F findFacet(Module module, FacetTypeId<F> type, String name) {
return myModelsProvider.getModifiableFacetModel(module).findFacet(type, name);
}
}
private static class DummyArtifactModel implements ModifiableArtifactModel {
@NotNull
@Override
public ModifiableArtifact addArtifact(@NotNull String name, @NotNull ArtifactType artifactType) {
throw new UnsupportedOperationException();
}
@NotNull
@Override
public ModifiableArtifact addArtifact(@NotNull String name,
@NotNull ArtifactType artifactType,
CompositePackagingElement<?> rootElement) {
throw new UnsupportedOperationException();
}
@NotNull
@Override
public ModifiableArtifact addArtifact(@NotNull String name,
@NotNull ArtifactType artifactType,
CompositePackagingElement<?> rootElement,
@Nullable ProjectModelExternalSource externalSource) {
throw new UnsupportedOperationException();
}
@Override
public void removeArtifact(@NotNull Artifact artifact) {
}
@NotNull
@Override
public ModifiableArtifact getOrCreateModifiableArtifact(@NotNull Artifact artifact) {
throw new UnsupportedOperationException();
}
@Nullable
@Override
public Artifact getModifiableCopy(Artifact artifact) {
return null;
}
@Override
public void addListener(@NotNull ArtifactListener listener) {
}
@Override
public void removeListener(@NotNull ArtifactListener listener) {
}
@Override
public boolean isModified() {
return false;
}
@Override
public void commit() {
}
@Override
public void dispose() {
}
@NotNull
@Override
public Artifact[] getArtifacts() {
return new Artifact[0];
}
@Nullable
@Override
public Artifact findArtifact(@NotNull String name) {
return null;
}
@NotNull
@Override
public Artifact getArtifactByOriginal(@NotNull Artifact artifact) {
throw new UnsupportedOperationException();
}
@NotNull
@Override
public Artifact getOriginalArtifact(@NotNull Artifact artifact) {
throw new UnsupportedOperationException();
}
@NotNull
@Override
public Collection<? extends Artifact> getArtifactsByType(@NotNull ArtifactType type) {
throw new UnsupportedOperationException();
}
@Override
public List<? extends Artifact> getAllArtifactsIncludingInvalid() {
throw new UnsupportedOperationException();
}
}
}

19
java/idea-ui/src/com/intellij/openapi/externalSystem/service/project/PackagingModifiableModelProvider.java
View File

@@ -1,19 +0,0 @@
// Copyright 2000-2019 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.openapi.externalSystem.service.project;
import com.intellij.openapi.externalSystem.project.PackagingModifiableModel;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Pair;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
@ApiStatus.Experimental
public class PackagingModifiableModelProvider implements ModifiableModelsProviderExtension<PackagingModifiableModel> {
@NotNull
@Override
public Pair<Class<PackagingModifiableModel>, PackagingModifiableModel> create(@NotNull Project project,
@NotNull IdeModifiableModelsProvider modelsProvider) {
return Pair.create(PackagingModifiableModel.class, new PackagingModifiableModelImpl(project, modelsProvider));
}
}

26
java/java-analysis-impl/src/com/intellij/codeInspection/testOnly/TestOnlyInspection.java
View File

@@ -47,16 +47,8 @@ public class TestOnlyInspection extends AbstractBaseJavaLocalInspectionTool {
public PsiElementVisitor buildVisitor(@NotNull final ProblemsHolder h, boolean isOnTheFly) {
return new JavaElementVisitor() {
@Override
public void visitMethodCallExpression(PsiMethodCallExpression expression) {
validate(expression.getMethodExpression(), expression.resolveMethod(), h);
}
@Override
public void visitNewExpression(PsiNewExpression expression) {
PsiJavaCodeReferenceElement reference = expression.getClassOrAnonymousClassReference();
if (reference != null) {
validate(reference, expression.resolveMethod(), h);
}
public void visitCallExpression(PsiCallExpression e) {
validate(e, e.resolveMethod(), h);
}
@Override
@@ -88,12 +80,12 @@ public class TestOnlyInspection extends AbstractBaseJavaLocalInspectionTool {
};
}
private static void validate(@NotNull PsiElement place, @Nullable PsiMember member, ProblemsHolder h) {
private static void validate(@NotNull PsiElement reference, @Nullable PsiMember member, ProblemsHolder h) {
if (member == null || !isAnnotatedAsTestOnly(member)) return;
if (isInsideTestOnlyMethod(place)) return;
if (isInsideTestOnlyField(place)) return;
if (isInsideTestClass(place)) return;
if (isUnderTestSources(place)) return;
if (isInsideTestOnlyMethod(reference)) return;
if (isInsideTestOnlyField(reference)) return;
if (isInsideTestClass(reference)) return;
if (isUnderTestSources(reference)) return;
PsiAnnotation anno = findVisibleForTestingAnnotation(member);
if (anno != null) {
@@ -103,12 +95,12 @@ public class TestOnlyInspection extends AbstractBaseJavaLocalInspectionTool {
}
LightModifierList modList = new LightModifierList(member.getManager(), JavaLanguage.INSTANCE, modifier);
if (JavaResolveUtil.isAccessible(member, member.getContainingClass(), modList, place, null, null)) {
if (JavaResolveUtil.isAccessible(member, member.getContainingClass(), modList, reference, null, null)) {
return;
}
}
reportProblem(place, member, h);
reportProblem(reference, member, h);
}
private static final List<String> ourModifiersDescending =

2
java/java-analysis-impl/src/messages/QuickFixBundle.properties
View File

@@ -199,7 +199,7 @@ make.final.family=Make Final
make.final.text=Make {0} final
make.final.copy.to.temp=Copy ''{0}'' to {1} temp variable
make.final.transform.to.one.element.array=Transform {0} into final one element array
fix.variable.type.family=Fix variable type
fix.variable.type.family=Fix Variable Type
fix.variable.type.text=Change {0} ''{1}'' type to ''{2}''
# Sample: Boolean b = "true"; -> Boolean b = Boolean.valueOf("true");

1
java/java-impl/intellij.java.impl.iml
View File

@@ -62,7 +62,6 @@
<orderEntry type="library" name="javax.activation" level="project" />
<orderEntry type="library" scope="RUNTIME" name="jaxb-runtime" level="project" />
<orderEntry type="module" module-name="intellij.platform.objectSerializer.annotations" />
<orderEntry type="module" module-name="intellij.platform.externalSystem.impl" />
</component>
<component name="copyright">
<Base>

12
java/java-impl/src/META-INF/JavaPlugin.xml
View File

@@ -547,15 +547,6 @@
<stepsBeforeRunProvider implementation="com.intellij.packaging.impl.run.BuildArtifactsBeforeRunTaskProvider"
order="after compileBeforeRunNoErrorCheck"/>
<externalSystem.beforeRunTaskImporter implementation="com.intellij.compiler.options.CompileStepBeforeRunImporter"/>
<externalSystemConfigurationHandler
implementation="com.intellij.openapi.externalSystem.service.project.settings.CompilerConfigurationHandler"/>
<externalSystemConfigurationHandler implementation="com.intellij.openapi.externalSystem.service.project.settings.ArtifactsImporter"/>
<externalSystem.moduleDataServiceExtension implementation="com.intellij.openapi.externalSystem.service.project.ModuleDataServiceJavaExtension"/>
<externalSystem.runConfigurationExtension implementation="com.intellij.execution.ExternalSystemRunConfigurationJavaExtension"/>
<applicationService serviceInterface="com.intellij.openapi.externalSystem.service.execution.ExternalSystemJdkProvider"
serviceImplementation="com.intellij.openapi.externalSystem.service.execution.ExternalSystemJavaSdkProvider"
overrides="true"/>
<programRunner implementation="com.intellij.openapi.externalSystem.service.execution.ExternalSystemTaskDebugRunner"/>
<programRunner id="defaultRunRunner" implementation="com.intellij.execution.impl.DefaultJavaProgramRunner"/>
@@ -666,9 +657,6 @@
<externalSystem.runConfigurationImporter implementation="com.intellij.execution.application.JavaApplicationRunConfigurationImporter"/>
<externalSystem.runConfigurationImporter implementation="com.intellij.execution.remote.JavaRemoteDebugRunConfigurationImporter"/>
<externalSystem.modifiableModelsProvider implementation="com.intellij.openapi.externalSystem.service.project.PackagingModifiableModelProvider"/>
<configuration.ModuleStructureExtension
implementation="com.intellij.openapi.externalSystem.service.project.ExternalModuleStructureExtension"/>
<runLineMarkerContributor language="JVM"
order="before applicationRunLineMarkerProvider"

18
java/java-impl/src/com/intellij/codeInsight/NullableNotNullManagerImpl.java
View File

@@ -16,7 +16,6 @@ import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.util.CachedValueProvider;
import com.intellij.psi.util.CachedValuesManager;
import com.intellij.psi.util.PsiModificationTracker;
import com.intellij.psi.util.PsiUtilCore;
import com.intellij.util.containers.ContainerUtil;
import gnu.trove.THashSet;
import org.jdom.Element;
@@ -239,15 +238,14 @@ public class NullableNotNullManagerImpl extends NullableNotNullManager implement
if (modifierList == null) return null;
for (PsiAnnotation annotation : modifierList.getAnnotations()) {
if (container instanceof PsiPackage) {
VirtualFile annotationFile = PsiUtilCore.getVirtualFile(annotation);
VirtualFile ownerFile = PsiUtilCore.getVirtualFile(owner);
if (annotationFile != null && ownerFile != null && !annotationFile.equals(ownerFile)) {
ProjectFileIndex index = ProjectRootManager.getInstance(container.getProject()).getFileIndex();
VirtualFile annotationRoot = index.getClassRootForFile(annotationFile);
VirtualFile ownerRoot = index.getClassRootForFile(ownerFile);
if (ownerRoot != null && !ownerRoot.equals(annotationRoot)) {
continue;
}
PsiFile file = annotation.getContainingFile();
ProjectFileIndex index = ProjectRootManager.getInstance(file.getProject()).getFileIndex();
VirtualFile annotationFile = file.getVirtualFile();
VirtualFile annotationRoot = annotationFile == null ? null : index.getClassRootForFile(annotationFile);
VirtualFile ownerFile = owner.getContainingFile().getVirtualFile();
VirtualFile ownerRoot = ownerFile == null ? null : index.getClassRootForFile(ownerFile);
if (ownerRoot != null && !ownerRoot.equals(annotationRoot)) {
continue;
}
}
NullabilityAnnotationInfo result = checkNullityDefault(annotation, placeTargetTypes, superPackage);

2
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/IterateOverIterableIntention.java
View File

@@ -39,7 +39,7 @@ public class IterateOverIterableIntention implements IntentionAction {
@Override
public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file) {
final TemplateImpl template = file instanceof PsiJavaFile ? getTemplate() : null;
final TemplateImpl template = getTemplate();
if (template != null) {
int offset = editor.getCaretModel().getOffset();
int startOffset = offset;

2
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableTypeFix.java
View File

@@ -46,7 +46,7 @@ public class VariableTypeFix extends LocalQuickFixAndIntentionActionOnPsiElement
private final PsiType myReturnType;
protected final String myName;
public VariableTypeFix(@NotNull PsiVariable variable, @NotNull PsiType toReturn) {
public VariableTypeFix(@NotNull PsiVariable variable, PsiType toReturn) {
super(variable);
myReturnType = GenericsUtil.getVariableTypeByExpressionType(toReturn);
myName = variable.getName();

60
java/java-impl/src/com/intellij/codeInsight/editorActions/CopyPasteReferenceProcessor.java
View File

@@ -15,15 +15,9 @@
*/
package com.intellij.codeInsight.editorActions;
import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.codeInsight.CodeInsightSettings;
import com.intellij.codeInsight.daemon.impl.CollectHighlightsUtil;
import com.intellij.codeInsight.hint.HintManager;
import com.intellij.codeInsight.hint.HintManagerImpl;
import com.intellij.codeInsight.hint.HintUtil;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.command.WriteCommandAction;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
@@ -35,19 +29,18 @@ import com.intellij.openapi.util.Ref;
import com.intellij.openapi.util.TextRange;
import com.intellij.psi.*;
import com.intellij.psi.util.PsiUtilCore;
import com.intellij.ui.LightweightHint;
import com.intellij.util.ArrayUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.event.HyperlinkEvent;
import javax.swing.event.HyperlinkListener;
import java.awt.datatransfer.DataFlavor;
import java.awt.datatransfer.Transferable;
import java.awt.datatransfer.UnsupportedFlavorException;
import java.io.IOException;
import java.util.*;
import java.util.stream.Collectors;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
public abstract class CopyPasteReferenceProcessor<TRef extends PsiElement> extends CopyPastePostProcessor<ReferenceTransferableData> {
private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.editorActions.CopyPasteReferenceProcessor");
@@ -128,35 +121,7 @@ public abstract class CopyPasteReferenceProcessor<TRef extends PsiElement> exten
askReferencesToRestore(project, refs, referenceData);
}
PsiDocumentManager.getInstance(project).commitAllDocuments();
ApplicationManager.getApplication().runWriteAction(() -> {
Set<String> imported = new TreeSet<>();
restoreReferences(referenceData, refs, imported);
if (CodeInsightSettings.getInstance().ADD_IMPORTS_ON_PASTE == CodeInsightSettings.YES && !imported.isEmpty()) {
String notificationText = CodeInsightBundle.message("copy.paste.reference.notification", imported.size());
ApplicationManager.getApplication().invokeLater(
() -> showHint(editor, notificationText, e -> {
if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) {
reviewImports(project, file, imported);
}
}), ModalityState.NON_MODAL);
}
});
}
protected abstract void removeImports(PsiFile file, Set<String> imports);
private void reviewImports(Project project, PsiFile file, Set<String> importedClasses) {
RestoreReferencesDialog dialog = new RestoreReferencesDialog(project, ArrayUtil.toObjectArray(importedClasses), false);
dialog.setTitle(CodeInsightBundle.message("dialog.import.on.paste.title3"));
dialog.setExplanation(CodeInsightBundle.message("dialog.paste.on.import.text3"));
if (dialog.showAndGet()) {
Object[] selectedElements = dialog.getSelectedElements();
if (selectedElements.length > 0) {
WriteCommandAction.runWriteCommandAction(project, "", null, () -> {
removeImports(file, Arrays.stream(selectedElements).map(o -> (String)o).collect(Collectors.toSet()));
});
}
}
ApplicationManager.getApplication().runWriteAction(() -> restoreReferences(referenceData, refs));
}
protected static void addReferenceData(final PsiElement element,
@@ -173,8 +138,8 @@ public abstract class CopyPasteReferenceProcessor<TRef extends PsiElement> exten
@NotNull
protected abstract TRef[] findReferencesToRestore(PsiFile file,
RangeMarker bounds,
ReferenceData[] referenceData);
RangeMarker bounds,
ReferenceData[] referenceData);
protected PsiElement resolveReferenceIgnoreOverriding(PsiPolyVariantReference reference) {
PsiElement referent = reference.resolve();
@@ -188,8 +153,7 @@ public abstract class CopyPasteReferenceProcessor<TRef extends PsiElement> exten
}
protected abstract void restoreReferences(ReferenceData[] referenceData,
TRef[] refs,
Set<String> imported);
TRef[] refs);
private static void askReferencesToRestore(Project project, @NotNull PsiElement[] refs,
ReferenceData[] referenceData) {
@@ -245,14 +209,6 @@ public abstract class CopyPasteReferenceProcessor<TRef extends PsiElement> exten
}
}
private static void showHint(@NotNull Editor editor, @NotNull String info, HyperlinkListener hyperlinkListener) {
if (ApplicationManager.getApplication().isUnitTestMode()) return;
LightweightHint hint = new LightweightHint(HintUtil.createInformationLabel(info, hyperlinkListener, null, null));
int flags = HintManager.HIDE_BY_ANY_KEY | HintManager.HIDE_BY_TEXT_CHANGE;
HintManagerImpl.getInstanceImpl().showEditorHint(hint, editor, HintManager.UNDER, flags, 0, false);
}
private static String getFQName(Object element) {
return element instanceof PsiClass ? ((PsiClass)element).getQualifiedName() : (String)element;
}

29
java/java-impl/src/com/intellij/codeInsight/editorActions/JavaCopyPasteReferenceProcessor.java
View File

@@ -20,17 +20,12 @@ import com.intellij.codeInsight.daemon.impl.quickfix.ImportClassFixBase;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.RangeMarker;
import com.intellij.openapi.util.TextRange;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.*;
import com.intellij.psi.codeStyle.JavaCodeStyleSettings;
import com.intellij.psi.impl.source.codeStyle.ImportHelper;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.ObjectUtils;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.Set;
/**
* @author peter
@@ -64,25 +59,6 @@ public class JavaCopyPasteReferenceProcessor extends CopyPasteReferenceProcessor
}
}
@Override
protected void removeImports(PsiFile file, Set<String> imports) {
removeImports((PsiJavaFile)file, imports);
}
/**
* Remove imports on {@code imports} (including static imports in format Class_Name.Member_Name)
* To ensure that on-demand import expands when one of the import inside was deleted, let's do optimize imports.
*
* This may change some unrelated imports
*/
public static void removeImports(PsiJavaFile javaFile, Set<String> imports) {
PsiImportList importList = new ImportHelper(JavaCodeStyleSettings.getInstance(javaFile))
.prepareOptimizeImportsResult(javaFile, pair -> !imports.contains(pair.first));
if (importList != null) {
ObjectUtils.notNull(javaFile.getImportList()).replace(importList);
}
}
@NotNull
@Override
@@ -148,8 +124,7 @@ public class JavaCopyPasteReferenceProcessor extends CopyPasteReferenceProcessor
@Override
protected void restoreReferences(ReferenceData[] referenceData,
PsiJavaCodeReferenceElement[] refs,
Set<String> imported) {
PsiJavaCodeReferenceElement[] refs) {
for (int i = 0; i < refs.length; i++) {
PsiJavaCodeReferenceElement reference = refs[i];
if (reference == null || !reference.isValid()) continue;
@@ -160,12 +135,10 @@ public class JavaCopyPasteReferenceProcessor extends CopyPasteReferenceProcessor
if (refClass != null) {
if (refData.staticMemberName == null) {
reference.bindToElement(refClass);
imported.add(refData.qClassName);
}
else {
LOG.assertTrue(reference instanceof PsiReferenceExpression);
((PsiReferenceExpression)reference).bindToElementViaStaticImport(refClass);
imported.add(StringUtil.getQualifiedName(refData.qClassName, refData.staticMemberName));
}
}
}

36
java/java-impl/src/com/intellij/codeInsight/editorActions/JavaQuoteHandler.java
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2019 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.
// Copyright 2000-2018 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.codeInsight.editorActions;
import com.intellij.openapi.editor.Editor;
@@ -14,23 +14,22 @@ import org.jetbrains.annotations.Nullable;
* @author peter
*/
public class JavaQuoteHandler extends SimpleTokenSetQuoteHandler implements JavaLikeQuoteHandler, MultiCharQuoteHandler {
private final TokenSet myConcatenableStrings = TokenSet.create(JavaTokenType.STRING_LITERAL);
private final TokenSet myAppropriateElementTypeForLiteral = TokenSet.orSet(
ElementType.JAVA_COMMENT_OR_WHITESPACE_BIT_SET,
TokenSet.create(JavaTokenType.CHARACTER_LITERAL, JavaTokenType.STRING_LITERAL, JavaTokenType.RAW_STRING_LITERAL,
JavaTokenType.SEMICOLON, JavaTokenType.COMMA, JavaTokenType.RPARENTH, JavaTokenType.RBRACKET, JavaTokenType.RBRACE));
private final TokenSet concatenatableStrings;
public JavaQuoteHandler() {
super(JavaTokenType.STRING_LITERAL, JavaTokenType.CHARACTER_LITERAL, JavaTokenType.RAW_STRING_LITERAL);
concatenatableStrings = TokenSet.create(JavaTokenType.STRING_LITERAL);
}
@Override
public boolean isOpeningQuote(HighlighterIterator iterator, int offset) {
boolean openingQuote = super.isOpeningQuote(iterator, offset);
if (openingQuote) {
// check escape next
if (!iterator.atEnd()) {
iterator.retreat();
if (!iterator.atEnd() && StringEscapesTokenTypes.STRING_LITERAL_ESCAPES.contains(iterator.getTokenType())) {
openingQuote = false;
}
@@ -43,10 +42,12 @@ public class JavaQuoteHandler extends SimpleTokenSetQuoteHandler implements Java
@Override
public boolean isClosingQuote(HighlighterIterator iterator, int offset) {
boolean closingQuote = super.isClosingQuote(iterator, offset);
if (closingQuote) {
// check escape next
if (!iterator.atEnd()) {
iterator.advance();
if (!iterator.atEnd() && StringEscapesTokenTypes.STRING_LITERAL_ESCAPES.contains(iterator.getTokenType())) {
closingQuote = false;
}
@@ -57,9 +58,8 @@ public class JavaQuoteHandler extends SimpleTokenSetQuoteHandler implements Java
}
@Override
@SuppressWarnings("SpellCheckingInspection")
public TokenSet getConcatenatableStringTokenTypes() {
return myConcatenableStrings;
return concatenatableStrings;
}
@Override
@@ -73,12 +73,12 @@ public class JavaQuoteHandler extends SimpleTokenSetQuoteHandler implements Java
}
@Override
public boolean isAppropriateElementTypeForLiteral(@NotNull IElementType tokenType) {
return myAppropriateElementTypeForLiteral.contains(tokenType);
public boolean isAppropriateElementTypeForLiteral(final @NotNull IElementType tokenType) {
return isAppropriateElementTypeForLiteralStatic(tokenType);
}
@Override
public boolean needParenthesesAroundConcatenation(PsiElement element) {
public boolean needParenthesesAroundConcatenation(final PsiElement element) {
// example code: "some string".length() must become ("some" + " string").length()
return element.getParent() instanceof PsiLiteralExpression && element.getParent().getParent() instanceof PsiReferenceExpression;
}
@@ -104,4 +104,16 @@ public class JavaQuoteHandler extends SimpleTokenSetQuoteHandler implements Java
editor.getDocument().insertString(offset, " " + closingQuote);
editor.getSelectionModel().setSelection(offset, offset + 1);
}
}
public static boolean isAppropriateElementTypeForLiteralStatic(final IElementType tokenType) {
return ElementType.JAVA_COMMENT_OR_WHITESPACE_BIT_SET.contains(tokenType)
|| tokenType == JavaTokenType.SEMICOLON
|| tokenType == JavaTokenType.COMMA
|| tokenType == JavaTokenType.RPARENTH
|| tokenType == JavaTokenType.RBRACKET
|| tokenType == JavaTokenType.RBRACE
|| tokenType == JavaTokenType.STRING_LITERAL
|| tokenType == JavaTokenType.CHARACTER_LITERAL
|| tokenType == JavaTokenType.RAW_STRING_LITERAL;
}
}

19
java/java-impl/src/com/intellij/codeInsight/editorActions/RestoreReferencesDialog.java
View File

@@ -40,13 +40,8 @@ class RestoreReferencesDialog extends DialogWrapper {
private JList myList;
private Object[] mySelectedElements = PsiClass.EMPTY_ARRAY;
private boolean myContainsClassesOnly = true;
private JBLabel myExplanationLabel;
RestoreReferencesDialog(final Project project, final Object[] elements) {
this(project, elements, true);
}
RestoreReferencesDialog(final Project project, final Object[] elements, boolean preselect) {
super(project, true);
myNamedElements = elements;
for (Object element : elements) {
@@ -63,9 +58,7 @@ class RestoreReferencesDialog extends DialogWrapper {
}
init();
if (preselect) {
myList.setSelectionInterval(0, myNamedElements.length - 1);
}
myList.setSelectionInterval(0, myNamedElements.length - 1);
}
@Override
@@ -83,10 +76,9 @@ class RestoreReferencesDialog extends DialogWrapper {
myList.setCellRenderer(new FQNameCellRenderer());
panel.add(ScrollPaneFactory.createScrollPane(myList), BorderLayout.CENTER);
myExplanationLabel = new JBLabel(myContainsClassesOnly ?
CodeInsightBundle.message("dialog.paste.on.import.text") :
CodeInsightBundle.message("dialog.paste.on.import.text2"), SMALL, BRIGHTER);
panel.add(myExplanationLabel, BorderLayout.NORTH);
panel.add(new JBLabel(myContainsClassesOnly ?
CodeInsightBundle.message("dialog.paste.on.import.text") :
CodeInsightBundle.message("dialog.paste.on.import.text2"), SMALL, BRIGHTER), BorderLayout.NORTH);
final JPanel buttonPanel = new JPanel(new VerticalFlowLayout());
final JButton okButton = new JButton(CommonBundle.getOkButtonText());
@@ -100,9 +92,6 @@ class RestoreReferencesDialog extends DialogWrapper {
return panel;
}
public void setExplanation(String explanation) {
myExplanationLabel.setText(explanation);
}
@Override
protected String getDimensionServiceKey(){

4
java/java-impl/src/com/intellij/codeInsight/intention/impl/DeannotateIntentionAction.java
View File

@@ -57,7 +57,7 @@ public class DeannotateIntentionAction implements IntentionAction, LowPriorityAc
@Override
public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file) {
myAnnotationName = null;
PsiModifierListOwner listOwner = AddAnnotationPsiFix.getContainer(file, editor.getCaretModel().getOffset(), true);
PsiModifierListOwner listOwner = AddAnnotationPsiFix.getContainer(file, editor.getCaretModel().getOffset());
if (listOwner != null) {
final ExternalAnnotationsManager externalAnnotationsManager = ExternalAnnotationsManager.getInstance(project);
final PsiAnnotation[] annotations = externalAnnotationsManager.findExternalAnnotations(listOwner);
@@ -76,7 +76,7 @@ public class DeannotateIntentionAction implements IntentionAction, LowPriorityAc
@Override
public void invoke(@NotNull final Project project, Editor editor, final PsiFile file) throws IncorrectOperationException {
final PsiModifierListOwner listOwner = AddAnnotationPsiFix.getContainer(file, editor.getCaretModel().getOffset(), true);
final PsiModifierListOwner listOwner = AddAnnotationPsiFix.getContainer(file, editor.getCaretModel().getOffset());
LOG.assertTrue(listOwner != null);
final ExternalAnnotationsManager annotationsManager = ExternalAnnotationsManager.getInstance(project);
final PsiAnnotation[] externalAnnotations = annotationsManager.findExternalAnnotations(listOwner);

3
java/java-impl/src/com/intellij/codeInsight/javadoc/AnnotationDocGenerator.java
View File

@@ -74,8 +74,6 @@ public class AnnotationDocGenerator {
boolean red = type == null && !myResolveNotPossible && !isInferred() && !isExternal();
boolean highlightNonCodeAnnotations = format == AnnotationFormat.ToolTip && (isInferred() || isExternal());
if (highlightNonCodeAnnotations) buffer.append("<b>");
if (isInferred()) buffer.append("<i>");
if (red) buffer.append("<font color=red>");
@@ -93,7 +91,6 @@ public class AnnotationDocGenerator {
generateAnnotationAttributes(buffer, generateLink);
if (isInferred()) buffer.append("</i>");
if (highlightNonCodeAnnotations) buffer.append("</b>");
}
private void generateAnnotationAttributes(StringBuilder buffer, boolean generateLink) {

16
java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java
View File

@@ -1031,15 +1031,15 @@ public class JavaDocInfoGenerator {
}
private static void generateMethodSignature(StringBuilder buffer, PsiMethod method, SignaturePlace place) {
boolean isTooltip = place == SignaturePlace.ToolTip;
boolean useShortNames = place == SignaturePlace.ToolTip;
boolean generateLink = place == SignaturePlace.Javadoc;
generateAnnotations(buffer, method, place, true);
int modLength = isTooltip ? 0 : generateModifiers(buffer, method, true);
int modLength = generateModifiers(buffer, method, true);
int indent = modLength == 0 ? 0 : modLength + 1;
String typeParamsString = generateTypeParameters(method, isTooltip);
String typeParamsString = generateTypeParameters(method, useShortNames);
indent += StringUtil.unescapeXmlEntities(StringUtil.stripHtml(typeParamsString, true)).length();
if (!typeParamsString.isEmpty()) {
buffer.append(typeParamsString);
@@ -1048,7 +1048,7 @@ public class JavaDocInfoGenerator {
}
if (method.getReturnType() != null) {
indent += generateType(buffer, method.getReturnType(), method, generateLink, isTooltip);
indent += generateType(buffer, method.getReturnType(), method, generateLink, useShortNames);
buffer.append(NBSP);
indent++;
}
@@ -1063,9 +1063,9 @@ public class JavaDocInfoGenerator {
for (int i = 0; i < parameters.length; i++) {
PsiParameter parm = parameters[i];
generateAnnotations(buffer, parm, place, false);
generateType(buffer, parm.getType(), method, generateLink, isTooltip);
if (parm.getName() != null && !isTooltip) {
buffer.append(NBSP);
generateType(buffer, parm.getType(), method, generateLink, useShortNames);
buffer.append(NBSP);
if (parm.getName() != null) {
buffer.append(parm.getName());
}
if (i < parameters.length - 1) {
@@ -1081,7 +1081,7 @@ public class JavaDocInfoGenerator {
buffer.append(THROWS_KEYWORD);
buffer.append(NBSP);
for (int i = 0; i < refs.length; i++) {
generateLink(buffer, isTooltip ? refs[i].getPresentableText() : refs[i].getCanonicalText(), null, method, false);
generateLink(buffer, useShortNames ? refs[i].getPresentableText() : refs[i].getCanonicalText(), null, method, false);
if (i < refs.length - 1) {
buffer.append(',').append(NBSP);
}

32
java/java-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemJavaSdkProvider.java
View File

@@ -1,32 +0,0 @@
// Copyright 2000-2019 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.openapi.externalSystem.service.execution;
import com.intellij.openapi.projectRoots.JavaSdk;
import com.intellij.openapi.projectRoots.JdkUtil;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.projectRoots.SdkType;
import com.intellij.openapi.projectRoots.impl.JavaAwareProjectJdkTableImpl;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
public class ExternalSystemJavaSdkProvider implements ExternalSystemJdkProvider {
@NotNull
@Override
public SdkType getJavaSdkType() {
return JavaSdk.getInstance();
}
@NotNull
@Override
public Sdk getInternalJdk() {
return JavaAwareProjectJdkTableImpl.getInstanceEx().getInternalJdk();
}
@NotNull
@Override
public Sdk createJdk(@Nullable String jdkName, @NotNull String homePath) {
SdkType javaSdk = getJavaSdkType();
String sdkName = jdkName != null ? jdkName : javaSdk.suggestSdkName(null, homePath);
return ((JavaSdk)javaSdk).createJdk(sdkName, homePath, !JdkUtil.checkForJdk(homePath));
}
}

49
java/java-impl/src/com/intellij/openapi/externalSystem/service/project/ModuleDataServiceJavaExtension.java
View File

@@ -1,49 +0,0 @@
// Copyright 2000-2019 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.openapi.externalSystem.service.project;
import com.intellij.compiler.CompilerConfiguration;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.externalSystem.model.project.ModuleData;
import com.intellij.openapi.externalSystem.service.project.manage.ModuleDataServiceExtension;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleTypeId;
import com.intellij.openapi.roots.LanguageLevelModuleExtension;
import com.intellij.openapi.roots.ModifiableRootModel;
import com.intellij.pom.java.LanguageLevel;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
@ApiStatus.Experimental
public class ModuleDataServiceJavaExtension implements ModuleDataServiceExtension {
private static final Logger LOG = Logger.getInstance(ModuleDataServiceJavaExtension.class);
@Override
public void importModule(@NotNull IdeModifiableModelsProvider modelsProvider, @NotNull Module module, @NotNull ModuleData data) {
if (ModuleTypeId.JAVA_MODULE.equals(module.getModuleTypeName())) {
ModifiableRootModel modifiableRootModel = modelsProvider.getModifiableRootModel(module);
setLanguageLevel(modifiableRootModel, data);
setBytecodeTargetLevel(module, data);
}
}
private static void setLanguageLevel(@NotNull ModifiableRootModel modifiableRootModel, ModuleData data) {
LanguageLevel level = LanguageLevel.parse(data.getSourceCompatibility());
if (level != null) {
try {
modifiableRootModel.getModuleExtension(LanguageLevelModuleExtension.class).setLanguageLevel(level);
}
catch (IllegalArgumentException e) {
LOG.debug(e);
}
}
}
private static void setBytecodeTargetLevel(@NotNull Module module, @NotNull ModuleData data) {
String targetLevel = data.getTargetCompatibility();
if (targetLevel != null) {
CompilerConfiguration configuration = CompilerConfiguration.getInstance(module.getProject());
configuration.setBytecodeTargetLevel(module, targetLevel);
}
}
}

20
java/java-impl/src/com/intellij/psi/impl/source/codeStyle/ImportHelper.java
View File

@@ -44,8 +44,6 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.*;
import java.util.function.Predicate;
import java.util.stream.Collectors;
import static java.util.stream.Collectors.toSet;
@@ -69,15 +67,7 @@ public class ImportHelper{
}
@Nullable("null means no need to replace the import list because they are the same")
public PsiImportList prepareOptimizeImportsResult(@NotNull final PsiJavaFile file) {
return prepareOptimizeImportsResult(file, pair -> true);
}
/**
* @param filter pretend some references do not exist so the corresponding imports may be deleted
*/
@Nullable("null means no need to replace the import list because they are the same")
public PsiImportList prepareOptimizeImportsResult(@NotNull final PsiJavaFile file, Predicate<? super Pair<String, Boolean>> filter) {
PsiImportList prepareOptimizeImportsResult(@NotNull final PsiJavaFile file) {
PsiImportList oldList = file.getImportList();
if (oldList == null) return null;
@@ -88,12 +78,8 @@ public class ImportHelper{
// We want to preserve those comments then.
List<PsiElement> nonImports = new NotNullList<>();
// Note: this array may contain "<packageOrClassName>.*" for unresolved imports!
List<Pair<String, Boolean>> names =
collectNamesToImport(file, nonImports)
.stream()
.filter(filter)
.sorted(Comparator.comparing(o -> o.getFirst()))
.collect(Collectors.toList());
List<Pair<String, Boolean>> names = new ArrayList<>(collectNamesToImport(file, nonImports));
Collections.sort(names, Comparator.comparing(o -> o.getFirst()));
List<Pair<String, Boolean>> resultList = sortItemsAccordingToSettings(names, mySettings);

2
java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterDialog.java
View File

@@ -216,7 +216,7 @@ public class IntroduceParameterDialog extends RefactoringDialog {
final PsiAnonymousClass anonymClass = myExpression instanceof PsiNewExpression ? ((PsiNewExpression)myExpression).getAnonymousClass()
: null;
myCbCollapseToLambda.setVisible(anonymClass != null && AnonymousCanBeLambdaInspection.isLambdaForm(anonymClass, false, Collections.emptySet()));
myCbCollapseToLambda.setSelected(PropertiesComponent.getInstance(myProject).getBoolean(INTRODUCE_PARAMETER_LAMBDA, true));
myCbCollapseToLambda.setSelected(PropertiesComponent.getInstance(myProject).getBoolean(INTRODUCE_PARAMETER_LAMBDA));
gbConstraints.gridy++;
panel.add(myCbCollapseToLambda, gbConstraints);

7
java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaNullMethodArgumentIndex.java
View File

@@ -86,8 +86,11 @@ public class JavaNullMethodArgumentIndex extends ScalarIndexExtension<JavaNullMe
}
private static boolean containsStopSymbol(int startIndex, @NotNull CharSequence text, boolean leftDirection) {
int i = leftDirection ? startIndex - 1 : startIndex + 1;
int i = startIndex;
while (true) {
if (leftDirection) i--; else i++;
if (leftDirection) {
if (i < 0) return false;
} else {
@@ -99,8 +102,6 @@ public class JavaNullMethodArgumentIndex extends ScalarIndexExtension<JavaNullMe
if (!Lazy.WHITE_SPACE_OR_EOL_SYMBOLS.contains(c) && !Character.isWhitespace(c)) {
return false;
}
if (leftDirection) i--; else i++;
}
}

50
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/PsiMethodReferenceCompatibilityConstraint.java
View File

@@ -27,6 +27,7 @@ import com.intellij.psi.util.TypeConversionUtil;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.Nullable;
import java.util.Arrays;
import java.util.List;
public class PsiMethodReferenceCompatibilityConstraint implements ConstraintFormula {
@@ -169,20 +170,17 @@ public class PsiMethodReferenceCompatibilityConstraint implements ConstraintForm
//if i) the method reference elides NonWildTypeArguments,
// ii) the compile-time declaration is a generic method, and
// iii) the return type of the compile-time declaration mentions at least one of the method's type parameters;
if (typeParameters.length == 0) {
PsiTypeParameter[] methodTypeParameters = method.isConstructor() ? containingClass.getTypeParameters() : method.getTypeParameters();
if (methodTypeParameters.length > 0) {
final PsiClass interfaceClass = classResolveResult.getElement();
LOG.assertTrue(interfaceClass != null);
if (PsiTypesUtil.mentionsTypeParameters(referencedMethodReturnType,
ContainerUtil.newHashSet(methodTypeParameters))) {
session.initBounds(myExpression, psiSubstitutor, methodTypeParameters);
//the constraint reduces to the bound set B3 which would be used to determine the method reference's invocation type
//when targeting the return type of the function type, as defined in 18.5.2.
session.collectApplicabilityConstraints(myExpression, ((MethodCandidateInfo)resolve), groundTargetType);
session.registerReturnTypeConstraints(psiSubstitutor.substitute(referencedMethodReturnType), returnType, myExpression);
return true;
}
if (typeParameters.length == 0 && method.getTypeParameters().length > 0) {
final PsiClass interfaceClass = classResolveResult.getElement();
LOG.assertTrue(interfaceClass != null);
if (PsiTypesUtil.mentionsTypeParameters(referencedMethodReturnType,
ContainerUtil.newHashSet(method.getTypeParameters()))) {
session.initBounds(myExpression, psiSubstitutor, method.getTypeParameters());
//the constraint reduces to the bound set B3 which would be used to determine the method reference's invocation type
//when targeting the return type of the function type, as defined in 18.5.2.
session.collectApplicabilityConstraints(myExpression, ((MethodCandidateInfo)resolve), groundTargetType);
session.registerReturnTypeConstraints(psiSubstitutor.substitute(referencedMethodReturnType), returnType, myExpression);
return true;
}
}
@@ -232,6 +230,30 @@ public class PsiMethodReferenceCompatibilityConstraint implements ConstraintForm
final PsiType pType = PsiUtil.captureToplevelWildcards(parameterization, methodReferenceExpression);
psiSubstitutor = TypeConversionUtil.getSuperClassSubstitutor(qContainingClass, (PsiClassType)pType);
}
else if (member instanceof PsiMethod && ((PsiMethod)member).isConstructor() || member instanceof PsiClass) {
//15.13.1
//If ClassType is a raw type, but is not a non-static member type of a raw type,
//the candidate notional member methods are those specified in p15.9.3 for a class instance creation expression that uses <>
//to elide the type arguments to a class.
final PsiResolveHelper helper = JavaPsiFacade.getInstance(methodReferenceExpression.getProject()).getResolveHelper();
final PsiType[] paramTypes =
member instanceof PsiMethod ? ((PsiMethod)member).getSignature(PsiSubstitutor.EMPTY).getParameterTypes() : PsiType.EMPTY_ARRAY;
if (paramTypes.length != signature.getParameterTypes().length && !(member instanceof PsiMethod && ((PsiMethod)member).isVarArgs())) {
//inapplicable method reference
return PsiSubstitutor.EMPTY;
}
if (Arrays.deepEquals(signature.getParameterTypes(), paramTypes)) {
return PsiSubstitutor.EMPTY;
}
if (paramTypes.length == signature.getParameterTypes().length) {
psiSubstitutor = helper.inferTypeArguments(PsiTypesUtil.filterUnusedTypeParameters(qContainingClass.getTypeParameters(), paramTypes),
paramTypes,
signature.getParameterTypes(),
PsiUtil.getLanguageLevel(methodReferenceExpression));
}
}
else {
psiSubstitutor = PsiSubstitutor.EMPTY;
}

7
java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/MethodReferenceResolver.java
View File

@@ -117,11 +117,8 @@ public class MethodReferenceResolver implements ResolveCache.PolyVariantContextR
}
if (includeReturnConstraint && !PsiType.VOID.equals(interfaceMethodReturnType) && interfaceMethodReturnType != null) {
final PsiType returnType = method.isConstructor()
? composeReturnType(containingClass, substitutor)
: PsiMethodReferenceCompatibilityConstraint
.getSubstitutor(signature, qualifierResolveResult, method, containingClass, reference)
.substitute(method.getReturnType());
PsiSubstitutor subst = PsiMethodReferenceCompatibilityConstraint.getSubstitutor(signature, qualifierResolveResult, method, containingClass, reference);
final PsiType returnType = method.isConstructor() ? composeReturnType(containingClass, subst) : subst.substitute(method.getReturnType());
if (returnType != null) {
session.registerReturnTypeConstraints(returnType, interfaceMethodReturnType, reference);
}

27
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newMethodRef/ConstructorReferenceOnRawTypeWithInferredSubtypes.java
View File

@@ -1,27 +0,0 @@
import java.util.function.Function;
class MyTest {
{
Function<B, Try<A>> aNew = Try::new;
Try<B> bTry = new Try<>(new B());
Try<A> aTry = bTry.flatMap(Try::new);
}
private static class A { }
private static class B extends A { }
private static class Try<T> {
public Try(T t) {
}
public Try(Exception e) {
}
public <U> Try<U> flatMap(Function<? super T, Try<U>> mapper) {
return null;
}
}
}

17
java/java-tests/testData/inspection/commonIfParts/afterLastStatementIsCallInfo.java
View File

@@ -1,17 +0,0 @@
// "Extract common part from 'if'" "INFORMATION"
class X {
void foo() {
if (true) {
another(1);
}
else {
another(2);
}
bar();
}
void another(int i) {}
void bar() {}
}

18
java/java-tests/testData/inspection/commonIfParts/beforeLastStatementIsCallInfo.java
View File

@@ -1,18 +0,0 @@
// "Extract common part from 'if'" "INFORMATION"
class X {
void foo() {
if<caret> (true) {
another(1);
bar();
}
else {
another(2);
bar();
}
}
void another(int i) {}
void bar() {}
}

2
java/java-tests/testData/inspection/streamApiCallChains/afterStreamToCollectionInvalid.java
View File

@@ -5,6 +5,6 @@ import java.util.stream.*;
class Test {
public static void test(List<String> s) {
new TreeSet<>(s).contains("abc");
new TreeSet<? extends String>(s).contains("abc");
}
}

1
java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/lambda/NewMethodRefHighlightingTest.java
View File

@@ -191,7 +191,6 @@ public class NewMethodRefHighlightingTest extends LightDaemonAnalyzerTestCase {
public void testSkipInferenceForInapplicableMethodReference() { doTest(); }
public void testRegisterVariablesForNonFoundParameterizations() { doTest(); }
public void testConstructorReferenceOnRawTypeWithInferredSubtypes() { doTest(); }
public void testPreferErrorOnTopLevelToFailedSubstitutorOnNestedLevel() { doTest(); }
public void testDontIgnoreIncompatibilitiesDuringFirstApplicabilityCheck() { doTest(); }
public void testCaptureOnDedicatedParameterOfSecondSearch() { doTest(); }

8
java/java-tests/testSrc/com/intellij/java/codeInspection/bytecodeAnalysis/BytecodeAnalysisIntegrationTest.java
View File

@@ -96,15 +96,15 @@ public class BytecodeAnalysisIntegrationTest extends LightCodeInsightFixtureTest
public void testInferredAnnoGutter() {
checkHasGutter("org.apache.velocity.util.ExceptionUtils",
"<html><i>Inferred</i> annotations available. Full signature:<p>\n" +
"<b><i>@Contract('null,_,_->null')</i></b> \n" +
"Throwable <b>createWithCause</b>(Class,\n String,\n Throwable)</html>");
"<i>@Contract('null,_,_->null')</i> \n" +
"public static Throwable <b>createWithCause</b>(Class clazz,\n String message,\n Throwable cause)</html>");
}
public void testExternalAnnoGutter() {
checkHasGutter("java.lang.String",
"<html>External and <i>inferred</i> annotations available. Full signature:<p>\n" +
"<b><i>@Contract(pure = true)</i></b> \n" +
"<b>String</b>(<b>@NotNull</b> String)</html>");
"<i>@Contract(pure = true)</i> \n" +
"public <b>String</b>(@NotNull String var1)</html>");
}
private void checkHasGutter(String className, String expectedText) {

29
java/java-tests/testSrc/com/intellij/java/index/IndexTest.groovy
View File

@@ -60,9 +60,7 @@ import com.intellij.util.indexing.*
import com.intellij.util.indexing.impl.MapIndexStorage
import com.intellij.util.indexing.impl.MapReduceIndex
import com.intellij.util.indexing.impl.UpdatableValueContainer
import com.intellij.util.io.CaseInsensitiveEnumeratorStringDescriptor
import com.intellij.util.io.EnumeratorStringDescriptor
import com.intellij.util.io.PersistentHashMap
import com.intellij.util.io.*
import com.intellij.util.ref.GCUtil
import com.intellij.util.ref.GCWatcher
import com.siyeh.ig.JavaOverridingMethodUtil
@@ -773,6 +771,7 @@ class IndexTest extends JavaCodeInsightFixtureTestCase {
}
class RecordingVfsListener extends IndexedFilesListener {
def vfsEventMerger = new VfsEventsMerger()
@Override
protected void iterateIndexableFiles(@NotNull VirtualFile file, @NotNull ContentIterator iterator) {
@@ -785,9 +784,18 @@ class IndexTest extends JavaCodeInsightFixtureTestCase {
})
}
protected void doInvalidateIndicesForFile(@NotNull VirtualFile file, boolean contentChange) {
vfsEventMerger.recordBeforeFileEvent(((VirtualFileWithId)file).id, file, contentChange)
}
@Override
protected void buildIndicesForFile(@NotNull VirtualFile file, boolean contentChange) {
vfsEventMerger.recordFileEvent(((VirtualFileWithId)file).id, file, contentChange)
}
String indexingOperation(VirtualFile file) {
Ref<String> operation = new Ref<>()
eventMerger.processChanges(new VfsEventsMerger.VfsEventProcessor() {
vfsEventMerger.processChanges(new VfsEventsMerger.VfsEventProcessor() {
@Override
boolean process(@NotNull VfsEventsMerger.ChangeInfo info) {
operation.set(info.toString())
@@ -802,7 +810,10 @@ class IndexTest extends JavaCodeInsightFixtureTestCase {
void testIndexedFilesListener() throws Throwable {
def listener = new RecordingVfsListener()
VirtualFileManager.instance.addAsyncFileListener(listener, myFixture.testRootDisposable)
ApplicationManager.getApplication().getMessageBus().connect(myFixture.getTestRootDisposable()).subscribe(
VirtualFileManager.VFS_CHANGES,
listener
)
def fileName = "test.txt"
final VirtualFile testFile = myFixture.addFileToProject(fileName, "test").getVirtualFile()
@@ -911,7 +922,7 @@ class IndexTest extends JavaCodeInsightFixtureTestCase {
}
@CompileStatic
void "test Vfs Event Processing Performance"() {
void "test Vfs Events Processing Performance"() {
def filename = 'A.java'
myFixture.addFileToProject('foo/bar/' + filename, 'class A {}')
@@ -933,9 +944,9 @@ class IndexTest extends JavaCodeInsightFixtureTestCase {
eventList.add(new VFileCreateEvent(null, file.parent, filename, false, null, null, true, null))
}
def applier = ((FileBasedIndexImpl)FileBasedIndex.instance).changedFilesCollector.prepareChange(eventList)
applier.beforeVfsChange()
applier.afterVfsChange()
IndexedFilesListener indexedFilesListener = ((FileBasedIndexImpl)FileBasedIndex.instance).changedFilesCollector
indexedFilesListener.before(eventList)
indexedFilesListener.after(eventList)
files = FilenameIndex.getFilesByName(project, filename, GlobalSearchScope.moduleScope(module))
assert files?.length == 1

84
java/java-tests/testSrc/com/intellij/java/index/StubReSerializationTest.java
View File

@@ -1,84 +0,0 @@
// Copyright 2000-2019 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.java.index;
import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.util.io.BufferExposingByteArrayOutputStream;
import com.intellij.openapi.vfs.VfsUtilCore;
import com.intellij.psi.PsiFile;
import com.intellij.psi.impl.DebugUtil;
import com.intellij.psi.impl.source.PsiFileWithStubSupport;
import com.intellij.psi.stubs.*;
import com.intellij.testFramework.fixtures.JavaCodeInsightFixtureTestCase;
import com.intellij.util.io.PersistentStringEnumerator;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.util.Arrays;
public class StubReSerializationTest extends JavaCodeInsightFixtureTestCase {
public void testReSerializationWithDifferentSerializerEnumeration() throws Exception {
SerializationManagerEx serializationManager = SerializationManagerEx.getInstanceEx();
serializationManager.flushNameStorage();
File externalStubEnumerator =
VfsUtilCore.virtualToIoFile(myFixture.getTempDirFixture().createFile("external_stub_serializer_enumerator/serializer.names"));
// ensure we have different serializer's enumeration
try (PersistentStringEnumerator enumerator = new PersistentStringEnumerator(externalStubEnumerator)) {
for (int i = 0; i < 10000; i++) {
enumerator.enumerate("garbage value " + i);
}
}
SerializationManagerImpl externalSerializationManager = new SerializationManagerImpl(externalStubEnumerator, false);
try {
PsiFileStub stub = createStub();
BufferExposingByteArrayOutputStream out = new BufferExposingByteArrayOutputStream();
serializationManager.serialize(stub, out);
byte[] serialized = out.toByteArray();
BufferExposingByteArrayOutputStream externallySerializedOut = new BufferExposingByteArrayOutputStream();
serializationManager.reSerialize(new ByteArrayInputStream(serialized), externallySerializedOut, externalSerializationManager);
byte[] externalStub = externallySerializedOut.toByteArray();
assertFalse(Arrays.equals(serialized, externalStub));
Stub stubFromExternSerializationManager = externalSerializationManager.deserialize(new ByteArrayInputStream(externalStub));
assertEquals(DebugUtil.stubTreeToString(stub), DebugUtil.stubTreeToString(stubFromExternSerializationManager));
BufferExposingByteArrayOutputStream initialOut = new BufferExposingByteArrayOutputStream();
externalSerializationManager.reSerialize(new ByteArrayInputStream(externalStub), initialOut, serializationManager);
byte[] initialSerializedStub = initialOut.toByteArray();
assertOrderedEquals(serialized, initialSerializedStub);
} finally {
Disposer.dispose(externalSerializationManager);
}
}
public void testIdenticalReSerialization() throws Exception {
SerializationManagerEx serializationManager = SerializationManagerEx.getInstanceEx();
PsiFileStub stub = createStub();
BufferExposingByteArrayOutputStream out = new BufferExposingByteArrayOutputStream();
serializationManager.serialize(stub, out);
byte[] serialized = out.toByteArray();
BufferExposingByteArrayOutputStream reSerializedOut = new BufferExposingByteArrayOutputStream();
serializationManager.reSerialize(new ByteArrayInputStream(serialized), reSerializedOut, serializationManager);
byte[] reSerialized = reSerializedOut.toByteArray();
assertOrderedEquals(serialized, reSerialized);
BufferExposingByteArrayOutputStream reSerializedOut2 = new BufferExposingByteArrayOutputStream();
serializationManager.reSerialize(new ByteArrayInputStream(reSerialized), reSerializedOut2, serializationManager);
byte[] reSerialized2 = reSerializedOut.toByteArray();
assertOrderedEquals(serialized, reSerialized2);
}
private PsiFileStub createStub() {
PsiFile f = myFixture.addFileToProject("A.java", "class A { int j = 123; void m () { Runnable r = () -> {}; }}");
return ((PsiFileWithStubSupport)f).getStubTree().getRoot();
}
}

9
java/java-tests/testSrc/com/intellij/psi/impl/smartPointers/SmartPsiElementPointersTest.java
View File

@@ -677,23 +677,20 @@ public class SmartPsiElementPointersTest extends CodeInsightTestCase {
}
public void testLargeFileWithManyChangesPerformance() throws Exception {
String text = StringUtil.repeat("foo foo \n", 50000);
PsiFile file = createFile("a.txt", text);
PsiFile file = createFile("a.txt", StringUtil.repeat("foo foo \n", 50000));
final TextRange range = TextRange.from(10, 10);
final SmartPsiFileRange pointer = getPointerManager().createSmartPsiFileRangePointer(file, range);
final Document document = file.getViewProvider().getDocument();
assertNotNull(document);
WriteAction.run(() -> PlatformTestUtil.startPerformanceTest("smart pointer range update", 10_000, () -> {
WriteAction.run(() -> PlatformTestUtil.startPerformanceTest("smart pointer range update", 11_000, () -> {
document.setText(StringUtil.repeat("foo foo \n", 50000));
for (int i = 0; i < 10000; i++) {
document.insertString(i * 20 + 100, "x\n");
assertFalse(PsiDocumentManager.getInstance(myProject).isCommitted(document));
assertEquals(range, pointer.getRange());
}
}).setup(() -> {
document.setText(text);
assertEquals(range, pointer.getRange());
}).attempts(10).assertTiming());
PsiDocumentManager.getInstance(myProject).commitAllDocuments();

21
java/java-tests/testSrc/com/intellij/roots/UnloadedModulesConfigurationTest.kt
View File

@@ -1,4 +1,18 @@
// Copyright 2000-2019 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.
/*
* Copyright 2000-2017 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 com.intellij.roots
import com.intellij.openapi.application.ex.PathManagerEx
@@ -10,7 +24,6 @@ import com.intellij.openapi.project.impl.ProjectManagerImpl
import com.intellij.openapi.roots.ModuleRootManager
import com.intellij.openapi.roots.ModuleRootModificationUtil
import com.intellij.openapi.util.io.FileUtil
import com.intellij.openapi.util.io.FileUtilRt
import com.intellij.openapi.vfs.VfsUtilCore
import com.intellij.testFramework.ModuleTestCase
import java.io.File
@@ -20,7 +33,7 @@ import java.io.File
*/
class UnloadedModulesConfigurationTest : ModuleTestCase() {
fun `test load project`() {
val projectPath = FileUtilRt.toSystemIndependentName(File(PathManagerEx.getTestDataPath(), "moduleRootManager/unloadedModules").absolutePath)
val projectPath = File(PathManagerEx.getTestDataPath(), "moduleRootManager/unloadedModules").absolutePath
val project = getProjectManager().loadAndOpenProject(projectPath)!!
try {
val moduleManager = ModuleManager.getInstance(project)
@@ -28,7 +41,7 @@ class UnloadedModulesConfigurationTest : ModuleTestCase() {
assertEquals(2, moduleManager.unloadedModuleDescriptions.size)
val util = moduleManager.unloadedModuleDescriptions.find { it.name == "util" }!!
val projectDirUrl = VfsUtilCore.pathToUrl(projectPath)
val projectDirUrl = VfsUtilCore.pathToUrl(FileUtil.toSystemIndependentName(projectPath))
assertEquals("$projectDirUrl/util", assertOneElement(util.contentRoots).url)
assertEmpty(util.dependencyModuleNames)

7
java/plugin/resources/META-INF/plugin.xml
View File

@@ -1,16 +1,16 @@
<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude" use-idea-classloader="true">
<!-- we need to use the platform classloader to make the plugin compatible with CLion until IDEA-187832 is fixed,
see cidr-external-system/resources/META-INF/plugin.xml for details -->
<id>com.intellij.java</id>
<name>Java</name>
<description>Java language support.</description>
<vendor>JetBrains</vendor>
<resource-bundle>messages.ActionsBundle</resource-bundle>
<depends>com.intellij.modules.platform</depends>
<depends>com.intellij.modules.lang</depends>
<depends>com.intellij.modules.vcs</depends>
<depends>com.intellij.modules.xdebugger</depends>
<depends>com.intellij.modules.xml</depends>
<xi:include href="/META-INF/JavaPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
<!-- todo: these files are present in Java plugin for IDEA Ultimate only, they should be extract to a different plugin.xml -->
@@ -27,8 +27,7 @@
<depends optional="true" config-file="profiler-java.xml">com.intellij.modules.profiler</depends>
<depends optional="true" config-file="structuralsearch-java.xml">com.intellij.modules.structuralsearch</depends>
<depends optional="true" config-file="RemoteServersJava.xml">com.intellij.modules.remoteServers</depends>
<depends optional="true" config-file="JavaCMakeActionPatcher.xml">com.intellij.modules.clion.cmake</depends> <!-- a workaround for IDEA-209728 -->
<depends optional="true" config-file="JavaCMakeActionPatcher.xml">com.intellij.modules.clion.cmake</depends> <!-- this is a workaround for IDEA-209728 -->
<extensions defaultExtensionNs="com.intellij">
<moduleType id="JAVA_MODULE" classpathProvider="true" implementationClass="com.intellij.openapi.module.JavaModuleType"/>
</extensions>

57
java/structuralsearch-java/src/com/intellij/structuralsearch/JavaStructuralSearchProfile.java
View File

@@ -11,7 +11,6 @@ import com.intellij.ide.highlighter.JavaFileType;
import com.intellij.lang.Language;
import com.intellij.lang.annotation.HighlightSeverity;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.fileTypes.LanguageFileType;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.openapi.project.Project;
@@ -19,6 +18,8 @@ import com.intellij.openapi.util.registry.Registry;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.*;
import com.intellij.psi.impl.source.JavaDummyHolder;
import com.intellij.psi.impl.source.PsiCodeFragmentImpl;
import com.intellij.psi.impl.source.tree.JavaElementType;
import com.intellij.psi.javadoc.PsiDocComment;
import com.intellij.psi.javadoc.PsiDocToken;
import com.intellij.psi.util.PsiTreeUtil;
@@ -483,10 +484,7 @@ public class JavaStructuralSearchProfile extends StructuralSearchProfile {
}
@Override
public boolean shouldShowProblem(HighlightInfo highlightInfo, PsiFile file, PatternContext context) {
if (!Registry.is("ssr.in.editor.problem.highlighting")) {
return false;
}
public boolean shouldShowProblem(HighlightInfo highlightInfo, PsiFile file) {
if (highlightInfo.getSeverity() != HighlightSeverity.ERROR && highlightInfo.getSeverity() != HighlightSeverity.INFORMATION) {
return false;
}
@@ -513,7 +511,7 @@ public class JavaStructuralSearchProfile extends StructuralSearchProfile {
return false;
}
final List<PsiStatement> children = PsiTreeUtil.getChildrenOfTypeAsList(file, PsiStatement.class);
if (children.size() == 1 && context == DEFAULT_CONTEXT) {
if (children.size() == 1 && ((PsiCodeFragmentImpl)file).getContentElementType() == JavaElementType.STATEMENTS) {
final PsiStatement child = children.get(0);
if (child == parent && (child instanceof PsiExpressionStatement || child instanceof PsiDeclarationStatement)) {
// search for expression, type, annotation or symbol
@@ -574,10 +572,6 @@ public class JavaStructuralSearchProfile extends StructuralSearchProfile {
public void checkSearchPattern(CompiledPattern pattern) {
final ValidatingVisitor visitor = new ValidatingVisitor();
final NodeIterator nodes = pattern.getNodes();
if (pattern.getNodeCount() == 1 && (
nodes.current() instanceof PsiExpressionStatement || nodes.current() instanceof PsiDeclarationStatement)) {
visitor.setCurrent(nodes.current());
}
while (nodes.hasNext()) {
nodes.current().accept(visitor);
nodes.advance();
@@ -599,9 +593,6 @@ public class JavaStructuralSearchProfile extends StructuralSearchProfile {
final boolean replaceIsExpression = statements2.length == 1 && statements2[0].getLastChild() instanceof PsiErrorElement;
final ValidatingVisitor visitor = new ValidatingVisitor();
if (statements2.length == 1 && (statements2[0] instanceof PsiExpressionStatement || statements2[0] instanceof PsiDeclarationStatement)) {
visitor.setCurrent(statements2[0]);
}
for (PsiElement statement : statements2) {
statement.accept(visitor);
}
@@ -626,7 +617,6 @@ public class JavaStructuralSearchProfile extends StructuralSearchProfile {
}
static class ValidatingVisitor extends JavaRecursiveElementWalkingVisitor {
private PsiElement myCurrent;
@Override public void visitAnnotation(PsiAnnotation annotation) {
super.visitAnnotation(annotation);
@@ -652,45 +642,6 @@ public class JavaStructuralSearchProfile extends StructuralSearchProfile {
throw new MalformedPatternException(SSRBundle.message("invalid.modifier.type",name));
}
}
@Override
public void visitErrorElement(PsiErrorElement element) {
super.visitErrorElement(element);
if (Registry.is("ssr.in.editor.problem.highlighting") && Registry.is("ssr.use.new.search.dialog") &&
!ApplicationManager.getApplication().isUnitTestMode()) {
return;
}
final PsiElement parent = element.getParent();
final String errorDescription = element.getErrorDescription();
if (parent instanceof PsiClass && "Identifier expected".equals(errorDescription)) {
// other class content variable.
return;
}
if (parent instanceof PsiTryStatement && "'catch' or 'finally' expected".equals(errorDescription)) {
// searching for naked try allowed
return;
}
if (parent == myCurrent) {
// search for expression, type, annotation or symbol
if ("';' expected".equals(errorDescription) && element.getNextSibling() == null) {
// expression
return;
}
if ("Identifier or type expected".equals(errorDescription)) {
// annotation
return;
}
if ("Identifier expected".equals(errorDescription)) {
// type
return;
}
}
throw new MalformedPatternException(errorDescription);
}
void setCurrent(PsiElement current) {
myCurrent = current;
}
}
@Override

3
json/src/com/intellij/json/JsonFileTypeFactory.java
View File

@@ -6,9 +6,8 @@ import org.jetbrains.annotations.NotNull;
/**
* @author Mikhail Golubev
* @deprecated use &lt;fileType&gt; extension point instead
*
*/
@Deprecated
public class JsonFileTypeFactory extends FileTypeFactory {
@Override
public void createFileTypes(@NotNull FileTypeConsumer consumer) {

8
json/src/com/jetbrains/jsonSchema/impl/JsonSchemaCompletionContributor.java
View File

@@ -55,10 +55,10 @@ import java.util.stream.Collectors;
* @author Irina.Chernushina on 10/1/2015.
*/
public class JsonSchemaCompletionContributor extends CompletionContributor {
private static final String BUILTIN_USAGE_KEY = "builtin";
private static final String SCHEMA_USAGE_KEY = "schema";
private static final String USER_USAGE_KEY = "user";
private static final String REMOTE_USAGE_KEY = "remote";
private static final String BUILTIN_USAGE_KEY = "json.schema.builtin.completion";
private static final String SCHEMA_USAGE_KEY = "json.schema.schema.completion";
private static final String USER_USAGE_KEY = "json.schema.user.completion";
private static final String REMOTE_USAGE_KEY = "json.schema.remote.completion";
@Override
public void fillCompletionVariants(@NotNull CompletionParameters parameters, @NotNull CompletionResultSet result) {

5
json/src/com/jetbrains/jsonSchema/impl/JsonSchemaUsageTriggerCollector.java
View File

@@ -1,12 +1,11 @@
// Copyright 2000-2018 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.jetbrains.jsonSchema.impl;
import com.intellij.internal.statistic.eventLog.FeatureUsageData;
import com.intellij.internal.statistic.service.fus.collectors.FUCounterUsageLogger;
public class JsonSchemaUsageTriggerCollector {
public static void trigger(String feature) {
FUCounterUsageLogger.getInstance().logEvent("json.schema", "completion.by.schema.invoked",
new FeatureUsageData().addData("schemaKind", feature));
FUCounterUsageLogger.getInstance().logEvent("json.schema", feature);
}
}

9
json/src/jsonSchema/build.xml
View File

@@ -94,15 +94,6 @@
<replaceregexp file="${idea.project.home}/plugins/NodeJS/src/com/jetbrains/nodejs/packageJson/packageJsonSchema.json"
match="&quot;publishConfig&quot;"
replace="&quot;jscsConfig&quot; : {&quot;$ref&quot;: &quot;http://json.schemastore.org/jscsrc#&quot;},${line.separator} &quot;publishConfig&quot;" />
<replaceregexp file="${idea.project.home}/plugins/NodeJS/src/com/jetbrains/nodejs/packageJson/packageJsonSchema.json"
match="&quot;publishConfig&quot;"
replace="&quot;nodemonConfig&quot; : {&quot;$ref&quot;: &quot;http://json.schemastore.org/nodemon#&quot;},${line.separator} &quot;publishConfig&quot;" />
<replaceregexp file="${idea.project.home}/plugins/NodeJS/src/com/jetbrains/nodejs/packageJson/packageJsonSchema.json"
match="&quot;publishConfig&quot;"
replace="&quot;husky&quot; : {&quot;$ref&quot;: &quot;http://json.schemastore.org/huskyrc#&quot;},${line.separator} &quot;publishConfig&quot;" />
<replaceregexp file="${idea.project.home}/plugins/NodeJS/src/com/jetbrains/nodejs/packageJson/packageJsonSchema.json"
match="&quot;publishConfig&quot;"
replace="&quot;renovate&quot; : {&quot;$ref&quot;: &quot;http://json.schemastore.org/renovate#&quot;},${line.separator} &quot;publishConfig&quot;" />
<replaceregexp file="${idea.project.home}/plugins/NodeJS/src/com/jetbrains/nodejs/packageJson/packageJsonSchema.json"
match="&quot;publishConfig&quot;"
replace="&quot;browserslist&quot; : {&quot;oneOf&quot;: [{&quot;type&quot;: &quot;array&quot;, &quot;items&quot;: {&quot;type&quot;: &quot;string&quot;}}, {&quot;type&quot;: &quot;object&quot;, &quot;additionalProperties&quot;: {&quot;type&quot;: &quot;array&quot;, &quot;items&quot;: {&quot;type&quot;: &quot;string&quot;}}}] , &quot;description&quot;: &quot;List of Browserslist queries&quot;},${line.separator} &quot;publishConfig&quot;" />

52
platform/bootstrap/src/com/intellij/ide/BootstrapClassLoader.java Normal file
View File

@@ -0,0 +1,52 @@
// Copyright 2000-2019 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.ide;
import com.intellij.util.lang.UrlClassLoader;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.security.ProtectionDomain;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
public class BootstrapClassLoader extends UrlClassLoader {
public interface Transformer {
byte[] transform(ClassLoader loader, String className, @Nullable ProtectionDomain protectionDomain, byte[] classBytes);
}
private final List<Transformer> myTransformers = new CopyOnWriteArrayList<>();
public BootstrapClassLoader(@NotNull Builder<BootstrapClassLoader> builder) {
super(builder);
}
public void addTransformer(Transformer transformer) {
myTransformers.add(transformer);
}
public boolean removeTransformer(Transformer transformer) {
return myTransformers.remove(transformer);
}
@Override
protected Class _defineClass(String name, byte[] b) {
return super._defineClass(name, doTransform(name, null, b));
}
@Override
protected Class _defineClass(String name, byte[] b, @Nullable ProtectionDomain protectionDomain) {
return super._defineClass(name, doTransform(name, protectionDomain, b), protectionDomain);
}
private byte[] doTransform(String name, ProtectionDomain protectionDomain, byte[] bytes) {
byte[] b = bytes;
for (Transformer transformer : myTransformers) {
final byte[] result = transformer.transform(this, name, protectionDomain, b);
if (result != null) {
b = result;
}
}
return b;
}
}

73
platform/bootstrap/src/com/intellij/ide/BootstrapClassLoaderUtil.java
View File

@@ -1,17 +1,14 @@
// Copyright 2000-2019 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.
// Copyright 2000-2018 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.ide;
import com.intellij.idea.Main;
import com.intellij.openapi.application.PathManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.util.ClassLoaderUtil;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.util.io.FileUtilRt;
import com.intellij.util.SmartList;
import com.intellij.util.lang.UrlClassLoader;
import com.intellij.util.text.StringTokenizer;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.File;
import java.io.IOException;
@@ -23,20 +20,18 @@ import java.net.URLClassLoader;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.security.ProtectionDomain;
import java.util.*;
import java.util.regex.Pattern;
/**
* @author max
*/
public class BootstrapClassLoaderUtil {
public static final String CLASSPATH_ORDER_FILE = "classpath-order.txt";
public class BootstrapClassLoaderUtil extends ClassUtilCore {
private static final Logger LOG = Logger.getInstance("#com.intellij.ide.BootstrapClassLoaderUtil");
private static final String PROPERTY_IGNORE_CLASSPATH = "ignore.classpath";
private static final String PROPERTY_ALLOW_BOOTSTRAP_RESOURCES = "idea.allow.bootstrap.resources";
private static final String PROPERTY_ADDITIONAL_CLASSPATH = "idea.additional.classpath";
private static final String MARKETPLACE_PLUGIN_DIR = "marketplace";
public static final String CLASSPATH_ORDER_FILE = "classpath-order.txt";
private BootstrapClassLoaderUtil() { }
@@ -54,16 +49,13 @@ public class BootstrapClassLoaderUtil {
addAdditionalClassPath(classpath);
addParentClasspath(classpath, true);
File mpBoot = new File(PathManager.getPluginsPath(), MARKETPLACE_PLUGIN_DIR + "/lib/boot/marketplace-bootstrap.jar");
boolean installMarketplace = mpBoot.exists();
final File mpBoot = new File(PathManager.getPluginsPath(), "marketplace/lib/boot/marketplace-bootstrap.jar");
final boolean installMarketplace = mpBoot.exists();
if (installMarketplace) {
File marketplaceImpl = new File(PathManager.getPluginsPath(), MARKETPLACE_PLUGIN_DIR + "/lib/boot/marketplace-impl.jar");
if (marketplaceImpl.exists()) {
classpath.add(marketplaceImpl.toURI().toURL());
}
classpath.add(new File(PathManager.getPluginsPath(), "marketplace/lib/boot/marketplace-impl.jar").toURI().toURL());
}
UrlClassLoader.Builder builder = UrlClassLoader.build()
UrlClassLoader.Builder<BootstrapClassLoader> builder = UrlClassLoader.build(BootstrapClassLoader.class)
.urls(filterClassPath(new ArrayList<>(classpath)))
.allowLock()
.usePersistentClasspathIndexForLocalClassDirectories()
@@ -75,26 +67,21 @@ public class BootstrapClassLoaderUtil {
ClassLoaderUtil.addPlatformLoaderParentIfOnJdk9(builder);
final BootstrapClassLoader loader = builder.get();
if (installMarketplace) {
try {
List<BytecodeTransformer> transformers = new SmartList<>();
UrlClassLoader spiLoader = UrlClassLoader.build().urls(mpBoot.toURI().toURL()).parent(BootstrapClassLoaderUtil.class.getClassLoader()).get();
for (BytecodeTransformer transformer : ServiceLoader.load(BytecodeTransformer.class, spiLoader)) {
transformers.add(transformer);
}
if (!transformers.isEmpty()) {
return new TransformingLoader(builder, transformers);
final UrlClassLoader mpBootloader = UrlClassLoader.build().urls(mpBoot.toURI().toURL()).parent(BootstrapClassLoaderUtil.class.getClassLoader()).get();
for (BootstrapClassLoader.Transformer transformer : ServiceLoader.load(BootstrapClassLoader.Transformer.class, mpBootloader)) {
loader.addTransformer(transformer);
}
}
catch (Throwable e) {
// at this point logging is not initialized yet, so reporting the error directly
String path = new File(PathManager.getPluginsPath(), MARKETPLACE_PLUGIN_DIR).getAbsolutePath();
String message = "As a workaround, you may uninstall or update JetBrains Marketplace Support plugin at " + path;
Main.showMessage("JetBrains Marketplace boot failure", new Exception(message, e));
LOG.info("Marketplace boot error: ", e);
}
}
return builder.get();
return loader;
}
/**
@@ -256,34 +243,4 @@ public class BootstrapClassLoaderUtil {
}
return classpath;
}
private static class TransformingLoader extends UrlClassLoader {
private final List<BytecodeTransformer> myTransformers;
TransformingLoader(@NotNull Builder builder, List<BytecodeTransformer> transformers) {
super(builder);
myTransformers = Collections.unmodifiableList(transformers);
}
@Override
protected Class _defineClass(String name, byte[] b) {
return super._defineClass(name, doTransform(name, null, b));
}
@Override
protected Class _defineClass(String name, byte[] b, @Nullable ProtectionDomain protectionDomain) {
return super._defineClass(name, doTransform(name, protectionDomain, b), protectionDomain);
}
private byte[] doTransform(String name, ProtectionDomain protectionDomain, byte[] bytes) {
byte[] b = bytes;
for (BytecodeTransformer transformer : myTransformers) {
byte[] result = transformer.transform(this, name, protectionDomain, b);
if (result != null) {
b = result;
}
}
return b;
}
}
}

10
platform/bootstrap/src/com/intellij/ide/BytecodeTransformer.java
View File

@@ -1,10 +0,0 @@
// Copyright 2000-2019 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.ide;
import org.jetbrains.annotations.Nullable;
import java.security.ProtectionDomain;
public interface BytecodeTransformer {
byte[] transform(ClassLoader loader, String className, @Nullable ProtectionDomain protectionDomain, byte[] classBytes);
}

2
platform/bootstrap/src/com/intellij/idea/Main.java
View File

@@ -189,7 +189,7 @@ public final class Main {
JOptionPane.showMessageDialog(JOptionPane.getRootFrame(), scrollPane, title, type);
}
catch (Throwable t) {
stream.println("\nAlso, a UI exception occurred on an attempt to show the above message:");
stream.println("\nAlso, an UI exception occurred on attempt to show above message:");
t.printStackTrace(stream);
}
}

4
platform/build-scripts/groovy/org/jetbrains/intellij/build/BuildOptions.groovy
View File

@@ -123,9 +123,9 @@ class BuildOptions {
System.getProperty("teamcity.buildType.id") == null)
/**
* Specifies JRE version to be bundled with distributions, 11 by default.
* Specifies JRE version to be bundled with distributions, 8 by default.
*/
int bundledJreVersion = System.getProperty("intellij.build.bundled.jre.version", "11").toInteger()
int bundledJreVersion = System.getProperty("intellij.build.bundled.jre.version", "8").toInteger()
/**
* Specifies JRE build to be bundled with distributions. If {@code null} then jdkBuild from gradle.properties will be used.

7
platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy
View File

@@ -60,7 +60,6 @@ class CommunityRepositoryModules {
"intellij.platform.lvcs.impl",
"intellij.platform.ide.impl",
"intellij.platform.projectModel.impl",
"intellij.platform.externalSystem.impl",
"intellij.platform.scriptDebugger.protocolReaderRuntime",
"intellij.regexp",
"intellij.platform.remoteServers.impl",
@@ -283,9 +282,6 @@ class CommunityRepositoryModules {
withModule("intellij.android.adt.ui.model", "adt-ui.jar")
withModule("intellij.android.layoutlib", "layoutlib-loader.jar")
withModule("android.sdktools.instant-run-client", "sdk-tools.jar")
withModule("android.sdktools.instant-run-common", "sdk-tools.jar")
withModule("intellij.android.jps", "jps/android-jps-plugin.jar", null)
withProjectLibrary("freemarker") //todo[nik] move to module libraries
@@ -335,9 +331,6 @@ class CommunityRepositoryModules {
withProjectLibrary("com.android.tools.build:builder-test-api")
withProjectLibrary("com.android.tools.pixelprobe:pixelprobe")
withProjectLibrary("org.jetbrains.intellij.deps.android.tools:perflib")
withProjectLibrary("org.jetbrains.intellij.deps.android.tools:layoutInspector")
additionalModulesToJars.entrySet().each {
withModule(it.key, it.value)
}

15
platform/build-scripts/groovy/org/jetbrains/intellij/build/JavaPluginLayout.groovy
View File

@@ -17,12 +17,7 @@ class JavaPluginLayout {
withModule("intellij.java.resources", "resources.jar")
withModule("intellij.java.resources.en", "resources.jar")
["intellij.java.compiler.antTasks",
"intellij.java.guiForms.compiler",
"intellij.java.guiForms.rt",
"intellij.java.compiler.instrumentationUtil",
"intellij.java.compiler.instrumentationUtil.java8",
"intellij.java.jps.javacRefScanner8"].
["intellij.java.compiler.antTasks", "intellij.java.guiForms.compiler", "intellij.java.guiForms.rt", "intellij.java.compiler.instrumentationUtil", "intellij.java.compiler.instrumentationUtil.java8", "intellij.java.jps.javacRefScanner8"].
each {
withModule(it, "javac2.jar")
}
@@ -43,7 +38,6 @@ class JavaPluginLayout {
].each {
withModule(it, "java-api.jar", "java_resources_en.jar")
}
[
"intellij.java.compiler.impl",
"intellij.java.debugger.impl",
@@ -67,6 +61,11 @@ class JavaPluginLayout {
withModule(it, "java-impl.jar", "java_resources_en.jar")
}
// externalSystem API is coupled with `java` modules and therefore must be included into the same plugin
// TODO[Vlad, IDEA-187832] remove this from Java plugin distribution as soon as the externalSystem API become java subsystem independent platform API
withModule("intellij.platform.externalSystem.impl")
withModule("intellij.platform.externalSystem.rt")
withArtifact("debugger-agent", "rt")
withArtifact("debugger-agent-storage", "rt")
withProjectLibrary("Eclipse")
@@ -87,4 +86,4 @@ class JavaPluginLayout {
addition()
}
}
}
}

3
platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BuildTasksImpl.groovy
View File

@@ -438,7 +438,8 @@ idea.fatal.error.notification=disabled
}
[
'intellij.build.bundle.second.jre',
'intellij.build.bundled.second.jre.build'
'intellij.build.bundled.second.jre.build',
'intellij.build.bundled.second.jre.version'
].each { prop ->
System.getProperty(prop)?.with {
args += "-D$prop=$it"

120
platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BundledJreManager.groovy
View File

@@ -28,42 +28,55 @@ class BundledJreManager {
* Extract JRE for Linux distribution of the product
* @return path to the directory containing 'jre' subdirectory with extracted JRE
*/
String extractSecondBundledJreForLinux() {
return extractSecondBundledJre("linux")
String extractLinuxJre() {
return extractJre("linux")
}
boolean doBundleSecondJre() {
private static boolean doBundleSecondJre() {
return System.getProperty('intellij.build.bundle.second.jre', 'false').toBoolean()
}
private String getJreBuild(String osName) {
loadDependencyVersions()
return dependencyVersions.get("jreBuild_${osName}" as String, buildContext.options.bundledJreBuild ?: dependencyVersions.get("jdkBuild", ""))
String getSecondJreBuild() {
if (!doBundleSecondJre()) return null
def build = System.getProperty("intellij.build.bundled.second.jre.build")
if (build == null) {
loadDependencyVersions()
build = dependencyVersions.get('secondJreBuild')
}
return build
}
private int getJreVersion() {
return buildContext.options.bundledJreVersion
String getSecondJreVersion() {
if (!doBundleSecondJre()) return null
def version = System.getProperty("intellij.build.bundled.second.jre.version")
if (version == null) {
loadDependencyVersions()
version = dependencyVersions.get('secondJreVersion')
}
return version
}
private int getSecondBundledJreVersion() {
return 8
}
String extractJre(String osName) {
String extractSecondJre(String osName, String secondJreBuild) {
String targetDir = "$baseDirectoryForJre/secondJre.${osName}_${JvmArchitecture.x64}"
if (new File(targetDir).exists()) {
buildContext.messages.info("JRE is already extracted to $targetDir")
return targetDir
}
File archive = findArchive(osName, getJreBuild(osName), getJreVersion(), null, JvmArchitecture.x64, JreVendor.JetBrains)
def jreArchive = "jbr-${jreArchiveSuffix(secondJreBuild, getSecondJreVersion(), JvmArchitecture.x64, osName)}"
File archive = new File(jreDir(), jreArchive)
if (!archive.file || !archive.exists()) {
def errorMessage = "Cannot extract $osName JRE: file $jreArchive is not found"
buildContext.messages.warning(errorMessage)
}
if (archive == null) {
return null
}
buildContext.messages.block("Extract $archive.absolutePath JRE") {
String destination = "$targetDir/jbr"
def destinationDir = new File(destination)
if (destinationDir.exists()) destinationDir.deleteDir()
untar(archive, destination, isBundledJreModular())
untar(archive, destination, isSecondBundledJreModular())
}
return targetDir
}
@@ -72,41 +85,37 @@ class BundledJreManager {
* Extract JRE for Windows distribution of the product
* @return path to the directory containing 'jre' subdirectory with extracted JRE
*/
String extractSecondBundledJreForWin(JvmArchitecture arch) {
return extractSecondBundledJre("windows", arch)
String extractWinJre(JvmArchitecture arch) {
return extractJre("windows", arch)
}
/**
* Extract Oracle JRE for Windows distribution of the product
* @return path to the directory containing 'jre' subdirectory with extracted JRE
*/
String extractSecondBundledOracleJreForWin(JvmArchitecture arch) {
return extractSecondBundledJre("windows", arch, JreVendor.Oracle)
String extractOracleWinJre(JvmArchitecture arch) {
return extractJre("windows", arch, JreVendor.Oracle)
}
/**
* Return path to a .tar.gz archive containing distribution of JRE for macOS which will be bundled with the product
*/
String findSecondBundledJreArchiveForMac() {
return findSecondBundledJreArchive("osx")?.absolutePath
String findMacJreArchive() {
return findJreArchive("osx")?.absolutePath
}
/**
* Return a .tar.gz archive containing distribution of JRE for Win OS which will be bundled with the product
*/
File findSecondBundledJreArchiveForWin(JvmArchitecture arch) {
return findSecondBundledJreArchive("windows", arch)
}
File findJreArchive(String osName, JvmArchitecture arch = JvmArchitecture.x64) {
return findArchive(osName, getJreBuild(osName), getJreVersion(), null, arch, JreVendor.JetBrains)
File findWinJreArchive(JvmArchitecture arch) {
return findJreArchive("windows", arch)
}
String archiveNameJre(BuildContext buildContext) {
return "jre-for-${buildContext.buildNumber}.tar.gz"
}
private String extractSecondBundledJre(String osName, JvmArchitecture arch = JvmArchitecture.x64, JreVendor vendor = JreVendor.JetBrains) {
private String extractJre(String osName, JvmArchitecture arch = JvmArchitecture.x64, JreVendor vendor = JreVendor.JetBrains) {
String vendorSuffix = vendor == JreVendor.Oracle ? ".oracle" : ""
String targetDir = arch == JvmArchitecture.x64 ?
"$baseDirectoryForJre/jre.$osName$arch.fileSuffix$vendorSuffix" :
@@ -116,7 +125,7 @@ class BundledJreManager {
return targetDir
}
File archive = findSecondBundledJreArchive(osName, arch, vendor)
File archive = findJreArchive(osName, arch, vendor)
if (archive == null) {
return null
}
@@ -126,7 +135,7 @@ class BundledJreManager {
destination = "$targetDir/jre32"
}
buildContext.messages.progress("Extracting JRE from '$archive.name' archive")
untar(archive, destination, isSecondBundledJreModular())
untar(archive, destination, isBundledJreModular())
}
return targetDir
}
@@ -177,7 +186,7 @@ class BundledJreManager {
* `build/dependencies/setupJbre.gradle`
* `build/dependencies/setupJdk.gradle`
*/
private String jreArchiveSuffix(String jreBuild, int version, JvmArchitecture arch, String osName) {
static String jreArchiveSuffix(String jreBuild, String version, JvmArchitecture arch, String osName) {
String update, build
def split = jreBuild.split('b')
if (split.length > 2) {
@@ -187,33 +196,29 @@ class BundledJreManager {
}
if (split.length == 2) {
update = split[0]
if (update.startsWith(version.toString())) update -= version
if (update.startsWith(version)) update -= version
// [11_0_2, b140] or [8u202, b1483.24]
(update, build) = ["$version$update", "b${split[1]}"]
}
else {
// [11, b96]
(update, build) = [version.toString(), jreBuild]
(update, build) = [version, jreBuild]
}
"${update}-${osName}-${arch == JvmArchitecture.x32 ? 'i586' : 'x64'}-${build}.tar.gz"
}
private File findSecondBundledJreArchive(String osName, JvmArchitecture arch = JvmArchitecture.x64, JreVendor vendor = JreVendor.JetBrains) {
return findArchive(osName, secondBundledJreBuild, secondBundledJreVersion,
System.getProperty("intellij.build.bundled.jre.prefix"),
arch, vendor)
}
private File findArchive(String osName, String jreBuild,
int jreVersion, String jrePrefix,
JvmArchitecture arch, JreVendor vendor) {
private File findJreArchive(String osName, JvmArchitecture arch = JvmArchitecture.x64, JreVendor vendor = JreVendor.JetBrains) {
def jreDir = jreDir()
String suffix = jreArchiveSuffix(jreBuild, jreVersion, arch, osName)
if (jrePrefix == null) {
jrePrefix = jreVersion >= 9 ? vendor.jreNamePrefix :
def jreBuild = getExpectedJreBuild(osName)
String suffix = jreArchiveSuffix(jreBuild, buildContext.options.bundledJreVersion.toString(), arch, osName)
String prefix = System.getProperty("intellij.build.bundled.jre.prefix")
if (prefix == null) {
prefix = isBundledJreModular() ? vendor.jreNamePrefix :
buildContext.productProperties.toolsJarRequired ? vendor.jreWithToolsJarNamePrefix : vendor.jreNamePrefix
}
def jreArchive = new File(jreDir, "$jrePrefix$suffix")
def jreArchive = new File(jreDir, "$prefix$suffix")
if (!jreArchive.file || !jreArchive.exists()) {
def errorMessage = "Cannot extract $osName JRE: file $jreArchive is not found (${jreDir.listFiles()})"
if (buildContext.options.isInDevelopmentMode) {
@@ -244,16 +249,9 @@ class BundledJreManager {
}
}
private String getSecondBundledJreBuild() {
if (!doBundleSecondJre()) {
throw new IllegalArgumentException("Second JBR won't be bundled, unable to determine build")
}
def build = System.getProperty("intellij.build.bundled.second.jre.build")
if (build == null) {
loadDependencyVersions()
build = dependencyVersions.get('secondJreBuild')
}
return build
private String getExpectedJreBuild(String osName) {
loadDependencyVersions()
return dependencyVersions.get("jreBuild_${osName}" as String, buildContext.options.bundledJreBuild ?: dependencyVersions.get("jdkBuild", ""))
}
private enum JreVendor {
@@ -269,8 +267,12 @@ class BundledJreManager {
}
}
String secondJreSuffix() {
return "-jbr8"
String jreSuffix() {
isBundledJreModular() ? "" : "-jbr8"
}
boolean is32bitArchSupported() {
!isBundledJreModular()
}
/**
@@ -284,7 +286,7 @@ class BundledJreManager {
* If {@code true} then second bundled JRE version is 9+
*/
boolean isSecondBundledJreModular() {
return secondBundledJreVersion.toInteger() >= 9
return secondJreVersion.toInteger() >= 9
}
private final Map<File, Boolean> jbrArchiveInspectionCache = new ConcurrentHashMap<>()

32
platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/LinuxDistributionBuilder.groovy
View File

@@ -57,21 +57,29 @@ class LinuxDistributionBuilder extends OsSpecificDistributionBuilder {
buildTarGz(null, osSpecificDistPath, "-no-jbr")
}
}
if (buildContext.bundledJreManager.doBundleSecondJre()) {
String jreDirectoryPath = buildContext.bundledJreManager.extractSecondBundledJreForLinux()
if (jreDirectoryPath != null) {
buildTarGz(jreDirectoryPath, osSpecificDistPath, buildContext.bundledJreManager.secondJreSuffix())
}
else {
buildContext.messages.info("Skipping building Linux distribution with bundled JRE because JRE archive is missing")
String jreDirectoryPath = buildContext.bundledJreManager.extractLinuxJre()
String modularJreDirectoryPath // Used for Snap packages
if (jreDirectoryPath != null) {
buildTarGz(jreDirectoryPath, osSpecificDistPath, buildContext.bundledJreManager.jreSuffix())
if (buildContext.bundledJreManager.bundledJreModular) {
modularJreDirectoryPath = jreDirectoryPath
}
}
// Used for Snap packages
String jreDirectoryPath = buildContext.bundledJreManager.extractJre("linux")
buildTarGz(jreDirectoryPath, osSpecificDistPath, "")
else {
buildContext.messages.info("Skipping building Linux distribution with bundled JRE because JRE archive is missing")
}
if (jreDirectoryPath != null) {
buildSnapPackage(jreDirectoryPath, osSpecificDistPath)
String secondJreBuild = buildContext.bundledJreManager.getSecondJreBuild()
if (secondJreBuild != null) {
String secondJreDirectoryPath = buildContext.bundledJreManager.extractSecondJre("linux", secondJreBuild)
buildTarGz(secondJreDirectoryPath, osSpecificDistPath, "")
if (buildContext.bundledJreManager.secondBundledJreModular) {
modularJreDirectoryPath = secondJreDirectoryPath
}
}
if (modularJreDirectoryPath != null) {
buildSnapPackage(modularJreDirectoryPath, osSpecificDistPath)
}
else {
buildContext.messages.info("Skipping building Snap packages because no modular JRE are available")

20
platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/MacDistributionBuilder.groovy
View File

@@ -107,20 +107,21 @@ class MacDistributionBuilder extends OsSpecificDistributionBuilder {
void buildArtifacts(String osSpecificDistPath) {
buildContext.executeStep("Build macOS artifacts", BuildOptions.MAC_ARTIFACTS_STEP) {
def macZipPath = buildMacZip(osSpecificDistPath)
def secondJreBuild = buildContext.bundledJreManager.getSecondJreBuild()
if (buildContext.proprietaryBuildTools.macHostProperties == null) {
buildContext.messages.info("A macOS build agent isn't configured - .dmg artifact won't be produced")
buildContext.notifyArtifactBuilt(macZipPath)
}
else {
buildContext.executeStep("Build .dmg artifact for macOS", BuildOptions.MAC_DMG_STEP) {
if (buildContext.bundledJreManager.doBundleSecondJre()) {
MacDmgBuilder.signAndBuildDmg(buildContext, customizer, buildContext.proprietaryBuildTools.macHostProperties,
macZipPath, buildContext.bundledJreManager.findSecondBundledJreArchiveForMac(), true)
}
File jreArchive = buildContext.bundledJreManager.findJreArchive('osx')
if (jreArchive.file) {
MacDmgBuilder.signAndBuildDmg(buildContext, customizer, buildContext.proprietaryBuildTools.macHostProperties,
macZipPath, jreArchive.absolutePath, false)
MacDmgBuilder.signAndBuildDmg(buildContext, customizer, buildContext.proprietaryBuildTools.macHostProperties, macZipPath)
if (secondJreBuild != null) {
def secondJreVersion = buildContext.bundledJreManager.getSecondJreVersion()
def jreArchive = "jbr-${buildContext.bundledJreManager.jreArchiveSuffix(secondJreBuild, secondJreVersion, JvmArchitecture.x64, 'osx')}"
File archive = new File(buildContext.bundledJreManager.jreDir(), jreArchive)
if (archive.file) {
MacDmgBuilder.signAndBuildDmg(buildContext, customizer, buildContext.proprietaryBuildTools.macHostProperties, macZipPath, archive.absolutePath)
}
}
buildContext.ant.delete(file: macZipPath)
}
@@ -269,8 +270,9 @@ class MacDistributionBuilder extends OsSpecificDistributionBuilder {
def extraBins = customizer.extraExecutables
def allPaths = [buildContext.paths.distAll, macDistPath]
def zipRoot = getZipRoot(buildContext, customizer)
def suffix = buildContext.bundledJreManager.jreSuffix()
def baseName = buildContext.productProperties.getBaseArtifactName(buildContext.applicationInfo, buildContext.buildNumber)
def targetPath = "${buildContext.paths.artifacts}/${baseName}.mac.zip"
def targetPath = "${buildContext.paths.artifacts}/${baseName}${suffix}.mac.zip"
buildContext.messages.progress("Building zip archive for macOS")
def productJsonDir = new File(buildContext.paths.temp, "mac.dist.product-info.json.zip").absolutePath

19
platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/MacDmgBuilder.groovy
View File

@@ -35,18 +35,17 @@ class MacDmgBuilder {
dmgBuilder.doSignBinaryFiles(macDistPath)
}
static void signAndBuildDmg(BuildContext buildContext, MacDistributionCustomizer customizer,
MacHostProperties macHostProperties, String macZipPath,
String jreArchivePath, boolean isSecondJre) {
static void signAndBuildDmg(BuildContext buildContext, MacDistributionCustomizer customizer, MacHostProperties macHostProperties, String macZipPath, String secondJreArchive = null) {
MacDmgBuilder dmgBuilder = createInstance(buildContext, customizer, macHostProperties)
def jreArchivePath = (secondJreArchive == null) ? buildContext.bundledJreManager.findMacJreArchive() : secondJreArchive
if (jreArchivePath != null) {
dmgBuilder.doSignAndBuildDmg(macZipPath, jreArchivePath, isSecondJre)
dmgBuilder.doSignAndBuildDmg(macZipPath, jreArchivePath, secondJreArchive)
}
else {
buildContext.messages.info("Skipping building macOS distribution with bundled JRE because JRE archive is missing")
}
if (buildContext.options.buildDmgWithoutBundledJre) {
dmgBuilder.doSignAndBuildDmg(macZipPath, null, false)
dmgBuilder.doSignAndBuildDmg(macZipPath, null)
}
}
@@ -106,16 +105,16 @@ class MacDmgBuilder {
return "../${topLevelDir}/Contents/Home/${isModular ? '' : 'jre/'}bin/java"
}
private void doSignAndBuildDmg(String macZipPath, String jreArchivePath, boolean isSecondJre) {
private void doSignAndBuildDmg(String macZipPath, String jreArchivePath, String secondJreArchive = null) {
def zipRoot = MacDistributionBuilder.getZipRoot(buildContext, customizer)
def jreManager = buildContext.bundledJreManager
String suffix = "-no-jdk", javaExePath = null
if (isSecondJre) {
suffix = jreManager.secondJreSuffix()
javaExePath = getJavaExePath(jreArchivePath, jreManager.isSecondBundledJreModular())
if (secondJreArchive != null) {
suffix = ""
javaExePath = getJavaExePath(secondJreArchive, jreManager.isSecondBundledJreModular())
}
else if (jreArchivePath != null) {
suffix = ""
suffix = jreManager.jreSuffix()
javaExePath = getJavaExePath(jreArchivePath, jreManager.isBundledJreModular())
}
def productJsonDir = new File(buildContext.paths.temp, "mac.dist.product-info.json.dmg$suffix").absolutePath

7
platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/WinExeInstallerBuilder.groovy
View File

@@ -61,7 +61,7 @@ class WinExeInstallerBuilder {
customizer.fileAssociations.collect { !it.startsWith(".") ? ".$it" : it}
}
void buildInstaller(String winDistPath, String additionalDirectoryToInclude, String suffix, boolean jre32BitVersionSupported) {
void buildInstaller(String winDistPath, String additionalDirectoryToInclude, String secondJreSuffix = null, boolean jre32BitVersionSupported) {
if (!SystemInfo.isWindows && !SystemInfo.isLinux) {
buildContext.messages.warning("Windows installer can be built only under Windows or Linux")
@@ -69,6 +69,7 @@ class WinExeInstallerBuilder {
}
String communityHome = buildContext.paths.communityHome
def suffix = secondJreSuffix != null ? secondJreSuffix : buildContext.bundledJreManager.jreSuffix()
String outFileName = buildContext.productProperties.getBaseArtifactName(buildContext.applicationInfo, buildContext.buildNumber) + suffix
buildContext.messages.progress("Building Windows installer $outFileName")
@@ -107,8 +108,8 @@ class WinExeInstallerBuilder {
generator.generateInstallerFile(new File(box, "nsiconf/idea_win.nsh"))
if (buildContext.bundledJreManager.doBundleSecondJre()) {
String jre32Dir = buildContext.bundledJreManager.extractSecondBundledJreForWin(JvmArchitecture.x32)
if (buildContext.bundledJreManager.is32bitArchSupported()) {
String jre32Dir = buildContext.bundledJreManager.extractWinJre(JvmArchitecture.x32)
if (jre32Dir != null) {
generator.addDirectory(jre32Dir)
}

76
platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/WindowsDistributionBuilder.groovy
View File

@@ -72,60 +72,56 @@ class WindowsDistributionBuilder extends OsSpecificDistributionBuilder {
@Override
void buildArtifacts(String winDistPath) {
def arch = customizer.bundledJreArchitecture
def jreSuffix = buildContext.bundledJreManager.secondJreSuffix()
String jreDirectoryPath64 = null
//do not include win32 launcher into winzip with 9+ jbr bundled
List<String> excludeList = ["bin/${buildContext.productProperties.baseFileName}.exe", "bin/${buildContext.productProperties.baseFileName}.exe.vmoptions"]
if (buildContext.bundledJreManager.doBundleSecondJre()) {
jreDirectoryPath64 = arch != null ? buildContext.bundledJreManager.extractSecondBundledJreForWin(arch) : null
List<String> jreDirectoryPaths = [jreDirectoryPath64]
String jreDirectoryPath64 = arch != null ? buildContext.bundledJreManager.extractWinJre(arch) : null
List<String> jreDirectoryPaths = [jreDirectoryPath64]
if (customizer.getBaseDownloadUrlForJre() != null && arch != JvmArchitecture.x32) {
File archive = buildContext.bundledJreManager.findSecondBundledJreArchiveForWin(JvmArchitecture.x32)
if (archive != null && archive.exists()) {
//prepare folder with jre x86 for win archive
def jreDirectoryPath = buildContext.bundledJreManager.extractSecondBundledJreForWin(JvmArchitecture.x32)
buildContext.ant.tar(tarfile: "${buildContext.paths.artifacts}/${buildContext.bundledJreManager.archiveNameJre(buildContext)}", longfile: "gnu", compression: "gzip") {
tarfileset(dir: "${jreDirectoryPath}/jre32") {
include(name: "**/**")
}
if (customizer.getBaseDownloadUrlForJre() != null && arch != JvmArchitecture.x32 && buildContext.bundledJreManager.is32bitArchSupported()) {
File archive = buildContext.bundledJreManager.findWinJreArchive(JvmArchitecture.x32)
if (archive != null && archive.exists()) {
//prepare folder with jre x86 for win archive
def jreDirectoryPath = buildContext.bundledJreManager.extractWinJre(JvmArchitecture.x32)
buildContext.ant.tar(tarfile: "${buildContext.paths.artifacts}/${buildContext.bundledJreManager.archiveNameJre(buildContext)}", longfile: "gnu", compression: "gzip") {
tarfileset(dir: "${jreDirectoryPath}/jre32") {
include(name: "**/**")
}
jreDirectoryPaths = [jreDirectoryPath64, jreDirectoryPath]
}
}
if (customizer.buildZipArchive) {
buildWinZip(jreDirectoryPaths.findAll { it != null }, "${jreSuffix}.win", winDistPath, [])
}
if (arch != null && customizer.buildZipWithBundledOracleJre && arch != JvmArchitecture.x32) {
String oracleJrePath = buildContext.bundledJreManager.extractSecondBundledOracleJreForWin(arch)
if (oracleJrePath != null) {
buildWinZip([oracleJrePath], "${jreSuffix}-oracle-win", winDistPath)
}
else {
buildContext.messages.warning("Skipping building Windows zip archive with bundled Oracle JRE because JRE archive is missing")
}
jreDirectoryPaths = [jreDirectoryPath64, jreDirectoryPath]
}
}
def jreDirectoryPath = buildContext.bundledJreManager.extractJre("windows")
def jreSuffix = buildContext.bundledJreManager.jreSuffix()
def secondJreBuild = buildContext.bundledJreManager.getSecondJreBuild()
def secondJreDirectoryPath = (secondJreBuild != null) ? buildContext.bundledJreManager.extractSecondJre("windows", secondJreBuild) : null
if (customizer.buildZipArchive) {
buildWinZip([jreDirectoryPath], ".win", winDistPath, excludeList)
buildWinZip(jreDirectoryPaths.findAll { it != null }, "${jreSuffix}.win", winDistPath, !buildContext.bundledJreManager.is32bitArchSupported() ? excludeList : [])
if (secondJreDirectoryPath != null) {
buildWinZip([secondJreDirectoryPath], ".win", winDistPath, excludeList)
}
}
if (arch != null && customizer.buildZipWithBundledOracleJre &&
(arch != JvmArchitecture.x32 || buildContext.bundledJreManager.is32bitArchSupported())) {
String oracleJrePath = buildContext.bundledJreManager.extractOracleWinJre(arch)
if (oracleJrePath != null) {
buildWinZip([oracleJrePath], "${jreSuffix}-oracle-win", winDistPath)
}
else {
buildContext.messages.warning("Skipping building Windows zip archive with bundled Oracle JRE because JRE archive is missing")
}
}
buildContext.executeStep("Build Windows Exe Installer", BuildOptions.WINDOWS_EXE_INSTALLER_STEP) {
def productJsonDir = new File(buildContext.paths.temp, "win.dist.product-info.json.exe").absolutePath
if (buildContext.bundledJreManager.doBundleSecondJre()) {
generateProductJson(productJsonDir, jreDirectoryPath64 != null)
new ProductInfoValidator(buildContext).validateInDirectory(productJsonDir, "", [winDistPath, jreDirectoryPath64], [])
new WinExeInstallerBuilder(buildContext, customizer, jreDirectoryPath64)
.buildInstaller(winDistPath, productJsonDir,
buildContext.bundledJreManager.secondJreSuffix(),
buildContext.bundledJreManager.secondBundledJreModular)
generateProductJson(productJsonDir, jreDirectoryPath64 != null)
new ProductInfoValidator(buildContext).validateInDirectory(productJsonDir, "", [winDistPath, jreDirectoryPath64], [])
new WinExeInstallerBuilder(buildContext, customizer, jreDirectoryPath64).buildInstaller(winDistPath, productJsonDir, null, buildContext.bundledJreManager.is32bitArchSupported())
if (secondJreDirectoryPath != null) {
generateProductJson(productJsonDir, secondJreDirectoryPath != null)
new ProductInfoValidator(buildContext).validateInDirectory(productJsonDir, "", [winDistPath, secondJreDirectoryPath], [])
new WinExeInstallerBuilder(buildContext, customizer, secondJreDirectoryPath).buildInstaller(winDistPath, productJsonDir, "", buildContext.bundledJreManager.getSecondJreVersion().toInteger() == 8)
}
generateProductJson(productJsonDir, jreDirectoryPath != null)
new ProductInfoValidator(buildContext).validateInDirectory(productJsonDir, "", [winDistPath, jreDirectoryPath], [])
new WinExeInstallerBuilder(buildContext, customizer, jreDirectoryPath)
.buildInstaller(winDistPath, productJsonDir, '', buildContext.bundledJreManager.bundledJreModular)
}
}

4
platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/sync/checkIcons.kt
View File

@@ -43,7 +43,7 @@ internal fun checkIcons(context: Context = Context(), loggerImpl: Consumer<Strin
}
catch (e: Throwable) {
val investigator = Investigator(DEFAULT_INVESTIGATOR)
assignInvestigation(investigator)
assignInvestigation(investigator, emptyList())
if (context.notifySlack) callSafely {
notifySlackChannel(investigator, context)
}
@@ -52,6 +52,8 @@ internal fun checkIcons(context: Context = Context(), loggerImpl: Consumer<Strin
if (context.doSyncDevRepo || context.iconsCommitHashesToSync.isNotEmpty()) {
createReviewForDev(context)?.also {
context.createdReviews = listOf(it)
assignInvestigation(Investigator(triggeredBy().email),
context.createdReviews.map(Review::url))
}
}
}

7
platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/sync/teamCity.kt
View File

@@ -29,8 +29,11 @@ internal val DEFAULT_INVESTIGATOR by lazy {
internal class Investigator(val email: String, var isAssigned: Boolean = false)
internal fun assignInvestigation(investigator: Investigator): Investigator {
val report = "Unexpected error, please investigate."
internal fun assignInvestigation(investigator: Investigator, reviews: List<String>): Investigator {
val report = if (reviews.isNotEmpty()) {
"Please review and cherry-pick ${reviews.joinToString()}."
}
else "Unexpected error, please investigate."
assignInvestigation(investigator, report)
if (!investigator.isAssigned) {
var nextAttempts = guessEmail(investigator.email)

12
platform/configuration-store-impl/src/ApplicationStoreImpl.kt
View File

@@ -52,17 +52,8 @@ class ApplicationStoreImpl(private val application: Application, pathMacroManage
override fun toString() = "app"
}
internal val appFileBasedStorageConfiguration = object: FileBasedStorageConfiguration {
override val isUseVfsForRead: Boolean
get() = false
override val isUseVfsForWrite: Boolean
get() = false
}
class ApplicationStorageManager(application: Application?, pathMacroManager: PathMacroManager? = null)
: StateStorageManagerImpl("application", pathMacroManager?.createTrackingSubstitutor(), application) {
override fun getFileBasedStorageConfiguration(fileSpec: String) = appFileBasedStorageConfiguration
override fun getOldStorageSpec(component: Any, componentName: String, operation: StateStorageOperation): String? {
return when (component) {
@@ -81,6 +72,9 @@ class ApplicationStorageManager(application: Application?, pathMacroManager: Pat
override val isUseXmlProlog: Boolean
get() = false
override val isUseVfsForWrite: Boolean
get() = false
override fun providerDataStateChanged(storage: FileBasedStorage, writer: DataWriter?, type: DataStateChanged) {
// IDEA-144052 When "Settings repository" is enabled changes in 'Path Variables' aren't saved to default path.macros.xml file causing errors in build process
if (storage.fileSpec == "path.macros.xml" || storage.fileSpec == "applicationLibraries.xml") {

5
platform/configuration-store-impl/src/ComponentStoreImpl.kt
View File

@@ -231,7 +231,7 @@ abstract class ComponentStoreImpl : IComponentStore {
@CalledInAwt
override fun saveComponent(component: PersistentStateComponent<*>) {
val stateSpec = getStateSpec(component)
LOG.debug { "saveComponent is called for ${stateSpec.name}" }
LOG.info("saveComponent is called for ${stateSpec.name}")
val saveManager = createSaveSessionProducerManager()
commitComponent(saveManager, ComponentInfoImpl(component, stateSpec), null)
val absolutePath = Paths.get(storageManager.expandMacros(findNonDeprecated(stateSpec.storages).path)).toAbsolutePath().toString()
@@ -242,7 +242,8 @@ abstract class ComponentStoreImpl : IComponentStore {
val saveResult = saveManager.save()
saveResult.throwIfErrored()
if (!saveResult.isChanged) {
val isSomethingChanged = saveResult.isChanged
if (!isSomethingChanged) {
LOG.info("saveApplicationComponent is called for ${stateSpec.name} but nothing to save")
}
}

5
platform/configuration-store-impl/src/FileBasedStorage.kt
View File

@@ -46,8 +46,7 @@ open class FileBasedStorage(file: Path,
var file = file
private set
protected open val configuration: FileBasedStorageConfiguration
get() = defaultFileBasedStorageConfiguration
protected open val configuration: FileBasedStorageConfiguration = defaultFileBasedStorageConfiguration
init {
val app = ApplicationManager.getApplication()
@@ -58,7 +57,7 @@ open class FileBasedStorage(file: Path,
protected open val isUseXmlProlog = false
final override val isUseVfsForWrite: Boolean
override val isUseVfsForWrite: Boolean
get() = configuration.isUseVfsForWrite
private val isUseUnixLineSeparator: Boolean

8
platform/configuration-store-impl/src/FileBasedStorageConfiguration.kt
View File

@@ -9,13 +9,17 @@ interface FileBasedStorageConfiguration {
val isUseVfsForWrite: Boolean
fun resolveVirtualFile(path: String): VirtualFile? = LocalFileSystem.getInstance().findFileByPath(path)
fun resolveVirtualFile(path: String): VirtualFile?
}
internal val defaultFileBasedStorageConfiguration: FileBasedStorageConfiguration = object : FileBasedStorageConfiguration {
internal val defaultFileBasedStorageConfiguration: FileBasedStorageConfiguration = object: FileBasedStorageConfiguration {
override val isUseVfsForRead: Boolean
get() = false
override val isUseVfsForWrite: Boolean
get() = true
override fun resolveVirtualFile(path: String): VirtualFile? {
return LocalFileSystem.getInstance().findFileByPath(path)
}
}

20
platform/configuration-store-impl/src/ModuleStateStorageManager.kt
View File

@@ -65,11 +65,12 @@ internal class ModuleStateStorageManager(macroSubstitutor: TrackingPathMacroSubs
override val isExternalSystemStorageEnabled: Boolean
get() = (componentManager as Module).project.isExternalStorageEnabled
override fun createFileBasedStorage(path: String, collapsedPath: String, roamingType: RoamingType, rootTagName: String?): StateStorage {
return ModuleFileStorage(this, Paths.get(path), collapsedPath, rootTagName, roamingType, getMacroSubstitutor(collapsedPath), if (roamingType == RoamingType.DISABLED) null else compoundStreamProvider)
}
override fun createFileBasedStorage(path: String, collapsedPath: String, roamingType: RoamingType, rootTagName: String?): StateStorage
= ModuleFileStorage(this, Paths.get(path), collapsedPath, rootTagName, roamingType, getMacroSubstitutor(collapsedPath), if (roamingType == RoamingType.DISABLED) null else compoundStreamProvider)
override fun getFileBasedStorageConfiguration(fileSpec: String) = moduleFileBasedStorageConfiguration
// use VFS to load module file because it is refreshed and loaded into VFS in any case
override val isUseVfsForRead: Boolean
get() = true
private class ModuleFileStorage(storageManager: ModuleStateStorageManager,
file: Path,
@@ -84,13 +85,4 @@ internal class ModuleStateStorageManager(macroSubstitutor: TrackingPathMacroSubs
}
}
}
}
private val moduleFileBasedStorageConfiguration = object : FileBasedStorageConfiguration {
override val isUseVfsForWrite: Boolean
get() = true
// use VFS to load module file because it is refreshed and loaded into VFS in any case
override val isUseVfsForRead: Boolean
get() = true
}
}

32
platform/configuration-store-impl/src/ProjectStateStorageManager.kt
View File

@@ -21,28 +21,6 @@ open class ProjectStateStorageManager(macroSubstitutor: PathMacroSubstitutor,
const val ROOT_TAG_NAME = "project"
}
private val fileBasedStorageConfiguration = object : FileBasedStorageConfiguration {
override val isUseVfsForWrite: Boolean
get() = true
override val isUseVfsForRead: Boolean
get() = project is VirtualFileResolver
override fun resolveVirtualFile(path: String): VirtualFile? {
return when (project) {
is VirtualFileResolver -> project.resolveVirtualFile(path)
else -> super.resolveVirtualFile(path)
}
}
}
override fun getFileBasedStorageConfiguration(fileSpec: String): FileBasedStorageConfiguration {
return when {
isSpecialStorage(fileSpec) -> appFileBasedStorageConfiguration
else -> fileBasedStorageConfiguration
}
}
override fun normalizeFileSpec(fileSpec: String) = removeMacroIfStartsWith(super.normalizeFileSpec(fileSpec), PROJECT_CONFIG_DIR)
override fun expandMacros(path: String): String {
@@ -68,6 +46,16 @@ open class ProjectStateStorageManager(macroSubstitutor: PathMacroSubstitutor,
override val isExternalSystemStorageEnabled: Boolean
get() = project.isExternalStorageEnabled
override val isUseVfsForRead: Boolean
get() = project is VirtualFileResolver
override fun resolveVirtualFile(path: String): VirtualFile? {
return when (project) {
is VirtualFileResolver -> project.resolveVirtualFile(path)
else -> super.resolveVirtualFile(path)
}
}
}
// for upsource

18
platform/configuration-store-impl/src/ProjectStoreBase.kt
View File

@@ -1,6 +1,7 @@
// Copyright 2000-2019 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.configurationStore
import com.intellij.ide.SaveAndSyncHandler
import com.intellij.ide.highlighter.ProjectFileType
import com.intellij.ide.highlighter.WorkspaceFileType
import com.intellij.openapi.application.ApplicationManager
@@ -104,7 +105,8 @@ abstract class ProjectStoreBase(final override val project: Project) : Component
}
}
override fun setPath(filePath: String, isRefreshVfsNeeded: Boolean) {
// used in upsource
protected suspend fun setPath(filePath: String, isRefreshVfs: Boolean) {
val storageManager = storageManager
val fs = LocalFileSystem.getInstance()
val isUnitTestMode = ApplicationManager.getApplication().isUnitTestMode
@@ -116,8 +118,10 @@ abstract class ProjectStoreBase(final override val project: Project) : Component
val workspacePath = composeFileBasedProjectWorkSpacePath(filePath)
storageManager.addMacro(StoragePathMacros.WORKSPACE_FILE, workspacePath)
if (isRefreshVfsNeeded) {
VfsUtil.markDirtyAndRefresh(false, true, false, fs.refreshAndFindFileByPath(filePath), fs.refreshAndFindFileByPath(workspacePath))
if (isRefreshVfs) {
withEdtContext {
VfsUtil.markDirtyAndRefresh(false, true, false, fs.refreshAndFindFileByPath(filePath), fs.refreshAndFindFileByPath(workspacePath))
}
}
if (isUnitTestMode) {
@@ -138,8 +142,10 @@ abstract class ProjectStoreBase(final override val project: Project) : Component
isOptimiseTestLoadSpeed = !Paths.get(filePath).exists()
}
if (isRefreshVfsNeeded) {
VfsUtil.markDirtyAndRefresh(false, true, true, fs.refreshAndFindFileByPath(configDir))
if (isRefreshVfs) {
withEdtContext {
VfsUtil.markDirtyAndRefresh(false, true, true, fs.refreshAndFindFileByPath(configDir))
}
}
}
@@ -168,6 +174,8 @@ abstract class ProjectStoreBase(final override val project: Project) : Component
catch (e: Exception) {
LOG.error(e)
}
SaveAndSyncHandler.getInstance().scheduleSave(SaveAndSyncHandler.SaveTask(project, saveDocuments = false, forceSavingAllSettings = true))
}
storageManager.addMacro(StoragePathMacros.PRODUCT_WORKSPACE_FILE, "$productSpecificWorkspaceParentDir/$projectId.xml")

5
platform/configuration-store-impl/src/ProjectStoreImpl.kt
View File

@@ -23,6 +23,7 @@ import com.intellij.util.containers.computeIfAny
import com.intellij.util.io.*
import kotlinx.coroutines.coroutineScope
import kotlinx.coroutines.launch
import kotlinx.coroutines.runBlocking
import org.jetbrains.annotations.ApiStatus
import org.jetbrains.annotations.CalledInAny
import java.nio.file.AccessDeniedException
@@ -45,7 +46,9 @@ open class ProjectStoreImpl(project: Project) : ProjectStoreBase(project) {
override val storageManager = ProjectStateStorageManager(TrackingPathMacroSubstitutorImpl(PathMacroManager.getInstance(project)), project)
override fun setPath(path: String) {
setPath(path, true)
runBlocking {
setPath(path, true)
}
}
override fun getProjectName(): String {

18
platform/configuration-store-impl/src/StateStorageManagerImpl.kt
View File

@@ -36,7 +36,8 @@ private val MACRO_PATTERN = Pattern.compile("(\\$[^$]*\\$)")
open class StateStorageManagerImpl(private val rootTagName: String,
final override val macroSubstitutor: PathMacroSubstitutor? = null,
override val componentManager: ComponentManager? = null,
private val virtualFileTracker: StorageVirtualFileTracker? = createDefaultVirtualTracker(componentManager)) : StateStorageManager {
private val virtualFileTracker: StorageVirtualFileTracker? = createDefaultVirtualTracker(componentManager)) : StateStorageManager,
FileBasedStorageConfiguration by defaultFileBasedStorageConfiguration {
private val macros: MutableList<Macro> = ContainerUtil.createLockFreeCopyOnWriteList()
private val storageLock = ReentrantReadWriteLock()
private val storages = THashMap<String, StateStorage>()
@@ -61,16 +62,14 @@ open class StateStorageManagerImpl(private val rootTagName: String,
// access under storageLock
@Suppress("LeakingThis")
private var isUseVfsListener = when {
componentManager == null || componentManager is Application -> ThreeState.NO
else -> ThreeState.UNSURE // unsure because depends on stream provider state
}
open fun getFileBasedStorageConfiguration(fileSpec: String): FileBasedStorageConfiguration = defaultFileBasedStorageConfiguration
private var isUseVfsListener = if (componentManager == null || !isUseVfsForWrite) ThreeState.NO else ThreeState.UNSURE // unsure because depends on stream provider state
protected open val isUseXmlProlog: Boolean
get() = true
override val isUseVfsForWrite: Boolean
get() = true
companion object {
private fun createDefaultVirtualTracker(componentManager: ComponentManager?): StorageVirtualFileTracker? {
return when (componentManager) {
@@ -308,8 +307,11 @@ open class StateStorageManagerImpl(private val rootTagName: String,
override val isUseXmlProlog: Boolean
get() = rootElementName != null && storageManager.isUseXmlProlog && !isSpecialStorage(fileSpec)
override val isUseVfsForWrite: Boolean
get() = super.isUseVfsForWrite && !isSpecialStorage(fileSpec)
override val configuration: FileBasedStorageConfiguration
get() = storageManager.getFileBasedStorageConfiguration(fileSpec)
get() = storageManager
override fun beforeElementSaved(elements: MutableList<Element>, rootAttributes: MutableMap<String, String>) {
if (rootElementName != null) {

4
platform/configuration-store-impl/testSrc/ComponentStoreModificationTrackerTest.kt
View File

@@ -169,10 +169,10 @@ internal class ComponentStoreModificationTrackerTest {
private class MyComponentStore(testAppConfigPath: Path) : ChildlessComponentStore() {
private class MyStorageManager(private val rootDir: Path) : StateStorageManagerImpl("application") {
override fun getFileBasedStorageConfiguration(fileSpec: String) = appFileBasedStorageConfiguration
override val isUseXmlProlog = false
override val isUseVfsForWrite = false
override fun normalizeFileSpec(fileSpec: String) = removeMacroIfStartsWith(super.normalizeFileSpec(fileSpec), APP_CONFIG)
override fun expandMacros(path: String) = if (path[0] == '$') super.expandMacros(path) else "${expandMacro(APP_CONFIG)}/$path"

12
platform/core-api/src/com/intellij/openapi/fileTypes/FileTypeExtension.java
View File

@@ -20,13 +20,10 @@
package com.intellij.openapi.fileTypes;
import com.intellij.openapi.util.KeyedExtensionCollector;
import com.intellij.util.KeyedLazyInstance;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class FileTypeExtension<T> extends KeyedExtensionCollector<T, FileType> {
public FileTypeExtension(@NonNls final String epName) {
@@ -48,13 +45,4 @@ public class FileTypeExtension<T> extends KeyedExtensionCollector<T, FileType> {
final List<T> all = allForFileType(t);
return all.isEmpty() ? null : all.get(0);
}
public Map<FileType, T> getAllRegisteredExtensions() {
List<KeyedLazyInstance<T>> extensions = getExtensions();
Map<FileType, T> result = new HashMap<>();
for (KeyedLazyInstance<T> extension : extensions) {
result.put(FileTypeRegistry.getInstance().findFileTypeByName(extension.getKey()), extension.getInstance());
}
return result;
}
}

3
platform/core-api/src/com/intellij/openapi/fileTypes/FileTypeRegistry.java
View File

@@ -34,8 +34,7 @@ public abstract class FileTypeRegistry {
public abstract boolean isFileOfType(@NotNull VirtualFile file, @NotNull FileType type);
@Nullable
public LanguageFileType findFileTypeByLanguage(@NotNull Language language) {
public LanguageFileType findFileTypeByLanguage(Language language) {
return language.findMyFileType(getRegisteredFileTypes());
}

11
platform/core-api/src/com/intellij/openapi/startup/StartupActivity.java
View File

@@ -32,14 +32,9 @@ public interface StartupActivity {
ExtensionPointName<StartupActivity> POST_STARTUP_ACTIVITY = ExtensionPointName.create("com.intellij.postStartupActivity");
/**
* Executed some time after startup on a background thread with no visible progress indicator. Such activities may produce
* notifications but should not be used for any work that needs to be otherwise visible to users (including work that consumes
* CPU over a noticeable period of time).
*
* Such activities are run regardless of the current indexing mode and should not be used for any work that requires access
* to indices. The current project may get disposed while the activity is running, and the activity may not be interrupted
* immediately when this happens, so if you need to access other components, you're responsible for doing this in a
* thread-safe way (e.g. by taking a read action to collect all the state you need).
* Executed some time after startup on a background thread with no progress indicator. Such activities may produce notifications
* but should not be used for any work that needs to be otherwise visible to users. Such activities are run regardless
* of the current indexing mode and should not be used for any work that requires access to indices.
*/
ExtensionPointName<StartupActivity> BACKGROUND_POST_STARTUP_ACTIVITY = ExtensionPointName.create("com.intellij.backgroundPostStartupActivity");

41
platform/core-api/src/com/intellij/openapi/vfs/AsyncFileListener.java
View File

@@ -12,36 +12,9 @@ import java.util.List;
/**
* An alternative to {@link com.intellij.openapi.vfs.newvfs.BulkFileListener} that allows
* for moving parts of VFS event processing to background thread and thus reduce the duration
* of UI freezes. Asynchronous listeners should preferably be registered as "vfs.asyncListener" extensions.
* If that's too inconvenient, manual registration via {@link VirtualFileManager#addAsyncFileListener} is possible.<p></p>
* of UI freezes.
*
* <h3>Migration of synchronous listeners:</h3>
*
* Synchronous listeners have two flavours: "before" and "after"; observing the state of the system before and after a VFS change, respectively.
* Since asynchronous listeners are executed before applying VFS events, they're more easily suited to "before" event processing. Note that
* not all synchronous listeners need to be migrated, only those that might take noticeable time.<p></p>
*
* To migrate a "before"-handler, you need to split the listener into two parts: one that analyzes the events but has no side effects,
* and one which actually modifies some other subsystem's state based on these events. The first part then goes into {@link #prepareChange},
* and the second one into {@link ChangeApplier#beforeVfsChange()}. Please ensure that the ordering of events
* (if it's important) isn't lost during this splitting, and that your listener can handle several events about the same file.<p></p>
*
* The "after"-part is more complicated, as it might need to observe the state of the whole system (e.g. VFS, project model, PSI) after
* the file system is changed. So moving these computations into "before"-part might not be straightforward. It's still possible sometimes:
* e.g. if you only check for changed file names, or whether some file (non-directory) with a specific name is created under project's roots.
* In this case the check can go into {@link #prepareChange}, and the action based on it &mdash; into {@link ChangeApplier#afterVfsChange()}.
* <p></p>
*
* When you migrate a listener with both "before" and "after" parts, you can try to just move the whole "after"-processing into
* {@link ChangeApplier#afterVfsChange()}. But make it as fast as possible to shorten the UI freezes.<p></p>
*
* If possible, consider moving heavy processing into background threads and/or performing it lazily.
* There's no general solution, each "after" event processing should be evaluated separately considering the needs and contracts
* of each specific subsystem it serves. Note that it'll likely need a consistent model of the world, probably with the help of
* {@link com.intellij.openapi.application.ReadAction#nonBlocking} (and note that other changes might happen after yours, and
* the state of the system can change when your asynchronous handler starts). This might also
* introduce a discrepancy in the world when the VFS is already changed but other subsystems aren't, and this discrepancy
* should be made as explicit as possible.
* @see VirtualFileManager#addAsyncFileListener(AsyncFileListener, com.intellij.openapi.Disposable)
*/
public interface AsyncFileListener {
@@ -78,18 +51,8 @@ public interface AsyncFileListener {
ChangeApplier prepareChange(@NotNull List<? extends VFileEvent> events);
interface ChangeApplier {
/**
* This method is called in write action before the VFS events are delivered and applied, and allows
* to apply modifications based on the information calculated during {@link #prepareChange}.
* The implementations should be as fast as possible.
*/
default void beforeVfsChange() {}
/**
* This method is called in write action after the VFS events are delivered and applied, and allows
* to apply modifications based on the information calculated during {@link #prepareChange}.
* The implementations should be as fast as possible.
*/
default void afterVfsChange() {}
}
}

19
platform/core-api/src/com/intellij/psi/tree/TokenSet.java
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2019 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.
// 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.psi.tree;
import com.intellij.openapi.diagnostic.LogUtil;
@@ -12,7 +12,6 @@ import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import java.util.stream.Stream;
/**
@@ -26,7 +25,7 @@ public class TokenSet {
private final short myShift;
private final short myMax;
private final long[] myWords;
private final @Nullable IElementType.Predicate myOrCondition;
@Nullable private final IElementType.Predicate myOrCondition;
private volatile IElementType[] myTypes;
private TokenSet(short shift, short max, @Nullable IElementType.Predicate orCondition) {
@@ -193,7 +192,7 @@ public class TokenSet {
IElementType.Predicate conjunction =
orConditions.isEmpty() ? null :
orConditions.size() == 1 ? orConditions.get(0) :
t -> Objects.requireNonNull(a.myOrCondition).matches(t) && Objects.requireNonNull(b.myOrCondition).matches(t);
t -> a.myOrCondition.matches(t) && b.myOrCondition.matches(t);
TokenSet newSet = new TokenSet((short)Math.min(a.myShift, b.myShift), (short)Math.max(a.myMax, b.myMax), conjunction);
for (int i = 0; i < newSet.myWords.length; i++) {
final int ai = newSet.myShift - a.myShift + i;
@@ -226,7 +225,8 @@ public class TokenSet {
private final IElementType.Predicate[] myComponents;
OrPredicate(List<IElementType.Predicate> components) {
myComponents = components.stream()
myComponents = components
.stream()
.flatMap(p -> p instanceof OrPredicate ? Arrays.stream(((OrPredicate)p).myComponents) : Stream.of(p))
.distinct()
.toArray(IElementType.Predicate[]::new);
@@ -234,7 +234,12 @@ public class TokenSet {
@Override
public boolean matches(@NotNull IElementType t) {
return Arrays.stream(myComponents).anyMatch(component -> component.matches(t));
for (IElementType.Predicate component : myComponents) {
if (component.matches(t)) {
return true;
}
}
return false;
}
}
}
}

81
platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java
View File

@@ -43,12 +43,12 @@ import org.jdom.JDOMException;
import org.jetbrains.annotations.*;
import java.io.*;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
import java.lang.invoke.MethodType;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.net.MalformedURLException;
import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLClassLoader;
import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.concurrent.CopyOnWriteArrayList;
@@ -91,8 +91,6 @@ public class PluginManagerCore {
@SuppressWarnings("StaticNonFinalField")
public static volatile boolean isUnitTestMode = Boolean.getBoolean("idea.is.unit.test");
@SuppressWarnings("FieldAccessedSynchronizedAndUnsynchronized")
private static boolean ourUnitTestWithBundledPlugins = Boolean.getBoolean("idea.run.tests.with.bundled.plugins");
private static final String PLUGIN_IS_DISABLED_REASON = "Plugin is disabled";
@@ -466,12 +464,10 @@ public class PluginManagerCore {
return null;
}
// If a plugin does not include any module dependency tags in its plugin.xml, it's assumed to be a legacy plugin
// and is loaded only in IntelliJ IDEA, so it may use classes from Java plugin.
//if a plugin does not include any module dependency tags in its plugin.xml,it's assumed to be a legacy plugin and is loaded only in IntelliJ IDEA, so it may use classes from Java plugin
boolean isLegacyPlugin = !hasModuleDependencies(descriptor);
// Many custom plugins use classes from Java plugin and don't declare a dependency on the Java module (although they declare dependency
// on some other platform modules). This is definitely a misconfiguration but lets temporary add the Java plugin to their dependencies
// to avoid breaking compatibility.
//many custom plugins use classes from Java plugin and don't declare a dependency on the Java module (although they declare dependency on some other platform modules).
//this is definitely a misconfiguration but let's temprary add the Java plugin to their dependencies to avoid breaking compatibility
boolean isCustomPlugin = !descriptor.isBundled();
return isLegacyPlugin || isCustomPlugin ? ourModulesToContainingPlugins.get("com.intellij.modules.java") : null;
}
@@ -503,49 +499,54 @@ public class PluginManagerCore {
Extensions.registerAreaClass(ExtensionAreas.IDEA_MODULE, ExtensionAreas.IDEA_PROJECT);
}
@NotNull
private static Method getAddUrlMethod(@NotNull ClassLoader loader) {
Class<?> loaderClass = loader instanceof URLClassLoader ? URLClassLoader.class : loader.getClass();
while (loaderClass != null && !Object.class.equals(loaderClass)) {
final Method method = ReflectionUtil.getDeclaredMethod(loaderClass, "addURL", URL.class);
if (method != null) {
return method;
}
loaderClass = loaderClass.getSuperclass();
}
return null;
}
@Nullable
private static ClassLoader createPluginClassLoader(@NotNull File[] classPath,
@NotNull ClassLoader[] parentLoaders,
@NotNull IdeaPluginDescriptor descriptor) {
if (descriptor.getUseIdeaClassLoader()) {
ClassLoader loader = PluginManagerCore.class.getClassLoader();
@NotNull IdeaPluginDescriptor pluginDescriptor) {
if (pluginDescriptor.getUseIdeaClassLoader()) {
try {
// the method can't be invoked directly, because the core classloader is created at bootstrap in a "lost" branch
MethodHandle addURL = MethodHandles.lookup().findVirtual(loader.getClass(), "addURL", MethodType.methodType(void.class, URL.class));
ClassLoader loader = PluginManagerCore.class.getClassLoader();
Method addUrlMethod = getAddUrlMethod(loader);
for (File pathElement : classPath) {
try {
addURL.invoke(loader, classpathElementToUrl(pathElement));
}
catch (MalformedURLException e) {
throw new PluginException("Corrupted path element: `" + pathElement + '`', e, descriptor.getPluginId());
}
addUrlMethod.invoke(loader, pathElement.toPath().normalize().toUri().toURL());
}
return loader;
}
catch (Throwable t) {
//noinspection GraziInspection
throw new IllegalStateException("Unexpected core classloader: " + loader + " (" + loader.getClass() + ")", t);
catch (IOException | IllegalAccessException | InvocationTargetException e) {
getLogger().warn(e);
}
}
else if (isUnitTestMode && !ourUnitTestWithBundledPlugins) {
return null;
}
else {
PluginId pluginId = pluginDescriptor.getPluginId();
File pluginRoot = pluginDescriptor.getPath();
if (isUnitTestMode && !ourUnitTestWithBundledPlugins) return null;
try {
List<URL> urls = new ArrayList<>(classPath.length);
for (File pathElement : classPath) {
try {
urls.add(classpathElementToUrl(pathElement));
}
catch (MalformedURLException e) {
throw new PluginException("Corrupted path element: `" + pathElement + '`', e, descriptor.getPluginId());
}
urls.add(pathElement.toPath().normalize().toUri().toURL()); // it is critical not to have "." and ".." in classpath elements
}
return new PluginClassLoader(urls, parentLoaders, descriptor.getPluginId(), descriptor.getVersion(), descriptor.getPath());
return new PluginClassLoader(urls, parentLoaders, pluginId, pluginDescriptor.getVersion(), pluginRoot);
}
catch (IOException e) {
getLogger().warn(e);
}
}
private static URL classpathElementToUrl(File cpElement) throws MalformedURLException {
return cpElement.toPath().normalize().toUri().toURL(); // it is important not to have "." and ".." in classpath elements
return null;
}
public static void invalidatePlugins() {
@@ -1472,9 +1473,7 @@ public class PluginManagerCore {
List<String> errors = new ArrayList<>();
IdeaPluginDescriptorImpl[] pluginDescriptors = loadDescriptors(errors);
if (!isUnitTestMode) {
checkEssentialPluginsAreAvailable(pluginDescriptors);
}
checkEssentialPluginsAreAvailable(pluginDescriptors);
Class callerClass = ReflectionUtil.findCallerClass(1);
assert callerClass != null;

5
platform/core-impl/src/com/intellij/psi/impl/PsiDocumentManagerBase.java
View File

@@ -742,8 +742,7 @@ public abstract class PsiDocumentManagerBase extends PsiDocumentManager implemen
assert document instanceof DocumentImpl : document;
UncommittedInfo info = myUncommittedInfos.get(document);
if (info != null) {
//noinspection unchecked
return (List<DocumentEvent>)info.myEvents.clone();
return new ArrayList<>(info.myEvents);
}
return Collections.emptyList();
@@ -1059,7 +1058,7 @@ public abstract class PsiDocumentManagerBase extends PsiDocumentManager implemen
private static class UncommittedInfo {
private final FrozenDocument myFrozen;
private final ArrayList<DocumentEvent> myEvents = new ArrayList<>();
private final List<DocumentEvent> myEvents = new ArrayList<>();
private final ConcurrentMap<DocumentWindow, DocumentWindow> myFrozenWindows = ContainerUtil.newConcurrentMap();
private UncommittedInfo(@NotNull DocumentImpl original) {

6
platform/diff-impl/src/com/intellij/diff/util/DiffUtil.java
View File

@@ -51,7 +51,6 @@ import com.intellij.openapi.editor.highlighter.EditorHighlighter;
import com.intellij.openapi.editor.highlighter.EditorHighlighterFactory;
import com.intellij.openapi.editor.markup.TextAttributes;
import com.intellij.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.fileEditor.impl.text.TextEditorImpl;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.fileTypes.PlainTextFileType;
import com.intellij.openapi.fileTypes.SyntaxHighlighter;
@@ -191,11 +190,6 @@ public class DiffUtil {
editor.getSettings().setTabSize(indentOptions.TAB_SIZE);
editor.getSettings().setUseTabCharacter(indentOptions.USE_TAB_CHARACTER);
}
Language language = content != null ? content.getUserData(DiffUserDataKeys.LANGUAGE) : null;
if (language == null && editor.getProject() != null) language = TextEditorImpl.getDocumentLanguage(editor);
editor.getSettings().setLanguage(language);
editor.getSettings().setCaretRowShown(false);
editor.reinitSettings();
}

13
platform/editor-ui-ex/src/com/intellij/psi/impl/cache/impl/todo/TodoIndex.java vendored
View File

@@ -5,6 +5,7 @@ package com.intellij.psi.impl.cache.impl.todo;
import com.intellij.lang.LanguageParserDefinitions;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.fileTypes.FileTypeRegistry;
import com.intellij.openapi.fileTypes.LanguageFileType;
import com.intellij.openapi.fileTypes.impl.CustomSyntaxTableFileType;
import com.intellij.openapi.util.Comparing;
@@ -23,7 +24,9 @@ import java.beans.PropertyChangeListener;
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
import java.util.*;
import java.util.Arrays;
import java.util.Collections;
import java.util.Map;
/**
* @author Eugene Zhuravlev
@@ -103,12 +106,12 @@ public final class TodoIndex extends FileBasedIndexExtension<TodoIndexEntry, Int
@Override
public int getVersion() {
int version = 11;
Map<FileType, DataIndexer<TodoIndexEntry, Integer, FileContent>> extensions = TodoIndexers.INSTANCE.getAllRegisteredExtensions();
List<FileType> types = new ArrayList<>(extensions.keySet());
types.sort((o1, o2) -> Comparing.compare(o1.getName(), o2.getName()));
FileType[] types = FileTypeRegistry.getInstance().getRegisteredFileTypes();
Arrays.sort(types, (o1, o2) -> Comparing.compare(o1.getName(), o2.getName()));
for (FileType fileType : types) {
DataIndexer<TodoIndexEntry, Integer, FileContent> indexer = extensions.get(fileType);
DataIndexer<TodoIndexEntry, Integer, FileContent> indexer = TodoIndexers.INSTANCE.forFileType(fileType);
if (indexer == null) continue;
int versionFromIndexer = indexer instanceof VersionedTodoIndexer ? (((VersionedTodoIndexer)indexer).getVersion()) : 0xFF;
version = version * 31 + (versionFromIndexer ^ indexer.getClass().getName().hashCode());

23
platform/extensions/src/com/intellij/openapi/extensions/impl/ExtensionPointImpl.java
View File

@@ -294,13 +294,6 @@ public abstract class ExtensionPointImpl<T> implements ExtensionPoint<T>, Iterab
assertBeforeProcessing();
CHECK_CANCELED.run();
if (isInReadOnlyMode()) {
for (T extension : myExtensionsCache) {
consumer.accept(extension, myDescriptor /* doesn't matter for tests */);
}
return;
}
List<ExtensionComponentAdapter> adapters = myAdapters;
int size = adapters.size();
if (size == 0) {
@@ -383,7 +376,6 @@ public abstract class ExtensionPointImpl<T> implements ExtensionPoint<T>, Iterab
@NotNull
private synchronized T[] processAdapters() {
assertBeforeProcessing();
assertNotReadOnlyMode();
long startTime = StartUpMeasurer.getCurrentTime();
@@ -481,6 +473,7 @@ public abstract class ExtensionPointImpl<T> implements ExtensionPoint<T>, Iterab
throw new IllegalStateException("Recursive processAdapters() detected. You must have called 'getExtensions()' from within your extension constructor - don't. " +
"Either pass extension via constructor parameter or call getExtensions() later.");
}
assertNotReadOnlyMode();
}
// used in upsource
@@ -536,16 +529,14 @@ public abstract class ExtensionPointImpl<T> implements ExtensionPoint<T>, Iterab
myExtensionsCacheAsArray = list.toArray(ArrayUtil.newArray(getExtensionClass(), 0));
POINTS_IN_READONLY_MODE.add(this);
if (myListeners.length > 0) {
if (oldList != null) {
for (T extension : oldList) {
notifyListenersOnRemove(extension, null, myListeners);
}
}
for (T extension : list) {
notifyListenersOnAdd(extension, null, myListeners);
if (oldList != null) {
for (T extension : oldList) {
notifyListenersOnRemove(extension, null, myListeners);
}
}
for (T extension : list) {
notifyListenersOnAdd(extension, null, myListeners);
}
Disposer.register(parentDisposable, new Disposable() {
@Override

1
platform/external-system-api/intellij.platform.externalSystem.iml
View File

@@ -13,6 +13,7 @@
<orderEntry type="module" module-name="intellij.platform.projectModel" />
<orderEntry type="module" module-name="intellij.platform.ide" />
<orderEntry type="module" module-name="intellij.platform.lang" />
<orderEntry type="module" module-name="intellij.java.compiler" />
<orderEntry type="module" module-name="intellij.platform.externalSystem.rt" exported="" />
<orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
<orderEntry type="library" name="JDOM" level="project" />

18
java/compiler/openapi/src/com/intellij/openapi/externalSystem/project/ArtifactExternalDependenciesImporter.java → platform/external-system-api/src/com/intellij/openapi/externalSystem/service/project/ArtifactExternalDependenciesImporter.java
View File

@@ -1,5 +1,19 @@
// Copyright 2000-2019 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.openapi.externalSystem.project;
/*
* Copyright 2000-2015 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 com.intellij.openapi.externalSystem.service.project;
import com.intellij.packaging.artifacts.Artifact;
import com.intellij.packaging.artifacts.ModifiableArtifactModel;

17
platform/external-system-api/src/com/intellij/openapi/externalSystem/service/project/IdeModifiableModelsProvider.java
View File

@@ -28,6 +28,8 @@ import com.intellij.openapi.roots.ProjectModelExternalSource;
import com.intellij.openapi.roots.libraries.Library;
import com.intellij.openapi.roots.libraries.LibraryTable;
import com.intellij.openapi.util.UserDataHolder;
import com.intellij.packaging.artifacts.ModifiableArtifactModel;
import com.intellij.packaging.elements.PackagingElementResolvingContext;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
@@ -52,19 +54,14 @@ public interface IdeModifiableModelsProvider extends IdeModelsProvider, UserData
@NotNull
ModifiableFacetModel getModifiableFacetModel(Module module);
@Nullable
@ApiStatus.Experimental
<T extends ModifiableModel> T findModifiableModel(@NotNull Class<T> instanceOf);
@NotNull
@ApiStatus.Experimental
<T extends ModifiableModel> T getModifiableModel(@NotNull Class<T> instanceOf);
@NotNull
LibraryTable.ModifiableModel getModifiableProjectLibrariesModel();
Library.ModifiableModel getModifiableLibraryModel(Library library);
@NotNull
ModifiableArtifactModel getModifiableArtifactModel();
Library createLibrary(String name);
Library createLibrary(String name, @Nullable ProjectModelExternalSource externalSource);
@@ -73,6 +70,10 @@ public interface IdeModifiableModelsProvider extends IdeModelsProvider, UserData
ModalityState getModalityStateForQuestionDialogs();
ArtifactExternalDependenciesImporter getArtifactExternalDependenciesImporter();
PackagingElementResolvingContext getPackagingElementResolvingContext();
void commit();
void dispose();

12
platform/external-system-api/src/com/intellij/openapi/externalSystem/service/project/ModifiableModel.java
View File

@@ -1,12 +0,0 @@
// Copyright 2000-2019 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.openapi.externalSystem.service.project;
import org.jetbrains.annotations.ApiStatus;
@ApiStatus.Experimental
public
interface ModifiableModel {
void commit();
void dispose();
}

13
platform/external-system-api/src/com/intellij/openapi/externalSystem/service/project/ModifiableModelsProviderExtension.java
View File

@@ -1,13 +0,0 @@
// Copyright 2000-2019 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.openapi.externalSystem.service.project;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Pair;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
@ApiStatus.Experimental
public interface ModifiableModelsProviderExtension<T extends ModifiableModel> {
@NotNull
Pair<Class<T>, T> create(@NotNull Project project, @NotNull IdeModifiableModelsProvider modelsProvider);
}

17
platform/external-system-impl/intellij.platform.externalSystem.impl.iml
View File

@@ -4,22 +4,39 @@
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/testSrc" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/testResources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/compatibilityResources" type="java-resource" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="intellij.java.ui" />
<orderEntry type="module" module-name="intellij.platform.externalSystem" />
<orderEntry type="module" module-name="intellij.platform.projectModel.impl" />
<orderEntry type="module" module-name="intellij.java.compiler" />
<orderEntry type="module" module-name="intellij.platform.ide.impl" />
<orderEntry type="module" module-name="intellij.platform.lang.impl" />
<orderEntry type="module" module-name="intellij.java.debugger.impl" />
<orderEntry type="module" module-name="intellij.java.execution" />
<orderEntry type="module" module-name="intellij.platform.vcs" />
<orderEntry type="library" name="Groovy" level="project" />
<orderEntry type="module" module-name="intellij.platform.testRunner" />
<orderEntry type="module" module-name="intellij.platform.smRunner" exported="" />
<orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
<orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
<orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
<orderEntry type="module" module-name="intellij.java.compiler.impl" />
<orderEntry type="module" module-name="intellij.java.impl" />
<orderEntry type="module" module-name="intellij.java" />
<orderEntry type="module" module-name="intellij.platform.configurationStore.impl" />
<orderEntry type="module" module-name="intellij.platform.testExtensions" scope="TEST" />
<orderEntry type="module" module-name="intellij.java.execution.impl" />
<orderEntry type="module" module-name="intellij.java.compiler.tests" scope="TEST" />
<orderEntry type="library" name="kotlin-reflect" level="project" />
<orderEntry type="module" module-name="intellij.platform.objectSerializer" />
<orderEntry type="module" module-name="intellij.platform.objectSerializer.annotations" />
<orderEntry type="library" scope="TEST" name="assertJ" level="project" />
<orderEntry type="library" scope="TEST" name="mockito" level="project" />
</component>
</module>

26
platform/external-system-impl/intellij.platform.externalSystem.tests.iml
View File

@@ -1,26 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$/testResources">
<sourceFolder url="file://$MODULE_DIR$/testResources" type="java-test-resource" />
</content>
<content url="file://$MODULE_DIR$/testSrc">
<sourceFolder url="file://$MODULE_DIR$/testSrc" isTestSource="true" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="intellij.platform.externalSystem" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.externalSystem.impl" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.objectSerializer" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.testExtensions" scope="TEST" />
<orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.configurationStore.impl" scope="TEST" />
<orderEntry type="module" module-name="intellij.java.compiler.tests" scope="TEST" />
<orderEntry type="module" module-name="intellij.java.compiler.impl" scope="TEST" />
<orderEntry type="library" name="kotlin-reflect" level="project" />
<orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
<orderEntry type="library" scope="TEST" name="assertJ" level="project" />
<orderEntry type="library" scope="TEST" name="mockito" level="project" />
</component>
</module>

Some files were not shown because too many files have changed in this diff Show More