MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source 
GitOrigin-RevId: 011cce079338a4bbbb8e8a82cba281feb75619bd
This commit is contained in:
Vladimir Krivosheev
2024-12-31 12:04:06 +00:00
committed by intellij-monorepo-bot
parent 9a04df1b6e
commit b7b1d47c45
8 changed files with 84 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildRunner.java
+6 -3
View File
@@ -143,7 +143,8 @@ public final class BuildRunner {
@NotNull CanceledStatus cs,
@NotNull MessageHandler msgHandler,
@NotNull BuildType buildType,
@NotNull List<TargetTypeBuildScope> scopes, final boolean includeDependenciesToScope) throws Exception {
@NotNull List<TargetTypeBuildScope> scopes,
boolean includeDependenciesToScope) throws Exception {
for (int attempt = 0; attempt < 2 && !cs.isCanceled(); attempt++) {
final boolean forceClean = myForceCleanCaches && myFilePaths.isEmpty();
final CompileScope compileScope = createCompilationScope(pd, scopes, myFilePaths, forceClean, includeDependenciesToScope);
@@ -257,8 +258,10 @@ public final class BuildRunner {
return new CompileScopeImpl(targetTypes, targetTypesToForceBuild, targets, files);
}
private static void includeDependenciesToScope(Set<? extends BuildTargetType<?>> targetTypes, Set<BuildTarget<?>> targets,
Set<? super BuildTargetType<?>> targetTypesToForceBuild, ProjectDescriptor descriptor) {
private static void includeDependenciesToScope(Set<? extends BuildTargetType<?>> targetTypes,
Set<BuildTarget<?>> targets,
Set<? super BuildTargetType<?>> targetTypesToForceBuild,
ProjectDescriptor descriptor) {
//todo get rid of CompileContext parameter for BuildTargetIndex.getDependencies() and use it here
TargetOutputIndex dummyIndex = new TargetOutputIndex() {
@Override
jps/jps-builders/src/org/jetbrains/jps/javac/ExternalJavacManager.java
+3 -3
View File
@@ -90,7 +90,7 @@ public class ExternalJavacManager extends ProcessAdapter {
.channel(NioServerSocketChannel.class)
.childOption(ChannelOption.TCP_NODELAY, true)
.childOption(ChannelOption.SO_KEEPALIVE, true)
.childHandler(new ChannelInitializer() {
.childHandler(new ChannelInitializer<>() {
@Override
protected void initChannel(Channel channel) {
channel.pipeline().addLast(myChannelRegistrar,
@@ -285,10 +285,10 @@ public class ExternalJavacManager extends ProcessAdapter {
private boolean shutdownProcess(ExternalJavacProcessHandler process) {
UUID processId = process.getProcessId();
debug(()-> "shutdownProcess: shutting down " + processId);
debug(() -> "shutdownProcess: shutting down " + processId);
final Channel conn = myConnections.get(processId);
if (conn != null && process.lock()) {
debug(()-> "shutdownProcess: sending shutdown request to " + processId);
debug(() -> "shutdownProcess: sending shutdown request to " + processId);
conn.writeAndFlush(JavacProtoUtil.toMessage(processId, JavacProtoUtil.createShutdownRequest()));
return true;
}
jps/model-api/src/org/jetbrains/jps/model/java/JavaSourceRootProperties.java
+1 -1
View File
@@ -7,7 +7,7 @@ import org.jetbrains.jps.model.ex.JpsElementBase;
import java.util.Objects;
public class JavaSourceRootProperties extends JpsElementBase<JavaSourceRootProperties> {
public final class JavaSourceRootProperties extends JpsElementBase<JavaSourceRootProperties> {
private String myPackagePrefix;
private boolean myForGeneratedSources;
jps/model-impl/src/org/jetbrains/jps/model/ex/JpsElementContainerImpl.java
+3 -3
View File
@@ -10,7 +10,7 @@ import java.util.Map;
import java.util.function.Supplier;
@ApiStatus.Internal
public class JpsElementContainerImpl extends JpsElementContainerEx implements JpsElementContainer {
public final class JpsElementContainerImpl extends JpsElementContainerEx implements JpsElementContainer {
private final Object myDataLock = new Object();
private final Map<JpsElementChildRole<?>, JpsElement> myElements = CollectionFactory.createSmallMemoryFootprintMap(1);
private final @NotNull JpsCompositeElementBase<?> myParent;
@@ -98,12 +98,12 @@ public class JpsElementContainerImpl extends JpsElementContainerEx implements Jp
}
@Override
protected final Object getDataLock() {
protected Object getDataLock() {
return myDataLock;
}
@Override
protected final Map<JpsElementChildRole<?>, JpsElement> getElementsMap() {
protected Map<JpsElementChildRole<?>, JpsElement> getElementsMap() {
return myElements;
}
}
jps/model-serialization/src/org/jetbrains/jps/model/serialization/JpsProjectLoader.java
+62 -54
View File
@@ -1,4 +1,4 @@
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.jps.model.serialization;
import com.intellij.openapi.diagnostic.Logger;
@@ -6,7 +6,6 @@ import com.intellij.openapi.util.JDOMUtil;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.io.FileUtilRt;
import com.intellij.util.concurrency.AppExecutorUtil;
import com.intellij.util.containers.CollectionFactory;
import org.jdom.Element;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
@@ -60,12 +59,12 @@ public final class JpsProjectLoader {
}
};
private final JpsProject myProject;
private final JpsProject project;
private final Map<String, String> myPathVariables;
private final JpsPathMapper myPathMapper;
private final boolean myLoadUnloadedModules;
private final JpsComponentLoader myComponentLoader;
private final @Nullable Path myExternalConfigurationDirectory;
private final @Nullable Path externalConfigurationDirectory;
private JpsProjectLoader(JpsProject project,
Map<String, String> pathVariables,
@@ -74,12 +73,12 @@ public final class JpsProjectLoader {
@Nullable Path externalConfigurationDirectory,
boolean loadUnloadedModules) {
JpsMacroExpander macroExpander = JpsProjectConfigurationLoading.createProjectMacroExpander(pathVariables, baseDir);
myExternalConfigurationDirectory = externalConfigurationDirectory;
myComponentLoader = new JpsComponentLoader(macroExpander, myExternalConfigurationDirectory);
myProject = project;
this.externalConfigurationDirectory = externalConfigurationDirectory;
myComponentLoader = new JpsComponentLoader(macroExpander, this.externalConfigurationDirectory);
this.project = project;
myPathVariables = pathVariables;
myPathMapper = pathMapper;
JpsProjectConfigurationLoading.setupSerializationExtension(myProject, baseDir);
JpsProjectConfigurationLoading.setupSerializationExtension(this.project, baseDir);
myLoadUnloadedModules = loadUnloadedModules;
}
@@ -140,30 +139,27 @@ public final class JpsProjectLoader {
}
private void loadFromDirectory(@NotNull Path dir, @NotNull Executor executor) {
myProject.setName(JpsProjectConfigurationLoading.getDirectoryBaseProjectName(dir.getParent(), dir));
project.setName(JpsProjectConfigurationLoading.getDirectoryBaseProjectName(dir.getParent(), dir));
Path defaultConfigFile = dir.resolve("misc.xml");
JpsSdkType<?> projectSdkType = loadProjectRoot(myComponentLoader.loadRootElement(defaultConfigFile));
for (JpsModelSerializerExtension extension : JpsModelSerializerExtension.getExtensions()) {
for (JpsProjectExtensionSerializer serializer : extension.getProjectExtensionSerializers()) {
myComponentLoader.loadComponents(dir, defaultConfigFile, serializer, myProject);
myComponentLoader.loadComponents(dir, defaultConfigFile, serializer, project);
}
}
Path externalConfigDir;
if (myExternalConfigurationDirectory != null) {
externalConfigDir = myExternalConfigurationDirectory.resolve("project");
LOG.info("External project config dir is used: " + externalConfigDir);
if (externalConfigurationDirectory == null) {
externalConfigDir = null;
}
else {
externalConfigDir = null;
externalConfigDir = externalConfigurationDirectory.resolve("project");
LOG.info("External project config dir is used: " + externalConfigDir);
}
Element moduleData = myComponentLoader.loadComponent(dir.resolve("modules.xml"), MODULE_MANAGER_COMPONENT);
Element externalModuleData;
if (externalConfigDir == null) {
externalModuleData = null;
}
else {
if (externalConfigDir != null) {
Element externalModuleData;
Element rootElement = myComponentLoader.loadRootElement(externalConfigDir.resolve("modules.xml"));
if (rootElement == null) {
externalModuleData = null;
@@ -178,16 +174,17 @@ public final class JpsProjectLoader {
externalModuleData = rootElement;
}
}
}
if (externalModuleData != null) {
String componentName = externalModuleData.getAttributeValue("name");
LOG.assertTrue(componentName != null && componentName.startsWith("External"));
externalModuleData.setAttribute("name", componentName.substring("External".length()));
if (moduleData == null) {
moduleData = externalModuleData;
}
else {
JDOMUtil.deepMerge(moduleData, externalModuleData);
if (externalModuleData != null) {
String componentName = externalModuleData.getAttributeValue("name");
LOG.assertTrue(componentName != null && componentName.startsWith("External"));
externalModuleData.setAttribute("name", componentName.substring("External".length()));
if (moduleData == null) {
moduleData = externalModuleData;
}
else {
JDOMUtil.deepMerge(moduleData, externalModuleData);
}
}
}
@@ -204,38 +201,38 @@ public final class JpsProjectLoader {
}
timingLog.run();
JpsProjectConfigurationLoading.loadArtifactsFromDirectory(myProject, myComponentLoader, dir, externalConfigDir);
JpsProjectConfigurationLoading.loadRunConfigurationsFromDirectory(myProject, myComponentLoader, dir, workspaceFile);
JpsProjectConfigurationLoading.loadArtifactsFromDirectory(project, myComponentLoader, dir, externalConfigDir);
JpsProjectConfigurationLoading.loadRunConfigurationsFromDirectory(project, myComponentLoader, dir, workspaceFile);
}
private void loadFromIpr(@NotNull Path iprFile, @NotNull Executor executor) {
final Element iprRoot = myComponentLoader.loadRootElement(iprFile);
String projectName = FileUtilRt.getNameWithoutExtension(iprFile.getFileName().toString());
myProject.setName(projectName);
project.setName(projectName);
Path iwsFile = iprFile.getParent().resolve(projectName + ".iws");
Element iwsRoot = myComponentLoader.loadRootElement(iwsFile);
JpsSdkType<?> projectSdkType = loadProjectRoot(iprRoot);
JpsProjectConfigurationLoading.loadProjectExtensionsFromIpr(myProject, iprRoot, iwsRoot);
JpsProjectConfigurationLoading.loadProjectExtensionsFromIpr(project, iprRoot, iwsRoot);
loadModules(JDomSerializationUtil.findComponent(iprRoot, "ProjectModuleManager"), projectSdkType, iwsFile, executor);
loadProjectLibraries(JDomSerializationUtil.findComponent(iprRoot, "libraryTable"));
JpsProjectConfigurationLoading.loadArtifactsFromIpr(myProject, iprRoot);
JpsProjectConfigurationLoading.loadRunConfigurationsFromIpr(myProject, iprRoot, iwsRoot);
JpsProjectConfigurationLoading.loadArtifactsFromIpr(project, iprRoot);
JpsProjectConfigurationLoading.loadRunConfigurationsFromIpr(project, iprRoot, iwsRoot);
}
private @Nullable JpsSdkType<?> loadProjectRoot(@Nullable Element root) {
Pair<String, String> sdkTypeIdAndName = JpsProjectConfigurationLoading.readProjectSdkTypeAndName(root);
if (sdkTypeIdAndName != null) {
JpsSdkType<?> sdkType = JpsSdkTableSerializer.getSdkType(sdkTypeIdAndName.first);
JpsSdkTableSerializer.setSdkReference(myProject.getSdkReferencesTable(), sdkTypeIdAndName.second, sdkType);
JpsSdkTableSerializer.setSdkReference(project.getSdkReferencesTable(), sdkTypeIdAndName.second, sdkType);
return sdkType;
}
return null;
}
private void loadProjectLibraries(@Nullable Element libraryTableElement) {
JpsLibraryTableSerializer.loadLibraries(libraryTableElement, myPathMapper, myProject.getLibraryCollection());
JpsLibraryTableSerializer.loadLibraries(libraryTableElement, myPathMapper, project.getLibraryCollection());
}
private void loadModules(@Nullable Element componentElement,
@@ -247,10 +244,11 @@ public final class JpsProjectLoader {
return;
}
Set<String> unloadedModules = !myLoadUnloadedModules ? JpsProjectConfigurationLoading.readNamesOfUnloadedModules(workspaceFile, myComponentLoader)
: Collections.emptySet();
Set<String> unloadedModules = myLoadUnloadedModules
? Set.of()
: JpsProjectConfigurationLoading.readNamesOfUnloadedModules(workspaceFile, myComponentLoader);
final Set<Path> foundFiles = CollectionFactory.createSmallMemoryFootprintSet();
final Set<Path> foundFiles = new HashSet<>();
final List<Path> moduleFiles = new ArrayList<>();
for (Element moduleElement : JDOMUtil.getChildren(componentElement.getChild(MODULES_TAG), MODULE_TAG)) {
final String path = moduleElement.getAttributeValue(FILE_PATH_ATTRIBUTE);
@@ -264,7 +262,7 @@ public final class JpsProjectLoader {
List<JpsModule> modules = loadModules(moduleFiles, projectSdkType, myPathVariables, myPathMapper, executor);
for (JpsModule module : modules) {
myProject.addModule(module);
project.addModule(module);
}
timingLog.run();
}
@@ -281,12 +279,12 @@ public final class JpsProjectLoader {
List<JpsModule> modules = new ArrayList<>();
List<CompletableFuture<Pair<Path, Element>>> futureModuleFilesContents = new ArrayList<>();
Path externalModuleDir;
if (myExternalConfigurationDirectory != null) {
externalModuleDir = myExternalConfigurationDirectory.resolve("modules");
LOG.info("External project config dir is used for modules: " + externalModuleDir);
if (externalConfigurationDirectory == null) {
externalModuleDir = null;
}
else {
externalModuleDir = null;
externalModuleDir = externalConfigurationDirectory.resolve("modules");
LOG.info("External project config dir is used for modules: " + externalModuleDir);
}
for (Path file : moduleFiles) {
@@ -304,9 +302,9 @@ public final class JpsProjectLoader {
else {
JDOMUtil.deepMergeWithAttributes(data, externalData,
List.of(
new JDOMUtil.MergeAttribute("content", "url"),
new JDOMUtil.MergeAttribute("component", "name")
));
new JDOMUtil.MergeAttribute("content", "url"),
new JDOMUtil.MergeAttribute("component", "name")
));
}
}
}
@@ -315,15 +313,21 @@ public final class JpsProjectLoader {
LOG.info("Module '" + getModuleName(file) + "' is skipped: " + file.toAbsolutePath() + " doesn't exist");
}
else {
// Copy the content roots that are defined in a separate tag, to a general content root component
// copy the content roots that are defined in a separate tag, to a general content root component
List<Element> components = data.getChildren("component");
Element rootManager = null;
Element additionalElements = null;
for (Element component : components) {
String attributeValue = component.getAttributeValue("name");
if (attributeValue.equals("NewModuleRootManager")) rootManager = component;
if (attributeValue.equals("AdditionalModuleElements")) additionalElements = component;
if (rootManager != null && additionalElements != null) break;
if (attributeValue.equals("NewModuleRootManager")) {
rootManager = component;
}
if (attributeValue.equals("AdditionalModuleElements")) {
additionalElements = component;
}
if (rootManager != null && additionalElements != null) {
break;
}
}
if (rootManager != null && additionalElements != null) {
// Cleanup attributes that aren't needed
@@ -374,8 +378,12 @@ public final class JpsProjectLoader {
}
}
private static @NotNull JpsModule loadModule(@NotNull Path file, @NotNull Element moduleRoot, List<String> paths,
@Nullable JpsSdkType<?> projectSdkType, Map<String, String> pathVariables, @NotNull JpsPathMapper pathMapper) {
private static @NotNull JpsModule loadModule(@NotNull Path file,
@NotNull Element moduleRoot,
List<String> paths,
@Nullable JpsSdkType<?> projectSdkType,
Map<String, String> pathVariables,
@NotNull JpsPathMapper pathMapper) {
String name = getModuleName(file);
final String typeId = moduleRoot.getAttributeValue("type");
final JpsModulePropertiesSerializer<?> serializer = getModulePropertiesSerializer(typeId);
jps/model-serialization/src/org/jetbrains/jps/model/serialization/impl/JpsSerializationManagerImpl.java
+7 -5
View File
@@ -16,20 +16,22 @@ import java.util.Map;
public final class JpsSerializationManagerImpl extends JpsSerializationManager {
@Override
public @NotNull JpsModel loadModel(@NotNull String projectPath, @Nullable String optionsPathString, boolean loadUnloadedModules) throws IOException {
Path optionsPath = optionsPathString != null ? Paths.get(optionsPathString).normalize() : null;
Path optionsPath = optionsPathString == null ? null : Path.of(optionsPathString).normalize();
Path externalConfigurationDirectory = JpsProjectConfigurationLoading.getExternalConfigurationDirectoryFromSystemProperty();
return loadModel(Paths.get(projectPath), externalConfigurationDirectory, optionsPath, loadUnloadedModules);
return loadModel(Path.of(projectPath), externalConfigurationDirectory, optionsPath, loadUnloadedModules);
}
@Override
public @NotNull JpsModel loadModel(@NotNull Path projectPath, @Nullable Path externalConfigurationDirectory, @Nullable Path optionsPath,
public @NotNull JpsModel loadModel(@NotNull Path projectPath,
@Nullable Path externalConfigurationDirectory,
@Nullable Path optionsPath,
boolean loadUnloadedModules) throws IOException {
JpsSerializationViaWorkspaceModel serializationViaWorkspaceModel = JpsSerializationViaWorkspaceModel.getInstance();
if (serializationViaWorkspaceModel != null) {
String projectCachePath = System.getProperty("jps.workspace.storage.project.cache.path");
Path workspaceStorageCachePath = projectCachePath != null ? Paths.get(projectCachePath) : null;
Path workspaceStorageCachePath = projectCachePath == null ? null : Path.of(projectCachePath);
String globalCachePath = System.getProperty("jps.workspace.storage.global.cache.path");
Path globalWorkspaceStoragePath = globalCachePath != null ? Paths.get(globalCachePath) : null;
Path globalWorkspaceStoragePath = globalCachePath == null ? null : Path.of(globalCachePath);
return serializationViaWorkspaceModel.loadModel(projectPath, workspaceStorageCachePath, externalConfigurationDirectory, optionsPath,
globalWorkspaceStoragePath, loadUnloadedModules);
}
jps/model-serialization/src/org/jetbrains/jps/model/serialization/java/JpsJavaModelSerializerExtension.java
+1 -1
View File
@@ -259,7 +259,7 @@ public final class JpsJavaModelSerializerExtension extends JpsModelSerializerExt
@Override
public JavaSourceRootProperties loadProperties(@NotNull Element sourceRootTag) {
String packagePrefix = StringUtil.notNullize(sourceRootTag.getAttributeValue(JpsModuleRootModelSerializer.PACKAGE_PREFIX_ATTRIBUTE));
String packagePrefix = sourceRootTag.getAttributeValue(JpsModuleRootModelSerializer.PACKAGE_PREFIX_ATTRIBUTE, "");
boolean isGenerated = Boolean.parseBoolean(sourceRootTag.getAttributeValue(IS_GENERATED_ATTRIBUTE));
return getService().createSourceRootProperties(packagePrefix, isGenerated);
}
plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseModuleManagerImpl.java
+1 -2
View File
@@ -1,5 +1,4 @@
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.idea.eclipse.config;
import com.intellij.openapi.components.*;
@@ -20,7 +19,7 @@ import java.util.Map;
import java.util.Set;
@State(name = "EclipseModuleManager")
public class EclipseModuleManagerImpl implements EclipseModuleManager, PersistentStateComponent<Element>, StateStorageChooserEx {
public final class EclipseModuleManagerImpl implements EclipseModuleManager, PersistentStateComponent<Element>, StateStorageChooserEx {
static final @NonNls String VALUE_ATTR = "value";
static final @NonNls String VARELEMENT = "varelement";
static final @NonNls String VAR_ATTRIBUTE = "var";