MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-02-05 08:06:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

do not rely on file-name while indexing manifest files (effectively reverts IDEA-303356 fix)

Browse Source 
we should not fix issues caused by wrong file type re-association instead of it we should create a mechanism to warn user about it

GitOrigin-RevId: 8e00c260d7f319828b9686fa9e8e98175ce0361a
This commit is contained in:
Dmitry Batkovich
2023-07-28 14:48:49 +02:00
committed by intellij-monorepo-bot
parent 97e73ee93f
commit 79e27a499b
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
java/java-indexing-impl/src/com/intellij/psi/impl/java/stubs/index/JavaSourceModuleNameIndex.java
View File

@@ -3,13 +3,14 @@ package com.intellij.psi.impl.java.stubs.index;
import com.intellij.ide.highlighter.JavaClassFileType;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.fileTypes.FileTypeRegistry;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiJavaModule;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.util.indexing.*;
import com.intellij.util.indexing.hints.BinaryFileTypePolicy;
import com.intellij.util.indexing.hints.ExactFileNameInputFilter;
import com.intellij.util.indexing.hints.FileTypeInputFilterPredicate;
import com.intellij.util.indexing.hints.FileTypeSubstitutionStrategy;
import com.intellij.util.io.EnumeratorStringDescriptor;
import com.intellij.util.io.KeyDescriptor;
import org.jetbrains.annotations.NotNull;
@@ -31,7 +32,8 @@ public final class JavaSourceModuleNameIndex extends ScalarIndexExtension<String
String name = new Manifest(new ByteArrayInputStream(data.getContent())).getMainAttributes().getValue(PsiJavaModule.AUTO_MODULE_NAME);
if (name != null) return singletonMap(name, null);
}
catch (IOException ignored) { }
catch (IOException ignored) {
}
return emptyMap();
};
@@ -57,7 +59,10 @@ public final class JavaSourceModuleNameIndex extends ScalarIndexExtension<String
@Override
public @NotNull FileBasedIndex.InputFilter getInputFilter() {
return new ExactFileNameInputFilter("MANIFEST.MF", true /* ignore case */, BinaryFileTypePolicy.NON_BINARY);
FileType manifestFileType = FileTypeRegistry.getInstance().getFileTypeByFileName("Manifest.mf");
return new FileTypeInputFilterPredicate(FileTypeSubstitutionStrategy.BEFORE_SUBSTITUTION, type -> {
return type.equals(manifestFileType);
});
}
@Override