From 167ac0be62b467324f7b3495a0fd7bf2f35450f8 Mon Sep 17 00:00:00 2001 From: Max Medvedev Date: Fri, 5 Sep 2025 16:11:57 +0200 Subject: [PATCH] IJPL-163136 fix grammar in text bundles GitOrigin-RevId: 01118f334ac0a90fe4e6c55abf0a9ea168d4a1c5 --- xml/tests/testData/psi/xml/testEntityInAttr.txt | 2 +- xml/tests/testData/psi/xml/testEntityInContent.txt | 2 +- xml/xml-parser/resources/messages/XmlParserBundle.properties | 4 ++-- .../gen/com/intellij/xml/syntax/DefaultXmlSyntaxResources.kt | 5 +++-- xml/xml-syntax/resources/messages/XmlSyntaxBundle.properties | 4 ++-- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/xml/tests/testData/psi/xml/testEntityInAttr.txt b/xml/tests/testData/psi/xml/testEntityInAttr.txt index 41b4b5419f4e..bd95fce2c96e 100644 --- a/xml/tests/testData/psi/xml/testEntityInAttr.txt +++ b/xml/tests/testData/psi/xml/testEntityInAttr.txt @@ -11,7 +11,7 @@ XmlFile:test.xml XmlToken:XML_EQ('=') PsiElement(XML_ATTRIBUTE_VALUE) XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"') - PsiErrorElement:Unescaped & or nonterminated character/entity reference + PsiErrorElement:Unescaped & or unterminated character/entity reference XmlToken:XML_BAD_CHARACTER('&') XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('n') XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"') diff --git a/xml/tests/testData/psi/xml/testEntityInContent.txt b/xml/tests/testData/psi/xml/testEntityInContent.txt index 9ba031262c51..8aab0901e7fc 100644 --- a/xml/tests/testData/psi/xml/testEntityInContent.txt +++ b/xml/tests/testData/psi/xml/testEntityInContent.txt @@ -8,7 +8,7 @@ XmlFile:test.xml XmlToken:XML_TAG_END('>') XmlText PsiWhiteSpace(' ') - PsiErrorElement:Unescaped & or nonterminated character/entity reference + PsiErrorElement:Unescaped & or unterminated character/entity reference XmlToken:XML_BAD_CHARACTER('&') XmlToken:XML_DATA_CHARACTERS('n') PsiWhiteSpace(' ') diff --git a/xml/xml-parser/resources/messages/XmlParserBundle.properties b/xml/xml-parser/resources/messages/XmlParserBundle.properties index 89162fbb876e..05c99fb5634a 100644 --- a/xml/xml-parser/resources/messages/XmlParserBundle.properties +++ b/xml/xml-parser/resources/messages/XmlParserBundle.properties @@ -20,9 +20,9 @@ xml.parsing.tag.name.expected=Tag name expected xml.parsing.tag.start.is.not.closed=Tag start is not closed xml.parsing.top.level.element.is.not.completed=Top level element is not completed xml.parsing.unclosed.attribute.value=Attribute value is not closed -xml.parsing.unescaped.ampersand.or.nonterminated.character.entity.reference=Unescaped \\& or nonterminated character/entity reference +xml.parsing.unescaped.ampersand.or.nonterminated.character.entity.reference=Unescaped \\& or unterminated character/entity reference xml.parsing.unexpected.end.of.file=Unexpected end of file xml.parsing.unexpected.token=Unexpected token xml.parsing.unexpected.tokens=Unexpected tokens xml.parsing.unterminated.processing.instruction=Processing instruction not terminated -xml.parsing.way.too.unbalanced=Way too unbalanced. Stopping attempt to balance tags properly at this point +xml.parsing.way.too.unbalanced=Too many unbalanced tags. Stopped attempting to balance tags diff --git a/xml/xml-syntax/gen/com/intellij/xml/syntax/DefaultXmlSyntaxResources.kt b/xml/xml-syntax/gen/com/intellij/xml/syntax/DefaultXmlSyntaxResources.kt index 2cb735a615a1..a7fd6b5aa3a5 100644 --- a/xml/xml-syntax/gen/com/intellij/xml/syntax/DefaultXmlSyntaxResources.kt +++ b/xml/xml-syntax/gen/com/intellij/xml/syntax/DefaultXmlSyntaxResources.kt @@ -1,3 +1,4 @@ +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.xml.syntax // Generated by generateBundleMapping.kt @@ -19,11 +20,11 @@ internal object DefaultXmlSyntaxResources { "xml.parsing.tag.start.is.not.closed" to "Tag start is not closed", "xml.parsing.top.level.element.is.not.completed" to "Top level element is not completed", "xml.parsing.unclosed.attribute.value" to "Attribute value is not closed", - "xml.parsing.unescaped.ampersand.or.nonterminated.character.entity.reference" to "Unescaped \\& or nonterminated character/entity reference", + "xml.parsing.unescaped.ampersand.or.nonterminated.character.entity.reference" to "Unescaped \\& or unterminated character/entity reference", "xml.parsing.unexpected.end.of.file" to "Unexpected end of file", "xml.parsing.unexpected.token" to "Unexpected token", "xml.parsing.unexpected.tokens" to "Unexpected tokens", "xml.parsing.unterminated.processing.instruction" to "Processing instruction not terminated", - "xml.parsing.way.too.unbalanced" to "Way too unbalanced. Stopping attempt to balance tags properly at this point", + "xml.parsing.way.too.unbalanced" to "Too many unbalanced tags. Stopped attempting to balance tags", ) } diff --git a/xml/xml-syntax/resources/messages/XmlSyntaxBundle.properties b/xml/xml-syntax/resources/messages/XmlSyntaxBundle.properties index b76a5c44d030..ebf214db124e 100644 --- a/xml/xml-syntax/resources/messages/XmlSyntaxBundle.properties +++ b/xml/xml-syntax/resources/messages/XmlSyntaxBundle.properties @@ -12,9 +12,9 @@ xml.parsing.tag.name.expected=Tag name expected xml.parsing.tag.start.is.not.closed=Tag start is not closed xml.parsing.top.level.element.is.not.completed=Top level element is not completed xml.parsing.unclosed.attribute.value=Attribute value is not closed -xml.parsing.unescaped.ampersand.or.nonterminated.character.entity.reference=Unescaped \\& or nonterminated character/entity reference +xml.parsing.unescaped.ampersand.or.nonterminated.character.entity.reference=Unescaped \\& or unterminated character/entity reference xml.parsing.unexpected.end.of.file=Unexpected end of file xml.parsing.unexpected.token=Unexpected token xml.parsing.unexpected.tokens=Unexpected tokens xml.parsing.unterminated.processing.instruction=Processing instruction not terminated -xml.parsing.way.too.unbalanced=Way too unbalanced. Stopping attempt to balance tags properly at this point +xml.parsing.way.too.unbalanced=Too many unbalanced tags. Stopped attempting to balance tags