GitOrigin-RevId: 126399559d93ccfd7bcd64cc030fdb81bc30a668
This commit is contained in:
Alexey Kudravtsev
2021-03-23 13:03:28 +01:00
committed by intellij-monorepo-bot
parent 413b775d1f
commit 5be8a1eca3
6 changed files with 10 additions and 10 deletions

View File

@@ -18,7 +18,7 @@ public class WildcardFileNameMatcher implements FileNameMatcher {
private static final class RegexpMatcher implements MaskMatcher {
private final Matcher myMatcher;
private RegexpMatcher(String pattern) {
RegexpMatcher(@NotNull String pattern) {
myMatcher = PatternUtil.fromMask(pattern).matcher("");
}
@@ -34,7 +34,7 @@ public class WildcardFileNameMatcher implements FileNameMatcher {
private static final class SuffixMatcher implements MaskMatcher {
private final String mySuffix;
private SuffixMatcher(final String suffix) {
SuffixMatcher(@NotNull String suffix) {
mySuffix = suffix;
}
@@ -47,7 +47,7 @@ public class WildcardFileNameMatcher implements FileNameMatcher {
private static final class PrefixMatcher implements MaskMatcher {
private final String myPrefix;
private PrefixMatcher(final String prefix) {
private PrefixMatcher(@NotNull String prefix) {
myPrefix = prefix;
}
@@ -60,7 +60,7 @@ public class WildcardFileNameMatcher implements FileNameMatcher {
private static final class InfixMatcher implements MaskMatcher {
private final String myInfix;
private InfixMatcher(final String infix) {
InfixMatcher(@NotNull String infix) {
myInfix = infix;
}
@@ -78,7 +78,7 @@ public class WildcardFileNameMatcher implements FileNameMatcher {
myMatcher = createMatcher(pattern);
}
private static MaskMatcher createMatcher(final String pattern) {
private static @NotNull MaskMatcher createMatcher(final @NotNull String pattern) {
int len = pattern.length();
if (len > 1 && pattern.indexOf('?') < 0) {
if (pattern.charAt(0) == '*' && pattern.indexOf('*', 1) < 0) {

View File

@@ -30,7 +30,7 @@ import java.util.StringTokenizer;
*/
public class IgnoredPatternSet {
private final Set<String> myMasks = new LinkedHashSet<>();
private final FileTypeAssocTable<Boolean> myIgnorePatterns = new FileTypeAssocTable<Boolean>().copy();
private final FileTypeAssocTable<Boolean> myIgnorePatterns = new FileTypeAssocTable<>();
@NotNull
Set<String> getIgnoreMasks() {

View File

@@ -139,7 +139,7 @@ public abstract class PsiDocumentManager {
* @return the list of uncommitted documents.
* @see #commitDocument(Document)
*/
public abstract Document @NotNull [] getUncommittedDocuments();
public abstract @NotNull Document @NotNull [] getUncommittedDocuments();
/**
* Checks if the specified document has been committed.

View File

@@ -818,7 +818,7 @@ public abstract class PsiDocumentManagerBase extends PsiDocumentManager implemen
}
@Override
public Document @NotNull [] getUncommittedDocuments() {
public @NotNull Document @NotNull [] getUncommittedDocuments() {
ApplicationManager.getApplication().assertReadAccessAllowed();
Document[] documents = myUncommittedDocuments.toArray(Document.EMPTY_ARRAY);
return ArrayUtil.stripTrailingNulls(documents);

View File

@@ -192,7 +192,7 @@ public final class RepositoryHelper {
}
private static boolean ideContainsUltimateModule() {
IdeaPluginDescriptor corePlugin = PluginManagerCore.getPlugin(PluginId.getId(PluginManagerCore.CORE_PLUGIN_ID));
IdeaPluginDescriptor corePlugin = PluginManagerCore.getPlugin(PluginManagerCore.CORE_ID);
IdeaPluginDescriptorImpl corePluginImpl = (corePlugin instanceof IdeaPluginDescriptorImpl) ? (IdeaPluginDescriptorImpl)corePlugin : null;
return corePluginImpl != null && corePluginImpl.getModules().contains(PluginId.getId(ULTIMATE_MODULE));
}

View File

@@ -44,7 +44,7 @@ class CaseInsensitiveCharSequenceHashingStrategy implements HashingStrategy<Char
public boolean equals(CharSequence s1, CharSequence s2) {
return StringUtil.equalsIgnoreCase(s1, s2);
}
};
}
final class CanonicalHashingStrategy<T> implements HashingStrategy<T> {
static final HashingStrategy<?> INSTANCE = new CanonicalHashingStrategy<>();