Bugfix + test cases added, closes #106

de-jcup · de-jcup · commit 0802a02b8bad · 2018-02-17T02:48:20.000+01:00
- another commit, was necessary because of having merge problems
  (branch was still in rebase mode)
diff --git a/basheditor-plugin/src/main/java/de/jcup/basheditor/script/parser/HereDocParserSupport.java b/basheditor-plugin/src/main/java/de/jcup/basheditor/script/parser/HereDocParserSupport.java
@@ -218,6 +218,7 @@ private boolean isEndLiteralFound(String originLiteralToFind, StringBuilder part
 	private boolean isLiteralWhenFirstAndLastCharsRemoved(String literalToFind, String partScanString) {
 		int beginIndex = 1;
 		int endIndex = literalToFind.length() - beginIndex;
+
 		if (endIndex<=beginIndex){
 			return false;
 		}
diff --git a/basheditor-plugin/src/test/java/de/jcup/basheditor/script/parser/TokenParserTest.java b/basheditor-plugin/src/test/java/de/jcup/basheditor/script/parser/TokenParserTest.java
@@ -45,7 +45,6 @@ public void bug_106_cat_with_heredoc_followed_by_negative_and_string_throws_no_e
 	public void bug_106_cat_with_heredoc_followed_by_negative_and_string_has_expected_tokens() throws Exception{
 		assertParsing("cat <<-\" OF\"").resultsIn("cat","<<-\" OF\"");
 	}
-
 	
 	@Test
 	public void bug_105_$_directly_followed_by_simple_string() throws Exception {

Original file line number	Diff line number	Diff line change
`@@ -218,6 +218,7 @@ private boolean isEndLiteralFound(String originLiteralToFind, StringBuilder part`
`218`	`218`	`private boolean isLiteralWhenFirstAndLastCharsRemoved(String literalToFind, String partScanString) {`
`219`	`219`	`int beginIndex = 1;`
`220`	`220`	`int endIndex = literalToFind.length() - beginIndex;`
	`221`	`+`
`221`	`222`	`if (endIndex<=beginIndex){`
`222`	`223`	`return false;`
`223`	`224`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,6 @@ public void bug_106_cat_with_heredoc_followed_by_negative_and_string_throws_no_e`
`45`	`45`	`public void bug_106_cat_with_heredoc_followed_by_negative_and_string_has_expected_tokens() throws Exception{`
`46`	`46`	`assertParsing("cat <<-\" OF\"").resultsIn("cat","<<-\" OF\"");`
`47`	`47`	`}`
`48`		`-`
`49`	`48`
`50`	`49`	`@Test`
`51`	`50`	`public void bug_105_$_directly_followed_by_simple_string() throws Exception {`