Skip to content

429 error reporting truncation corrupts escaped quotes and generates invalid python code #432

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PaulN2112CGE merged 2 commits into from
Sep 17, 2026
Merged

429 error reporting truncation corrupts escaped quotes and generates invalid python code #432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fce62c2
Truncate first then escape
Sep 17, 2026
64e46db
Use XPlus XText Generator
Sep 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bundles/nl.asml.matala.product/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ additional.bundles = org.eclipse.xtext.xbase,\
org.apache.commons.logging,\
org.apache.log4j,\
com.google.gson,\
nl.esi.xtext.lsp.generator
nl.esi.xplus.xtext.generator
4 changes: 2 additions & 2 deletions bundles/nl.asml.matala.product/src/nl/asml/matala/product/GenerateProduct.mwe2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@ Workflow {
junitSupport = {
junitVersion = "5"
}
contentAssist = nl.esi.xtext.lsp.generator.ide.contentassist.IdeContentAssistFragment2 {
contentAssist = nl.esi.xplus.xtext.generator.ide.contentassist.IdeContentAssistFragment2 {
generateXtendStub = true
}
fragment = nl.esi.xtext.lsp.generator.lezer.LezerGrammarFragment {
fragment = nl.esi.xplus.xtext.generator.lezer.LezerGrammarFragment {
absolutePath = "${rootPath}/nl.asml.matala.product/target/lezer-grammar"
override = true
}
Expand Down
13 changes: 7 additions & 6 deletions bundles/nl.asml.matala.product/src/nl/asml/matala/product/generator/Utils.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1001,10 +1001,15 @@ class Utils
return String.join("\n", result)
}

static def String escapeAndLimitText(String text, int limit) {
if (text === null) {
static def String escapeAndLimitText(String inputText, int limit) {
if (inputText === null) {
return ""
}
var text = inputText
if (text.length() > limit) {
text = text.substring(0, limit - 3) + "..."
}

// Escape special characters for Python
var escaped = text.trim()
.replaceAll("\\s+", " ")
Expand All @@ -1013,10 +1018,6 @@ class Utils
.replace("\n", "")
.replace("\r", "")
.replace("\t", " ")
// Limit to specified length with "..." suffix if truncated
if (escaped.length() > limit) {
escaped = escaped.substring(0, limit - 3) + "..."
}
return escaped
}

Expand Down
2 changes: 1 addition & 1 deletion bundles/nl.esi.comma.abstracttestspecification/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ additional.bundles = org.eclipse.xtext.xbase,\
org.objectweb.asm,\
org.apache.commons.logging,\
org.apache.log4j,\
nl.esi.xtext.lsp.generator
nl.esi.xplus.xtext.generator
2 changes: 1 addition & 1 deletion ...ication/src/nl/esi/comma/abstracttestspecification/GenerateAbstractTestspecification.mwe2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ Workflow {
generateDeprecationValidation = true
}
generator = null
contentAssist = nl.esi.xtext.lsp.generator.ide.contentassist.IdeContentAssistFragment2 {
contentAssist = nl.esi.xplus.xtext.generator.ide.contentassist.IdeContentAssistFragment2 {
generateXtendStub = true
}
junitSupport = {
Expand Down
2 changes: 1 addition & 1 deletion bundles/nl.esi.comma.assertthat/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ additional.bundles = org.eclipse.xtext.xbase,\
org.objectweb.asm,\
org.apache.commons.logging,\
org.apache.log4j,\
nl.esi.xtext.lsp.generator
nl.esi.xplus.xtext.generator
2 changes: 1 addition & 1 deletion bundles/nl.esi.comma.assertthat/src/nl/esi/comma/assertthat/GenerateAssertThat.mwe2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ Workflow {
junitSupport = {
junitVersion = "5"
}
contentAssist = nl.esi.xtext.lsp.generator.ide.contentassist.IdeContentAssistFragment2 {
contentAssist = nl.esi.xplus.xtext.generator.ide.contentassist.IdeContentAssistFragment2 {
generateXtendStub = true
}
}
Expand Down
2 changes: 1 addition & 1 deletion bundles/nl.esi.comma.behavior.scl/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ additional.bundles = org.eclipse.xtext.xbase,\
org.objectweb.asm,\
org.apache.commons.logging,\
org.apache.log4j,\
nl.esi.xtext.lsp.generator
nl.esi.xplus.xtext.generator
2 changes: 1 addition & 1 deletion bundles/nl.esi.comma.behavior.scl/src/nl/esi/comma/behavior/scl/GenerateScl.mwe2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Workflow {
generator = {
generateStub = true
}
contentAssist = nl.esi.xtext.lsp.generator.ide.contentassist.IdeContentAssistFragment2 {
contentAssist = nl.esi.xplus.xtext.generator.ide.contentassist.IdeContentAssistFragment2 {
generateStub = true
}
junitSupport = {
Expand Down
2 changes: 1 addition & 1 deletion bundles/nl.esi.comma.causalgraph/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ additional.bundles = org.eclipse.xtext.xbase,\
org.objectweb.asm,\
org.apache.log4j,\
org.apache.commons.logging,\
nl.esi.xtext.lsp.generator
nl.esi.xplus.xtext.generator
2 changes: 1 addition & 1 deletion bundles/nl.esi.comma.causalgraph/src/nl/esi/comma/causalgraph/GenerateCausalGraph.mwe2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ Workflow {
generator = {
generateStub = true
}
contentAssist = nl.esi.xtext.lsp.generator.ide.contentassist.IdeContentAssistFragment2 {
contentAssist = nl.esi.xplus.xtext.generator.ide.contentassist.IdeContentAssistFragment2 {
generateStub = true
}
quickFixProvider = {
Expand Down
2 changes: 1 addition & 1 deletion bundles/nl.esi.comma.constraints/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ additional.bundles = org.eclipse.xtext.xbase,\
org.apache.commons.logging,\
org.apache.log4j,\
com.ibm.icu,\
nl.esi.xtext.lsp.generator
nl.esi.xplus.xtext.generator
2 changes: 1 addition & 1 deletion bundles/nl.esi.comma.constraints/src/nl/esi/comma/constraints/GenerateConstraints.mwe2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ Workflow {
generator = {
generateStub = true
}
contentAssist = nl.esi.xtext.lsp.generator.ide.contentassist.IdeContentAssistFragment2 {
contentAssist = nl.esi.xplus.xtext.generator.ide.contentassist.IdeContentAssistFragment2 {
generateStub = true
}
junitSupport = {
Expand Down
2 changes: 1 addition & 1 deletion bundles/nl.esi.comma.inputspecification/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ additional.bundles = org.eclipse.xtext.xbase,\
org.apache.commons.logging,\
org.apache.log4j,\
com.ibm.icu,\
nl.esi.xtext.lsp.generator
nl.esi.xplus.xtext.generator
2 changes: 1 addition & 1 deletion ...ma.inputspecification/src/nl/esi/comma/inputspecification/GenerateInputSpecification.mwe2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Workflow {
validator = {
// composedCheck = "org.eclipse.xtext.validation.NamesAreUniqueValidator"
}
contentAssist = nl.esi.xtext.lsp.generator.ide.contentassist.IdeContentAssistFragment2 {
contentAssist = nl.esi.xplus.xtext.generator.ide.contentassist.IdeContentAssistFragment2 {
generateXtendStub = true
}
}
Expand Down
2 changes: 1 addition & 1 deletion bundles/nl.esi.comma.project.standard/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ additional.bundles = org.eclipse.xtext.xbase,\
org.apache.commons.logging,\
org.apache.log4j,\
com.ibm.icu,\
nl.esi.xtext.lsp.generator
nl.esi.xplus.xtext.generator
2 changes: 1 addition & 1 deletion ...esi.comma.project.standard/src/nl/esi/comma/project/standard/GenerateStandardProject.mwe2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Workflow {
formatter = formatting.Formatter2Fragment2 {
generateStub = true
}
contentAssist = nl.esi.xtext.lsp.generator.ide.contentassist.IdeContentAssistFragment2 {
contentAssist = nl.esi.xplus.xtext.generator.ide.contentassist.IdeContentAssistFragment2 {
generateStub = true
}
junitSupport = {
Expand Down
2 changes: 1 addition & 1 deletion bundles/nl.esi.comma.scenarios/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ additional.bundles = org.eclipse.xtext.xbase,\
org.apache.commons.logging,\
org.apache.log4j,\
com.ibm.icu,\
nl.esi.xtext.lsp.generator
nl.esi.xplus.xtext.generator
2 changes: 1 addition & 1 deletion bundles/nl.esi.comma.scenarios/src/nl/esi/comma/scenarios/GenerateScenarios.mwe2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ Workflow {
validator = {
// composedCheck = "org.eclipse.xtext.validation.NamesAreUniqueValidator"
}
contentAssist = nl.esi.xtext.lsp.generator.ide.contentassist.IdeContentAssistFragment2 {
contentAssist = nl.esi.xplus.xtext.generator.ide.contentassist.IdeContentAssistFragment2 {
generateXtendStub = true
}
}
Expand Down
2 changes: 1 addition & 1 deletion bundles/nl.esi.comma.steps/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ additional.bundles = org.eclipse.xtext.xbase,\
org.apache.commons.logging,\
org.apache.log4j,\
com.ibm.icu,\
nl.esi.xtext.lsp.generator
nl.esi.xplus.xtext.generator
2 changes: 1 addition & 1 deletion bundles/nl.esi.comma.steps/src/nl/esi/comma/steps/GenerateStep.mwe2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Workflow {
generator = {
generateStub = true
}
contentAssist = nl.esi.xtext.lsp.generator.ide.contentassist.IdeContentAssistFragment2 {
contentAssist = nl.esi.xplus.xtext.generator.ide.contentassist.IdeContentAssistFragment2 {
generateStub = true
}
junitSupport = {
Expand Down
2 changes: 1 addition & 1 deletion bundles/nl.esi.comma.systemconfig/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ additional.bundles = org.eclipse.xtext.xbase,\
org.apache.commons.logging,\
org.apache.log4j,\
com.ibm.icu,\
nl.esi.xtext.lsp.generator
nl.esi.xplus.xtext.generator
2 changes: 1 addition & 1 deletion bundles/nl.esi.comma.systemconfig/src/nl/esi/comma/systemconfig/GenerateConfiguration.mwe2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Workflow {
junitSupport = {
junitVersion = "5"
}
contentAssist = nl.esi.xtext.lsp.generator.ide.contentassist.IdeContentAssistFragment2 {
contentAssist = nl.esi.xplus.xtext.generator.ide.contentassist.IdeContentAssistFragment2 {
generateXtendStub = true
}
}
Expand Down
2 changes: 1 addition & 1 deletion bundles/nl.esi.comma.testspecification/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ additional.bundles = org.eclipse.xtext.xbase,\
org.objectweb.asm,\
org.apache.commons.logging,\
org.apache.log4j,\
nl.esi.xtext.lsp.generator
nl.esi.xplus.xtext.generator
2 changes: 1 addition & 1 deletion ...comma.testspecification/src/nl/esi/comma/testspecification/GenerateTestspecification.mwe2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ Workflow {
generateDeprecationValidation = true
}
generator = null
contentAssist = nl.esi.xtext.lsp.generator.ide.contentassist.IdeContentAssistFragment2 {
contentAssist = nl.esi.xplus.xtext.generator.ide.contentassist.IdeContentAssistFragment2 {
generateXtendStub = true
}
junitSupport = {
Expand Down
1 change: 1 addition & 0 deletions releng/nl.esi.comma.target/nl.esi.comma.target.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="nl.esi.xplus.lsp.feature.feature.group" version="0.0.0"/>
<unit id="nl.esi.xplus.ui.feature.feature.group" version="0.0.0"/>
<unit id="nl.esi.xplus.xtext.generator" version="0.0.0"/>
<repository location="https://TNO.github.io/XPlus/nightly/"/>
</location>
</locations>
Expand Down
Loading