Skip to content

Commit

Permalink
Fix formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
gnodet committed Jan 29, 2019
1 parent faf0ef6 commit f230c87
Showing 1 changed file with 15 additions and 10 deletions.
25 changes: 15 additions & 10 deletions reader/src/main/java/org/jline/reader/impl/DefaultParser.java
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,7 @@ public void setEofOnUnclosedBracket(Bracket... brackets){
openingBrackets = null;
closingBrackets = null;
} else {
Set<Bracket> bs = new HashSet<>();
bs.addAll(Arrays.asList(brackets));
Set<Bracket> bs = new HashSet<>(Arrays.asList(brackets));
openingBrackets = new char[bs.size()];
closingBrackets = new char[bs.size()];
int i = 0;
Expand Down Expand Up @@ -207,10 +206,10 @@ public ParsedLine parse(final String line, final int cursor, ParseContext contex
? "quote" : "dquote");
}
if (bracketChecker.isOpeningBracketMissing() && context != ParseContext.COMPLETE) {
throw new EOFError(-1, -1, "Missing opening bracket", "missing:" + bracketChecker.getMissingOpeningBracket());
throw new EOFError(-1, -1, "Missing opening bracket", "missing: " + bracketChecker.getMissingOpeningBracket());
}
if (bracketChecker.isClosingBracketMissing() && context != ParseContext.COMPLETE) {
throw new EOFError(-1, -1, "Missing closing brackets", "add:" + bracketChecker.getMissingClosingBrackets());
throw new EOFError(-1, -1, "Missing closing brackets", "add: " + bracketChecker.getMissingClosingBrackets());
}

String openingQuote = quoteStart >= 0 ? line.substring(quoteStart, quoteStart + 1) : null;
Expand Down Expand Up @@ -339,7 +338,9 @@ private class BracketChecker {
public BracketChecker(){}

public void check(final CharSequence buffer, final int pos){
if (openingBrackets == null || pos < 0) return;
if (openingBrackets == null || pos < 0) {
return;
}
int bid = bracketId(openingBrackets, buffer, pos);
if (bid >= 0) {
nested.add(bid);
Expand All @@ -360,7 +361,9 @@ public boolean isOpeningBracketMissing(){
}

public String getMissingOpeningBracket(){
if (!isOpeningBracketMissing()) return null;
if (!isOpeningBracketMissing()) {
return null;
}
return Character.toString(openingBrackets[missingOpeningBracket]);
}

Expand All @@ -369,10 +372,12 @@ public boolean isClosingBracketMissing(){
}

public String getMissingClosingBrackets(){
if (!isClosingBracketMissing()) return null;
StringBuilder out = new StringBuilder("");
for (int i=nested.size()-1; i>-1; i--) {
out.append(Character.toString(closingBrackets[nested.get(i)]));
if (!isClosingBracketMissing()) {
return null;
}
StringBuilder out = new StringBuilder();
for (int i = nested.size() - 1; i > -1; i--) {
out.append(closingBrackets[nested.get(i)]);
}
return out.toString();
}
Expand Down

0 comments on commit f230c87

Please sign in to comment.