spring-projectsgh-277: parse commented line like an empty line

polo7 · Jun 8, 2024 · 33757f3 · 33757f3
1 parent 3ee49e8
commit 33757f3
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/spring-shell-core/src/main/java/org/springframework/shell/jline/FileInputProvider.java b/spring-shell-core/src/main/java/org/springframework/shell/jline/FileInputProvider.java
@@ -66,7 +66,13 @@ public Input readInput() {
         if (line == null) {
             return null;
         } else {
-            ParsedLine parsedLine = parser.parse(sb.toString(), sb.toString().length());
+			// gh-277: if it's a commented line then skip as it is equal to NO_INPUT
+			ParsedLine parsedLine;
+			if (isCommentedLine(line)) {
+				parsedLine = parser.parse("", -1, Parser.ParseContext.COMPLETE);
+			} else {
+				parsedLine = parser.parse(sb.toString(), sb.toString().length());
+			}
             return new ParsedLineInput(parsedLine);
         }
     }
@@ -75,4 +81,8 @@ public Input readInput() {
     public void close() throws IOException {
         reader.close();
     }
+
+	private boolean isCommentedLine(String line) {
+		return line.matches("\\s*//.*");
+	}
 }