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

fix signature types in lang-api to correct wildcards

Browse Source 
GitOrigin-RevId: 4988c60904e4cf83e758500dd980195d1cdbe992
This commit is contained in:
Alexey Kudravtsev
2021-08-19 16:09:42 +00:00
committed by intellij-monorepo-bot
parent 5183e72ce3
commit 9421c7cd2f
16 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/idea-ui/testSrc/com/intellij/facet/mock/MockFacetDetector.java
+5 -5
View File
@@ -43,14 +43,14 @@ public final class MockFacetDetector extends FacetBasedFrameworkDetector<MockFac
@NotNull
@Override
public List<Pair<MockFacetConfiguration, Collection<VirtualFile>>> createConfigurations(@NotNull Collection<VirtualFile> files,
@NotNull Collection<MockFacetConfiguration> existentFacetConfigurations) {
public List<Pair<MockFacetConfiguration, Collection<VirtualFile>>> createConfigurations(@NotNull Collection<? extends VirtualFile> files,
@NotNull Collection<? extends MockFacetConfiguration> existentFacetConfigurations) {
return doDetect(files, existentFacetConfigurations);
}
public static List<Pair<MockFacetConfiguration, Collection<VirtualFile>>> doDetect(Collection<VirtualFile> files,
Collection<MockFacetConfiguration> existentFacetConfigurations) {
public static List<Pair<MockFacetConfiguration, Collection<VirtualFile>>> doDetect(Collection<? extends VirtualFile> files,
Collection<? extends MockFacetConfiguration> existentFacetConfigurations) {
final List<Pair<MockFacetConfiguration, Collection<VirtualFile>>> result = new ArrayList<>();
MultiMap<String, VirtualFile> filesByName = new MultiMap<>();
for (VirtualFile file : files) {
@@ -79,7 +79,7 @@ public final class MockFacetDetector extends FacetBasedFrameworkDetector<MockFac
@Nullable
private static MockFacetConfiguration detectConfiguration(final String fileName,
final Collection<MockFacetConfiguration> existentFacetConfigurations) {
final Collection<? extends MockFacetConfiguration> existentFacetConfigurations) {
for (MockFacetConfiguration configuration : existentFacetConfigurations) {
if (fileName.equals(configuration.getData())) {
return null;
java/idea-ui/testSrc/com/intellij/facet/mock/MockSubFacetDetector.java
+3 -3
View File
@@ -35,8 +35,8 @@ public final class MockSubFacetDetector extends FacetBasedFrameworkDetector<Face
@NotNull
@Override
public List<Pair<MockFacetConfiguration, Collection<VirtualFile>>> createConfigurations(@NotNull Collection<VirtualFile> files,
@NotNull Collection<MockFacetConfiguration> existentFacetConfigurations) {
public List<Pair<MockFacetConfiguration, Collection<VirtualFile>>> createConfigurations(@NotNull Collection<? extends VirtualFile> files,
@NotNull Collection<? extends MockFacetConfiguration> existentFacetConfigurations) {
return MockFacetDetector.doDetect(files, existentFacetConfigurations);
}
@@ -49,7 +49,7 @@ public final class MockSubFacetDetector extends FacetBasedFrameworkDetector<Face
@Override
public boolean isSuitableUnderlyingFacetConfiguration(FacetConfiguration underlying,
MockFacetConfiguration configuration,
Set<VirtualFile> files) {
Set<? extends VirtualFile> files) {
return underlying instanceof MockFacetConfiguration && ("sub-" + ((MockFacetConfiguration)underlying).getData()).equals(configuration.getData());
}
java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureUsageProcessor.java
+1 -1
View File
@@ -700,7 +700,7 @@ public class JavaChangeSignatureUsageProcessor implements ChangeSignatureUsagePr
}
@Override
public void registerConflictResolvers(List<ResolveSnapshotProvider.ResolveSnapshot> snapshots,
public void registerConflictResolvers(List<? super ResolveSnapshotProvider.ResolveSnapshot> snapshots,
@NotNull ResolveSnapshotProvider resolveSnapshotProvider,
UsageInfo[] usages, ChangeInfo changeInfo) {
snapshots.add(resolveSnapshotProvider.createSnapshot(changeInfo.getMethod()));
platform/indexing-api/src/com/intellij/util/indexing/FileBasedIndex.java
+1 -1
View File
@@ -275,7 +275,7 @@ public abstract class FileBasedIndex {
* which optimized to perform several queries for different indexes.
*/
@ApiStatus.Experimental
public boolean processFilesContainingAllKeys(@NotNull Collection<AllKeysQuery<?, ?>> queries,
public boolean processFilesContainingAllKeys(@NotNull Collection<? extends AllKeysQuery<?, ?>> queries,
@NotNull GlobalSearchScope filter,
@NotNull Processor<? super VirtualFile> processor) {
throw new UnsupportedOperationException();
platform/lang-api/src/com/intellij/facet/ui/FacetBasedFrameworkSupportProvider.java
+2 -3
View File
@@ -136,10 +136,9 @@ public abstract class FacetBasedFrameworkSupportProvider<F extends Facet> extend
/**
* Override to e.g. add libraries to artifacts.
*
* @param module Module.
* @param module Module.
* @param addedLibraries Framework libraries.
*/
public void processAddedLibraries(final Module module, final List<Library> addedLibraries) {
public void processAddedLibraries(final Module module, final List<? extends Library> addedLibraries) {
}
}
platform/lang-api/src/com/intellij/framework/detection/FacetBasedFrameworkDetector.java
+6 -6
View File
@@ -56,11 +56,11 @@ public abstract class FacetBasedFrameworkDetector<F extends Facet, C extends Fac
* @return configurations with corresponding files
*/
@NotNull
public List<Pair<C,Collection<VirtualFile>>> createConfigurations(@NotNull Collection<VirtualFile> files,
@NotNull Collection<C> existentFacetConfigurations) {
public List<Pair<C,Collection<VirtualFile>>> createConfigurations(@NotNull Collection<? extends VirtualFile> files,
@NotNull Collection<? extends C> existentFacetConfigurations) {
final C configuration = createConfiguration(files);
if (configuration != null) {
return Collections.singletonList(Pair.create(configuration, files));
return Collections.singletonList(Pair.create(configuration, (Collection<VirtualFile>)files));
}
return Collections.emptyList();
}
@@ -71,7 +71,7 @@ public abstract class FacetBasedFrameworkDetector<F extends Facet, C extends Fac
* @return configuration for detected facet
*/
@Nullable
protected C createConfiguration(Collection<VirtualFile> files) {
protected C createConfiguration(Collection<? extends VirtualFile> files) {
return getFacetType().createDefaultConfiguration();
}
@@ -79,7 +79,7 @@ public abstract class FacetBasedFrameworkDetector<F extends Facet, C extends Fac
}
@Override
public List<? extends DetectedFrameworkDescription> detect(@NotNull Collection<VirtualFile> newFiles,
public List<? extends DetectedFrameworkDescription> detect(@NotNull Collection<? extends VirtualFile> newFiles,
@NotNull FrameworkDetectionContext context) {
return context.createDetectedFacetDescriptions(this, newFiles);
}
@@ -102,7 +102,7 @@ public abstract class FacetBasedFrameworkDetector<F extends Facet, C extends Fac
return underlyingTypeId != null ? createFrameworkType(FacetTypeRegistry.getInstance().findFacetType(underlyingTypeId)) : null;
}
public boolean isSuitableUnderlyingFacetConfiguration(FacetConfiguration underlying, C configuration, Set<VirtualFile> files) {
public boolean isSuitableUnderlyingFacetConfiguration(FacetConfiguration underlying, C configuration, Set<? extends VirtualFile> files) {
return true;
}
platform/lang-api/src/com/intellij/framework/detection/FrameworkDetector.java
+1 -1
View File
@@ -67,7 +67,7 @@ public abstract class FrameworkDetector {
* @param context provides
* @return list of detected framework descriptions (it may be empty)
*/
public abstract List<? extends DetectedFrameworkDescription> detect(@NotNull Collection<VirtualFile> newFiles,
public abstract List<? extends DetectedFrameworkDescription> detect(@NotNull Collection<? extends VirtualFile> newFiles,
@NotNull FrameworkDetectionContext context);
/**
platform/lang-api/src/com/intellij/refactoring/changeSignature/ChangeSignatureUsageProcessor.java
+2 -2
View File
@@ -45,8 +45,8 @@ public interface ChangeSignatureUsageProcessor {
boolean setupDefaultValues(ChangeInfo changeInfo, Ref<UsageInfo[]> refUsages, Project project);
void registerConflictResolvers(List<ResolveSnapshotProvider.ResolveSnapshot> snapshots,
void registerConflictResolvers(List<? super ResolveSnapshotProvider.ResolveSnapshot> snapshots,
@NotNull ResolveSnapshotProvider resolveSnapshotProvider,
UsageInfo[] usages,
UsageInfo[] usages,
ChangeInfo changeInfo);
}
platform/lang-api/src/com/intellij/refactoring/listeners/RefactoringEventData.java
+3 -3
View File
@@ -30,7 +30,7 @@ public class RefactoringEventData extends UserDataHolderBase {
public static final Key<PsiElement> PSI_ELEMENT_KEY = Key.create("element");
public static final Key<String[]> STRING_PROPERTIES = Key.create("stringProperties");
public static final Key<PsiElement[]> PSI_ELEMENT_ARRAY_KEY = Key.create("elementArray");
public static final Key<Collection<UsageInfo>> USAGE_INFOS_KEY = Key.create("usageInfos");
public static final Key<Collection<? extends UsageInfo>> USAGE_INFOS_KEY = Key.create("usageInfos");
public void addElement(PsiElement element) {
putUserData(PSI_ELEMENT_KEY, element);
@@ -44,7 +44,7 @@ public class RefactoringEventData extends UserDataHolderBase {
addElements(elements);
}
public void addElements(Collection<PsiElement> elements) {
public void addElements(Collection<? extends PsiElement> elements) {
putUserData(PSI_ELEMENT_ARRAY_KEY, elements.toArray(PsiElement.EMPTY_ARRAY));
}
@@ -52,7 +52,7 @@ public class RefactoringEventData extends UserDataHolderBase {
putUserData(PSI_ELEMENT_ARRAY_KEY, elements);
}
public void addUsages(Collection<UsageInfo> usageInfos) {
public void addUsages(Collection<? extends UsageInfo> usageInfos) {
putUserData(USAGE_INFOS_KEY, usageInfos);
}
platform/lang-impl/src/com/intellij/util/indexing/EntityIndexingService.java
+1 -1
View File
@@ -18,5 +18,5 @@ public interface EntityIndexingService {
return ApplicationManager.getApplication().getService(EntityIndexingService.class);
}
void indexChanges(@NotNull Project project, @NotNull List<RootsChangeIndexingInfo> changes);
void indexChanges(@NotNull Project project, @NotNull List<? extends RootsChangeIndexingInfo> changes);
}
platform/lang-impl/src/com/intellij/util/indexing/EntityIndexingServiceImpl.java
+2 -2
View File
@@ -27,7 +27,7 @@ class EntityIndexingServiceImpl implements EntityIndexingService {
private static final Logger LOG = Logger.getInstance(EntityIndexingServiceImpl.class);
@Override
public void indexChanges(@NotNull Project project, @NotNull List<RootsChangeIndexingInfo> changes) {
public void indexChanges(@NotNull Project project, @NotNull List<? extends RootsChangeIndexingInfo> changes) {
if (!(FileBasedIndex.getInstance() instanceof FileBasedIndexImpl)) return;
if (Registry.is("indexing.full.rescan.on.workspace.model.changes")) {
DumbService.getInstance(project).queueTask(new UnindexedFilesUpdater(project, "Reindex due to registry setting"));
@@ -130,7 +130,7 @@ class EntityIndexingServiceImpl implements EntityIndexingService {
return iterators;
}
private static @NotNull List<IndexableFilesIterator> mergeIterators(List<IndexableFilesIterator> iterators) {
private static @NotNull List<IndexableFilesIterator> mergeIterators(List<? extends IndexableFilesIterator> iterators) {
List<IndexableFilesIterator> result = new ArrayList<>(iterators.size());
Collection<ModuleIndexableFilesIteratorImpl> rootIterators = new ArrayList<>();
Set<IndexableSetOrigin> origins = new HashSet<>();
platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexEx.java
+2 -2
View File
@@ -362,7 +362,7 @@ public abstract class FileBasedIndexEx extends FileBasedIndex {
return set != null && processVirtualFiles(set, filter, processor);
}
private boolean processFilesContainingAllKeysInPhysicalFiles(@NotNull Collection<AllKeysQuery<?, ?>> queries,
private boolean processFilesContainingAllKeysInPhysicalFiles(@NotNull Collection<? extends AllKeysQuery<?, ?>> queries,
@NotNull GlobalSearchScope filter,
Processor<? super VirtualFile> processor,
IdFilter filesSet) {
@@ -404,7 +404,7 @@ public abstract class FileBasedIndexEx extends FileBasedIndex {
}
@Override
public boolean processFilesContainingAllKeys(@NotNull Collection<AllKeysQuery<?, ?>> queries,
public boolean processFilesContainingAllKeys(@NotNull Collection<? extends AllKeysQuery<?, ?>> queries,
@NotNull GlobalSearchScope filter,
@NotNull Processor<? super VirtualFile> processor) {
Project project = filter.getProject();
plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureUsageProcessor.java
+1 -1
View File
@@ -166,7 +166,7 @@ public class GrChangeSignatureUsageProcessor implements ChangeSignatureUsageProc
}
@Override
public void registerConflictResolvers(List<ResolveSnapshotProvider.ResolveSnapshot> snapshots,
public void registerConflictResolvers(List<? super ResolveSnapshotProvider.ResolveSnapshot> snapshots,
@NotNull ResolveSnapshotProvider resolveSnapshotProvider,
UsageInfo[] usages, ChangeInfo changeInfo) {
}
plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureUsageProcessor.kt
+1 -1
View File
@@ -1209,7 +1209,7 @@ class KotlinChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor {
override fun setupDefaultValues(changeInfo: ChangeInfo, refUsages: Ref<Array<UsageInfo>>, project: Project) = true
override fun registerConflictResolvers(
snapshots: List<ResolveSnapshotProvider.ResolveSnapshot>,
snapshots: MutableList<in ResolveSnapshotProvider.ResolveSnapshot>,
resolveSnapshotProvider: ResolveSnapshotProvider,
usages: Array<UsageInfo>, changeInfo: ChangeInfo
) {
python/src/com/jetbrains/python/buildout/BuildoutFrameworkDetector.java
+1 -1
View File
@@ -59,7 +59,7 @@ public class BuildoutFrameworkDetector extends FacetBasedFrameworkDetector<Build
@Nullable
@Override
protected BuildoutFacetConfiguration createConfiguration(Collection<VirtualFile> files) {
protected BuildoutFacetConfiguration createConfiguration(Collection<? extends VirtualFile> files) {
VirtualFile source = ContainerUtil.getFirstItem(files);
LOG.info("Detecting Buildout facet for " + source.getPath());
final VirtualFile baseDir = source.getParent();
python/src/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureUsageProcessor.java
+1 -1
View File
@@ -397,7 +397,7 @@ public class PyChangeSignatureUsageProcessor implements ChangeSignatureUsageProc
}
@Override
public void registerConflictResolvers(List<ResolveSnapshotProvider.ResolveSnapshot> snapshots,
public void registerConflictResolvers(List<? super ResolveSnapshotProvider.ResolveSnapshot> snapshots,
@NotNull ResolveSnapshotProvider resolveSnapshotProvider,
UsageInfo[] usages, ChangeInfo changeInfo) {
}