MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

nullability in Xml

Browse Source 
GitOrigin-RevId: 15149a53065d1daa1ec958965f0dbabdb2b1cd44
This commit is contained in:
Max Medvedev
2025-07-07 14:28:04 +00:00
committed by intellij-monorepo-bot
parent 8c9df3bca6
commit 58aaafd0a4
5 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xml/tests/src/com/intellij/codeInsight/XmlBuilderTest.java
+9 -9
View File
@@ -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());
xml/xml-frontback-impl/src/com/intellij/xml/util/CharsetDetector.java
+6 -6
View File
@@ -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
xml/xml-parser/src/com/intellij/psi/impl/source/parsing/xml/XmlBuilder.java
+12 -12
View File
@@ -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);
xml/xml-parser/src/com/intellij/psi/impl/source/parsing/xml/XmlBuilderDriver.java
+1 -1
View File
@@ -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) {
xml/xml-parser/src/com/intellij/xml/util/BasicXmlUtil.java
+1 -1
View File
@@ -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;