From 58aaafd0a44c8cebe6cd7a48b12beffde3192917 Mon Sep 17 00:00:00 2001 From: Max Medvedev Date: Fri, 4 Jul 2025 18:21:54 +0200 Subject: [PATCH] nullability in Xml GitOrigin-RevId: 15149a53065d1daa1ec958965f0dbabdb2b1cd44 --- .../intellij/codeInsight/XmlBuilderTest.java | 18 +++++++------- .../intellij/xml/util/CharsetDetector.java | 12 +++++----- .../impl/source/parsing/xml/XmlBuilder.java | 24 +++++++++---------- .../source/parsing/xml/XmlBuilderDriver.java | 2 +- .../com/intellij/xml/util/BasicXmlUtil.java | 2 +- 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/xml/tests/src/com/intellij/codeInsight/XmlBuilderTest.java b/xml/tests/src/com/intellij/codeInsight/XmlBuilderTest.java index 0fcf389ffc89..4e23edd10073 100644 --- a/xml/tests/src/com/intellij/codeInsight/XmlBuilderTest.java +++ b/xml/tests/src/com/intellij/codeInsight/XmlBuilderTest.java @@ -30,20 +30,20 @@ public class XmlBuilderTest extends LightJavaCodeInsightTestCase { private final StringBuilder builder = new StringBuilder(); private final StringBuilder currentPhysicalText = new StringBuilder(); private final StringBuilder currentDisplayText = new StringBuilder(); - private final ProcessingOrder myTagProcessingOrder; + private final @NotNull ProcessingOrder myTagProcessingOrder; - TestXmlBuilder(final ProcessingOrder tagsAndAttributes) { + TestXmlBuilder(@NotNull ProcessingOrder tagsAndAttributes) { myTagProcessingOrder = tagsAndAttributes; } @Override - public void attribute(final CharSequence name, final CharSequence value, final int startoffset, final int endoffset) { + public void attribute(final @NotNull CharSequence name, final @NotNull CharSequence value, final int startoffset, final int endoffset) { flushText(); builder.append("ATT: name='").append(name).append("' value='").append(value).append("'\n"); } @Override - public void endTag(final CharSequence localName, final String namespace, final int startoffset, final int endoffset) { + public void endTag(final @NotNull CharSequence localName, final @NotNull String namespace, final int startoffset, final int endoffset) { flushText(); builder.append("ENDTAG: name='").append(localName).append("' namespace='").append(namespace).append("'\n"); } @@ -53,21 +53,21 @@ public class XmlBuilderTest extends LightJavaCodeInsightTestCase { } @Override - public ProcessingOrder startTag(final CharSequence localName, final String namespace, final int startoffset, final int endoffset, - final int headerEndOffset) { + public @NotNull ProcessingOrder startTag(final @NotNull CharSequence localName, final @NotNull String namespace, final int startoffset, final int endoffset, + final int headerEndOffset) { flushText(); builder.append("TAG: name='").append(localName).append("' namespace='").append(namespace).append("'\n"); return myTagProcessingOrder; } @Override - public void textElement(final CharSequence display, final CharSequence physical, final int startoffset, final int endoffset) { + public void textElement(final @NotNull CharSequence display, final @NotNull CharSequence physical, final int startoffset, final int endoffset) { currentPhysicalText.append(physical); currentDisplayText.append(display); } @Override - public void entityRef(final CharSequence ref, final int startOffset, final int endOffset) { + public void entityRef(final @NotNull CharSequence ref, final int startOffset, final int endOffset) { flushText(); builder.append("REF: '").append(ref).append("'\n"); } @@ -286,7 +286,7 @@ public class XmlBuilderTest extends LightJavaCodeInsightTestCase { ); } - private static void doTest(String xml, String expectedEventSequence, final XmlBuilder.ProcessingOrder tagsAndAttributes) { + private static void doTest(String xml, String expectedEventSequence, @NotNull XmlBuilder.ProcessingOrder tagsAndAttributes) { final TestXmlBuilder builder = new TestXmlBuilder(tagsAndAttributes); new XmlBuilderDriver(xml).build(builder); assertEquals(expectedEventSequence, builder.getResult()); diff --git a/xml/xml-frontback-impl/src/com/intellij/xml/util/CharsetDetector.java b/xml/xml-frontback-impl/src/com/intellij/xml/util/CharsetDetector.java index 855c5ddf5114..5bf8d6589bac 100644 --- a/xml/xml-frontback-impl/src/com/intellij/xml/util/CharsetDetector.java +++ b/xml/xml-frontback-impl/src/com/intellij/xml/util/CharsetDetector.java @@ -65,8 +65,8 @@ public final class CharsetDetector { } @Override - public ProcessingOrder startTag(final CharSequence localName, final String namespace, final int startOffset, final int endOffset, - final int headerEndOffset) { + public @NotNull ProcessingOrder startTag(final @NotNull CharSequence localName, final @NotNull String namespace, final int startOffset, final int endOffset, + final int headerEndOffset) { @NonNls String name = StringUtil.toLowerCase(localName.toString()); inTag.add(name); if (!inTag.contains("head") && !"html".equals(name)) terminate(); @@ -78,7 +78,7 @@ public final class CharsetDetector { } @Override - public void endTag(final CharSequence localName, final String namespace, final int startoffset, final int endoffset) { + public void endTag(final @NotNull CharSequence localName, final @NotNull String namespace, final int startoffset, final int endoffset) { final @NonNls String name = StringUtil.toLowerCase(localName.toString()); if ("meta".equals(name) && (metHttpEquiv || metHtml5Charset) && contentAttributeValue != null) { String charsetName; @@ -108,7 +108,7 @@ public final class CharsetDetector { private String contentAttributeValue; @Override - public void attribute(final CharSequence localName, final CharSequence v, final int startoffset, final int endoffset) { + public void attribute(final @NotNull CharSequence localName, final @NotNull CharSequence v, final int startoffset, final int endoffset) { final @NonNls String name = StringUtil.toLowerCase(localName.toString()); if (inTag.contains("meta")) { @NonNls String value = StringUtil.toLowerCase(v.toString()); @@ -126,11 +126,11 @@ public final class CharsetDetector { } @Override - public void textElement(final CharSequence display, final CharSequence physical, final int startoffset, final int endoffset) { + public void textElement(final @NotNull CharSequence display, final @NotNull CharSequence physical, final int startoffset, final int endoffset) { } @Override - public void entityRef(final CharSequence ref, final int startOffset, final int endOffset) { + public void entityRef(final @NotNull CharSequence ref, final int startOffset, final int endOffset) { } @Override diff --git a/xml/xml-parser/src/com/intellij/psi/impl/source/parsing/xml/XmlBuilder.java b/xml/xml-parser/src/com/intellij/psi/impl/source/parsing/xml/XmlBuilder.java index e1020355adc7..b2301105fe9e 100644 --- a/xml/xml-parser/src/com/intellij/psi/impl/source/parsing/xml/XmlBuilder.java +++ b/xml/xml-parser/src/com/intellij/psi/impl/source/parsing/xml/XmlBuilder.java @@ -14,28 +14,28 @@ public interface XmlBuilder { int startOffset, int endOffset); - ProcessingOrder startTag(CharSequence localName, - String namespace, - int startOffset, - int endOffset, - int headerEndOffset); + @NotNull ProcessingOrder startTag(@NotNull CharSequence localName, + @NotNull String namespace, + int startOffset, + int endOffset, + int headerEndOffset); - void endTag(CharSequence localName, - String namespace, + void endTag(@NotNull CharSequence localName, + @NotNull String namespace, int startOffset, int endOffset); - void attribute(CharSequence name, - CharSequence value, + void attribute(@NotNull CharSequence name, + @NotNull CharSequence value, int startOffset, int endOffset); - void textElement(CharSequence display, - CharSequence physical, + void textElement(@NotNull CharSequence display, + @NotNull CharSequence physical, int startOffset, int endOffset); - void entityRef(CharSequence ref, + void entityRef(@NotNull CharSequence ref, int startOffset, int endOffset); diff --git a/xml/xml-parser/src/com/intellij/psi/impl/source/parsing/xml/XmlBuilderDriver.java b/xml/xml-parser/src/com/intellij/psi/impl/source/parsing/xml/XmlBuilderDriver.java index 1fb6aa082b13..33774c24d6ab 100644 --- a/xml/xml-parser/src/com/intellij/psi/impl/source/parsing/xml/XmlBuilderDriver.java +++ b/xml/xml-parser/src/com/intellij/psi/impl/source/parsing/xml/XmlBuilderDriver.java @@ -241,7 +241,7 @@ public class XmlBuilderDriver { ); } - private @NonNls String getNamespace(@NotNull CharSequence tagName) { + private @NonNls @NotNull String getNamespace(@NotNull CharSequence tagName) { final String namespacePrefix; int pos = StringUtil.indexOf(tagName, ':'); if (pos == -1) { diff --git a/xml/xml-parser/src/com/intellij/xml/util/BasicXmlUtil.java b/xml/xml-parser/src/com/intellij/xml/util/BasicXmlUtil.java index 0a7a19c3d2b0..87805b257223 100644 --- a/xml/xml-parser/src/com/intellij/xml/util/BasicXmlUtil.java +++ b/xml/xml-parser/src/com/intellij/xml/util/BasicXmlUtil.java @@ -13,7 +13,7 @@ public final class BasicXmlUtil { private BasicXmlUtil() { } - public static CharSequence getLocalName(final CharSequence tagName) { + public static @NotNull CharSequence getLocalName(@NotNull CharSequence tagName) { int pos = StringUtil.indexOf(tagName, ':'); if (pos == -1) { return tagName;