FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

parser cleanup by andimarek · Pull Request #4442 · graphql-java/graphql-java · GitHub

/ graphql-java Public

parser cleanup #4442

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
andimarek merged 1 commit into from
Aug 22, 2026
+38 −38
Conversation 3 Commits 1 Checks 12 Files changed 2
Merged

parser cleanup #4442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension .groovy  (1) .java  (1) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
53 changes: 15 additions & 38 deletions src/main/java/graphql/parser/StringValueParsing.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
import graphql.language.SourceLocation;

import java.io.StringWriter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

/**
* Contains parsing code for the StringValue types in the grammar
Expand Down Expand Up @@ -44,45 +41,25 @@ public static String removeIndentation(String rawValue) {
}
}
}
List<String> lineList = new ArrayList<>(Arrays.asList(lines));
if (commonIndent != null) {

bbakerman Aug 21, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

The old code didnt do any work if commonIndent == null - can we do the same ??
for (int i = 0; i < lineList.size(); i++) {
String line = lineList.get(i);
if (i == 0) {
continue;
}
if (line.length() > commonIndent) {
line = line.substring(commonIndent);
lineList.set(i, line);
}
}
int firstLine = 0;
while (firstLine < lines.length && containsOnlyWhiteSpace(lines[firstLine])) {
firstLine++;
}
while (!lineList.isEmpty()) {
String line = lineList.get(0);
if (containsOnlyWhiteSpace(line)) {
lineList.remove(0);
} else {
break;
}
int lastLine = lines.length;
while (lastLine > firstLine && containsOnlyWhiteSpace(lines[lastLine - 1])) {
lastLine--;
}
while (!lineList.isEmpty()) {
int endIndex = lineList.size() - 1;
String line = lineList.get(endIndex);
if (containsOnlyWhiteSpace(line)) {
lineList.remove(endIndex);
} else {
break;

StringBuilder formatted = new StringBuilder(rawValue.length());
for (int i = firstLine; i < lastLine; i++) {
String line = lines[i];
if (commonIndent != null && i > 0 && line.length() > commonIndent) {
line = line.substring(commonIndent);
}
}
StringBuilder formatted = new StringBuilder();
for (int i = 0; i < lineList.size(); i++) {
String line = lineList.get(i);
if (i == 0) {
formatted.append(line);
} else {
formatted.append("\n");
formatted.append(line);
if (i > firstLine) {
formatted.append('\n');
}
formatted.append(line);
}
return formatted.toString();
}
Expand Down
23 changes: 23 additions & 0 deletions src/test/groovy/graphql/parser/StringValueParsingTest.groovy
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package graphql.parser

import graphql.i18n.I18n
import graphql.language.SourceLocation
import graphql.language.StringValue
import spock.lang.Specification

import static java.util.Arrays.asList
Expand Down Expand Up @@ -226,4 +227,26 @@ L 2
L 3'''
parsed == expected
}

def "removes large runs of leading and trailing blank lines"() {
given:
def input = "\n".repeat(20_000) + " value" + "\n ".repeat(20_000)

when:
String parsed = StringValueParsing.removeIndentation(input)

then:
parsed == "value"
}

def "full parser handles block strings with many leading and trailing blank lines"() {
given:
def input = '"""' + "\n".repeat(20_000) + " value" + "\n ".repeat(20_000) + '"""'

when:
StringValue parsed = Parser.parseValue(input)

then:
parsed.getValue() == "value"
}
}
Loading
Back | FazBrowse Home | New Git URL