diff --git a/python/python-psi-api/src/com/jetbrains/python/PyNames.java b/python/python-psi-api/src/com/jetbrains/python/PyNames.java index 565e11dad42e..adbdba0c46c5 100644 --- a/python/python-psi-api/src/com/jetbrains/python/PyNames.java +++ b/python/python-psi-api/src/com/jetbrains/python/PyNames.java @@ -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() { } diff --git a/python/python-psi-impl/src/com/jetbrains/python/inspections/Wildcard.java b/python/python-psi-impl/src/com/jetbrains/python/inspections/Wildcard.java deleted file mode 100644 index d999b934a0c6..000000000000 --- a/python/python-psi-impl/src/com/jetbrains/python/inspections/Wildcard.java +++ /dev/null @@ -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() { - } -} diff --git a/python/python-psi-impl/src/com/jetbrains/python/inspections/unresolvedReference/PyUnresolvedReferencesVisitor.java b/python/python-psi-impl/src/com/jetbrains/python/inspections/unresolvedReference/PyUnresolvedReferencesVisitor.java index 3f7d5ee53589..9dde05478292 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/inspections/unresolvedReference/PyUnresolvedReferencesVisitor.java +++ b/python/python-psi-impl/src/com/jetbrains/python/inspections/unresolvedReference/PyUnresolvedReferencesVisitor.java @@ -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 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; } diff --git a/python/src/com/jetbrains/python/inspections/quickfix/AddIgnoredIdentifierQuickFix.java b/python/src/com/jetbrains/python/inspections/quickfix/AddIgnoredIdentifierQuickFix.java index 20223bdaefd0..f3a38db3e922 100644 --- a/python/src/com/jetbrains/python/inspections/quickfix/AddIgnoredIdentifierQuickFix.java +++ b/python/src/com/jetbrains/python/inspections/quickfix/AddIgnoredIdentifierQuickFix.java @@ -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)) {