MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-15 02:59:33 +07:00
Code Issues Packages Projects Releases Wiki Activity

[java-compiler] IDEA-354499 After building the project, find usages is broken for Record

Browse Source 
- update jps

GitOrigin-RevId: 1db8fcf4e15b4e8053afdbb1db2bbc7b36eb73fe
This commit is contained in:
Mikhail Pyltsin
2024-08-15 10:47:47 +02:00
committed by intellij-monorepo-bot
parent 1e1fb5c78d
commit 1480e7881b
4 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.idea/libraries/jps_javac_extension.xml generated
View File

@@ -1,14 +1,14 @@
<component name="libraryTable">
<library name="jps-javac-extension" type="repository">
<properties maven-id="org.jetbrains.jps:jps-javac-extension:9">
<properties maven-id="org.jetbrains.jps:jps-javac-extension:10">
<verification>
<artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/jps/jps-javac-extension/9/jps-javac-extension-9.jar">
<sha256sum>221fe6fbee5d47c00104716f94401b0b4119d1c5b558e09f64ad874d35cf3870</sha256sum>
<artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/jps/jps-javac-extension/10/jps-javac-extension-10.jar">
<sha256sum>86b9d2a2378cff951f3bd0750d56ff4cef64f78dbb33e9f7abd9c7e6e14d99de</sha256sum>
</artifact>
</verification>
</properties>
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/jps/jps-javac-extension/9/jps-javac-extension-9.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/jps/jps-javac-extension/10/jps-javac-extension-10.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />

12
java/compiler/impl/src/com/intellij/compiler/backwardRefs/CompilerReferenceServiceBase.java
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 com.intellij.compiler.backwardRefs;
import com.intellij.compiler.CompilerDirectHierarchyInfo;
@@ -24,7 +24,6 @@ import com.intellij.openapi.project.ProjectUtil;
import com.intellij.openapi.roots.ProjectFileIndex;
import com.intellij.openapi.roots.ProjectRootManager;
import com.intellij.openapi.util.ModificationTracker;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.util.ThrowableComputable;
import com.intellij.openapi.util.io.FileAttributes;
@@ -33,7 +32,6 @@ import com.intellij.openapi.util.registry.Registry;
import com.intellij.openapi.util.registry.RegistryManager;
import com.intellij.openapi.vfs.VfsUtilCore;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiNamedElement;
@@ -361,13 +359,7 @@ public abstract class CompilerReferenceServiceBase<Reader extends CompilerRefere
private boolean isServiceEnabledFor(PsiElement element) {
if (!isActive() || isInsideLibraryScope()) return false;
Pair<PsiFile, Boolean> result = ReadAction.compute(
() -> new Pair<>(element.getContainingFile(),
element instanceof PsiClass psiClass && psiClass.isRecord()));
if (result.second) {
return false; //a workaround until jps-javac-extension will not be fixed
}
PsiFile file = result.getFirst();
PsiFile file = ReadAction.compute(() -> element.getContainingFile());
return file != null && !InjectedLanguageManager.getInstance(project).isInjectedFragment(file);
}

2
java/plugin/plugin-content.yaml
View File

@@ -105,7 +105,7 @@
projectLibraries:
- name: jps-javac-extension
files:
- name: $MAVEN_REPOSITORY$/org/jetbrains/jps/jps-javac-extension/9/jps-javac-extension-9.jar
- name: $MAVEN_REPOSITORY$/org/jetbrains/jps/jps-javac-extension/10/jps-javac-extension-10.jar
reason: withProjectLibrary
- name: lib/jps-launcher.jar
modules:

4
jps/jps-builders/src/org/jetbrains/jps/backwardRefs/index/JavaCompilerIndices.java
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.backwardRefs.index;
import com.intellij.openapi.util.io.DataInputOutputUtilRt;
@@ -23,7 +23,7 @@ import java.util.List;
public final class JavaCompilerIndices {
//TODO manage version separately
public static final int VERSION = 7;
public static final int VERSION = 8;
public static final IndexId<CompilerRef, Integer> BACK_USAGES = IndexId.create("back.refs");
public static final IndexId<CompilerRef, Collection<CompilerRef>> BACK_HIERARCHY = IndexId.create("back.hierarchy");