Skip to content
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,12 @@ public boolean appendFragmentSegment(final EObject object, final StringBuilder b
}

private static Boolean isCaseSensitive(final EClass eClass) {
return ECLASS_TO_CASE_SENSITIVE.computeIfAbsent(eClass, k -> k.getEAllSuperTypes().stream().map(EClass::getName).anyMatch(n -> "ICaseSensitiveNamedElement".equals(n))); //$NON-NLS-1$
// computeIfAbsent locks the bin even for a present key unless it is the bin's first node
Boolean caseSensitive = ECLASS_TO_CASE_SENSITIVE.get(eClass);
if (caseSensitive == null) {
caseSensitive = ECLASS_TO_CASE_SENSITIVE.computeIfAbsent(eClass, k -> k.getEAllSuperTypes().stream().map(EClass::getName).anyMatch(n -> "ICaseSensitiveNamedElement".equals(n))); //$NON-NLS-1$
}
return caseSensitive;
}

@Override
Expand Down Expand Up @@ -160,8 +165,8 @@ public EObject getEObjectFromSegment(final EObject container, final String segme
return object;
}
} else {
if ((isCaseSensitive(object.eClass()) ? value.toString().equals(matchedValue) : value.toString().equalsIgnoreCase(matchedValue))
&& index++ == matchedIndex) {
String text = value.toString();
if (text.equalsIgnoreCase(matchedValue) && (!isCaseSensitive(object.eClass()) || text.equals(matchedValue)) && index++ == matchedIndex) {
return object;
}
}
Expand Down