Skip to content

Compare the matcher context once per content type lookup #2930

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vogella merged 1 commit into from
Sep 21, 2026
+22 −9
Merged

Compare the matcher context once per content type lookup #2930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion ...ndles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/ContentType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,14 @@ boolean hasBuiltInAssociations() {
}

boolean hasFileSpec(IScopeContext context, String text, int typeMask) {
if (context.equals(manager.getContext()) || (typeMask & IGNORE_USER_DEFINED) != 0) {
return hasFileSpec(context, context.equals(manager.getContext()), text, typeMask);
}

/**
* Variant for callers that already know whether the context is the default one.
*/
boolean hasFileSpec(IScopeContext context, boolean defaultContext, String text, int typeMask) {
if (defaultContext || (typeMask & IGNORE_USER_DEFINED) != 0) {
return hasFileSpec(text, typeMask, false);
}
String[] fileSpecs = ContentTypeSettings.getFileSpecs(context, id, typeMask);
Expand Down
22 changes: 14 additions & 8 deletions ...rg.eclipse.core.contenttype/src/org/eclipse/core/internal/content/ContentTypeCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,19 +606,21 @@ private IContentType[] internalFindContentTypesFor(ContentTypeMatcher matcher, I
*/
synchronized private IContentType[][] internalFindContentTypesSorted(ContentTypeMatcher matcher, final String fileName, Comparator<IContentType> sortingPolicy, boolean quickFinish) {
IScopeContext context = matcher.getContext();
// comparing a project scope context is expensive, so do it once per lookup
final boolean defaultContext = context.equals(manager.getContext());
IContentType[][] result = { NO_CONTENT_TYPES, NO_CONTENT_TYPES, NO_CONTENT_TYPES };

Set<ContentType> existing = new HashSet<>();

final Set<ContentType> allByFileName;
if (context.equals(manager.getContext())) {
if (defaultContext) {
allByFileName = getDirectlyAssociated(fileName, IContentTypeSettings.FILE_NAME_SPEC);
} else {
allByFileName = new HashSet<>(getDirectlyAssociated(fileName, IContentTypeSettings.FILE_NAME_SPEC | IContentType.IGNORE_USER_DEFINED));
allByFileName.addAll(matcher.getDirectlyAssociated(this, fileName, IContentTypeSettings.FILE_NAME_SPEC));
}
Set<ContentType> selectedByName = selectMatchingByName(context, allByFileName, Collections.emptySet(), fileName,
IContentType.FILE_NAME_SPEC);
Set<ContentType> selectedByName = selectMatchingByName(context, defaultContext, allByFileName,
Collections.emptySet(), fileName, IContentType.FILE_NAME_SPEC);
existing.addAll(selectedByName);
result[0] = selectedByName.toArray(new IContentType[selectedByName.size()]);
if (result[0].length > 1) {
Expand All @@ -631,13 +633,14 @@ synchronized private IContentType[][] internalFindContentTypesSorted(ContentType
final String fileExtension = ContentTypeManager.getFileExtension(fileName);
if (fileExtension != null) {
final Set<ContentType> allByFileExtension;
if (context.equals(manager.getContext())) {
if (defaultContext) {
allByFileExtension = getDirectlyAssociated(fileExtension, IContentTypeSettings.FILE_EXTENSION_SPEC);
} else {
allByFileExtension = new HashSet<>(getDirectlyAssociated(fileExtension, IContentTypeSettings.FILE_EXTENSION_SPEC | IContentType.IGNORE_USER_DEFINED));
allByFileExtension.addAll(matcher.getDirectlyAssociated(this, fileExtension, IContentTypeSettings.FILE_EXTENSION_SPEC));
}
Set<ContentType> selectedByExtension = selectMatchingByName(context, allByFileExtension, selectedByName, fileExtension, IContentType.FILE_EXTENSION_SPEC);
Set<ContentType> selectedByExtension = selectMatchingByName(context, defaultContext, allByFileExtension,
selectedByName, fileExtension, IContentType.FILE_EXTENSION_SPEC);
existing.addAll(selectedByExtension);
if (!selectedByExtension.isEmpty()) {
result[1] = selectedByExtension.toArray(new IContentType[selectedByExtension.size()]);
Expand All @@ -651,7 +654,7 @@ synchronized private IContentType[][] internalFindContentTypesSorted(ContentType
}

final Set<ContentType> allByFilePattern;
if (context.equals(manager.getContext())) {
if (defaultContext) {
allByFilePattern = getMatchingRegexpAssociated(fileName, IContentTypeSettings.FILE_PATTERN_SPEC);
} else {
allByFilePattern = new HashSet<>(getMatchingRegexpAssociated(fileName,
Expand Down Expand Up @@ -787,7 +790,9 @@ synchronized protected void organize() {
* Processes all content types in source, adding those matching the given file spec to the
* destination collection.
*/
private Set<ContentType> selectMatchingByName(final IScopeContext context, Collection<ContentType> source, final Collection<ContentType> existing, final String fileSpecText, final int fileSpecType) {
private Set<ContentType> selectMatchingByName(final IScopeContext context, final boolean defaultContext,
Collection<ContentType> source, final Collection<ContentType> existing, final String fileSpecText,
final int fileSpecType) {
if (source == null || source.isEmpty()) {
return Collections.EMPTY_SET;
}
Expand All @@ -801,7 +806,8 @@ private Set<ContentType> selectMatchingByName(final IScopeContext context, Colle
// this content type has built-in associations - visit it later as root
return ContentTypeVisitor.RETURN;
}
if (contentType == root && !contentType.hasFileSpec(context, fileSpecText, fileSpecType)) {
if (contentType == root
&& !contentType.hasFileSpec(context, defaultContext, fileSpecText, fileSpecType)) {
// it is the root and does not match the file name - do not add it nor look into its children
return ContentTypeVisitor.RETURN;
}
Expand Down
Loading