move Wildcard.END -> PyNames.END_WILDCARD; delete Wildcard class

GitOrigin-RevId: 91c84d289115de36918a5ceeb33ff8ab9441445d
This commit is contained in:
Petr Golubev
2019-12-16 13:11:04 +00:00
committed by intellij-monorepo-bot
parent 861ba81e96
commit 81eb2387a3
4 changed files with 6 additions and 14 deletions
@@ -74,6 +74,7 @@ public class PyNames {
@NonNls public static final String PYTHON_MODULE_ID = "PYTHON_MODULE";
public static final String TESTCASE_SETUP_NAME = "setUp";
public static final String PY_DOCSTRING_ID = "PyDocstring";
public static final String END_WILDCARD = ".*";
private PyNames() {
}
@@ -1,9 +0,0 @@
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.jetbrains.python.inspections;
public final class Wildcard {
public static final String END = ".*";
private Wildcard() {
}
}
@@ -52,7 +52,7 @@ import org.jetbrains.annotations.Nullable;
import java.util.*;
import static com.jetbrains.python.inspections.Wildcard.END;
import static com.jetbrains.python.PyNames.END_WILDCARD;
abstract class PyUnresolvedReferencesVisitor extends PyInspectionVisitor {
private final Set<PyImportedNameDefiner> myAllImports = Collections.synchronizedSet(new HashSet<>());
@@ -266,8 +266,8 @@ abstract class PyUnresolvedReferencesVisitor extends PyInspectionVisitor {
for (QualifiedName name : qualifiedNames) {
final String canonicalName = name.toString();
for (String ignored : myIgnoredIdentifiers) {
if (ignored.endsWith(END)) {
final String prefix = ignored.substring(0, ignored.length() - END.length());
if (ignored.endsWith(END_WILDCARD)) {
final String prefix = ignored.substring(0, ignored.length() - END_WILDCARD.length());
if (canonicalName.startsWith(prefix)) {
return;
}
@@ -22,7 +22,7 @@ import com.intellij.codeInspection.ex.InspectionProfileModifiableModelKt;
import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiElement;
import com.intellij.psi.util.QualifiedName;
import com.jetbrains.python.inspections.Wildcard;
import com.jetbrains.python.PyNames;
import com.jetbrains.python.inspections.unresolvedReference.PyUnresolvedReferencesInspection;
import org.jetbrains.annotations.NotNull;
@@ -69,7 +69,7 @@ public class AddIgnoredIdentifierQuickFix implements LocalQuickFix, LowPriorityA
(PyUnresolvedReferencesInspection)model.getUnwrappedTool(PyUnresolvedReferencesInspection.class.getSimpleName(), context);
String name = myIdentifier.toString();
if (myIgnoreAllAttributes) {
name += Wildcard.END;
name += PyNames.END_WILDCARD;
}
assert inspection != null;
if (!inspection.ignoredIdentifiers.contains(name)) {