From e3895916cfda38eb1d9f098b2431818692af06ec Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Wed, 12 Feb 2025 17:49:37 +0100
Subject: [PATCH] show encoding problem for the whole file, instead of the
 empty string in the very beginning, for which quickfixes are hard to invoke

GitOrigin-RevId: 21a06256d25ea4cedac5bc812b41628e9fc2d985
---
 .../python/inspections/PyMandatoryEncodingInspection.java     | 4 +---
 python/testData/inspections/AddEncoding.py                    | 3 ++-
 python/testData/inspections/AddEncodingAtLastLine.py          | 2 +-
 python/testData/inspections/AddEncodingInEnabledPy3/test.py   | 2 +-
 .../InspectionsDisabledInFunctionTypeComments/test.py         | 3 ++-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/python/python-psi-impl/src/com/jetbrains/python/inspections/PyMandatoryEncodingInspection.java b/python/python-psi-impl/src/com/jetbrains/python/inspections/PyMandatoryEncodingInspection.java
index 55253b64a119..42b6634c0757 100644
--- a/python/python-psi-impl/src/com/jetbrains/python/inspections/PyMandatoryEncodingInspection.java
+++ b/python/python-psi-impl/src/com/jetbrains/python/inspections/PyMandatoryEncodingInspection.java
@@ -20,7 +20,6 @@ import com.intellij.codeInspection.ProblemsHolder;
 import com.intellij.codeInspection.options.OptDropdown;
 import com.intellij.codeInspection.options.OptPane;
 import com.intellij.openapi.util.NlsSafe;
-import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.PsiElementVisitor;
 import com.jetbrains.python.PyPsiBundle;
 import com.jetbrains.python.PythonFileType;
@@ -59,10 +58,9 @@ public final class PyMandatoryEncodingInspection extends PyInspection {
 
       final String charsetString = PythonFileType.getCharsetFromEncodingDeclaration(node);
       if (charsetString == null) {
-        TextRange tr = new TextRange(0, 0);
         ProblemsHolder holder = getHolder();
         if (holder != null) {
-          holder.registerProblem(node, tr, PyPsiBundle.message("INSP.mandatory.encoding.no.encoding.specified.for.file"),
+          holder.registerProblem(node, PyPsiBundle.message("INSP.mandatory.encoding.no.encoding.specified.for.file"),
                                  new AddEncodingQuickFix(myDefaultEncoding, myEncodingFormatIndex));
         }
       }
diff --git a/python/testData/inspections/AddEncoding.py b/python/testData/inspections/AddEncoding.py
index 37c04d128834..9f4263af90cd 100644
--- a/python/testData/inspections/AddEncoding.py
+++ b/python/testData/inspections/AddEncoding.py
@@ -1 +1,2 @@
-<warning descr="No encoding specified for file"><caret></warning>c = "string"
+<warning descr="No encoding specified for file">c = "string"
+</warning>
\ No newline at end of file
diff --git a/python/testData/inspections/AddEncodingAtLastLine.py b/python/testData/inspections/AddEncodingAtLastLine.py
index a7868cf286f9..185eb81692e2 100644
--- a/python/testData/inspections/AddEncodingAtLastLine.py
+++ b/python/testData/inspections/AddEncodingAtLastLine.py
@@ -1 +1 @@
-<warning descr="No encoding specified for file"><caret></warning>#!/usr/bin/env python
\ No newline at end of file
+<warning descr="No encoding specified for file">#!/usr/bin/env python</warning>
\ No newline at end of file
diff --git a/python/testData/inspections/AddEncodingInEnabledPy3/test.py b/python/testData/inspections/AddEncodingInEnabledPy3/test.py
index 76ef230348eb..1eaf175b10a9 100644
--- a/python/testData/inspections/AddEncodingInEnabledPy3/test.py
+++ b/python/testData/inspections/AddEncodingInEnabledPy3/test.py
@@ -1 +1 @@
-<warning descr="No encoding specified for file"></warning>from typing import Any
\ No newline at end of file
+<warning descr="No encoding specified for file">from typing import Any</warning>
\ No newline at end of file
diff --git a/python/testData/inspections/InspectionsDisabledInFunctionTypeComments/test.py b/python/testData/inspections/InspectionsDisabledInFunctionTypeComments/test.py
index 2e933289b4ef..97f37c6401e7 100644
--- a/python/testData/inspections/InspectionsDisabledInFunctionTypeComments/test.py
+++ b/python/testData/inspections/InspectionsDisabledInFunctionTypeComments/test.py
@@ -1,4 +1,4 @@
-<weak_warning descr="Missing docstring"></weak_warning><warning descr="No encoding specified for file"></warning>def <weak_warning descr="Missing docstring">f</weak_warning>(x):
+<weak_warning descr="Missing docstring"></weak_warning><warning descr="No encoding specified for file">def <weak_warning descr="Missing docstring">f</weak_warning>(x):
     <warning descr="Non-ASCII character 'М' in the file, but no encoding declared"># type: (b'Моноцикл') -> None</warning>
     pass
 
@@ -6,3 +6,4 @@
 def <weak_warning descr="Missing docstring">g</weak_warning>():
     # type: <error descr="Unexpected tokens">"foo"</error>
     pass
+</warning>
\ No newline at end of file