From 91bb150031bea541665b83a7884e9853495c9e45 Mon Sep 17 00:00:00 2001 From: albireo77 Date: Sun, 22 Mar 2020 17:47:36 +0100 Subject: [PATCH] Updates --- ChangeLog | 7 +++++++ CodeGenerators/Java_Generator.pas | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 19922dcf..d1ea69f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +8.0 [22.03.2020] +- compiled with Delphi 10.3.3 +- Flowchart: auto-resizable edit boxes in for..do block +- Java support: add java.util.regex.Pattern class +- Settings: add EditorRightEdgeColumn and EditorRightEdgeColor settings (at the moment not supported in UI) +- minor optimizations + 7.21 [16.11.2019] - Editor: fix displaying gutter on dark background - Settings: add command example to Compiler command box hint diff --git a/CodeGenerators/Java_Generator.pas b/CodeGenerators/Java_Generator.pas index 11d5b191..0ba557da 100644 --- a/CodeGenerators/Java_Generator.pas +++ b/CodeGenerators/Java_Generator.pas @@ -548,7 +548,7 @@ function Java_GetConstantType(const AValue: string; var AGenericType: string): i else Exit; end - else if AValue.StartsWith('new String(' + JAVA_STRING_DELIM) and AValue.EndsWith(JAVA_STRING_DELIM + ')') then + else if AValue.StartsWith('new String(' + JAVA_STRING_DELIM) and AValue.EndsWith(JAVA_STRING_DELIM + ')') and (AValue.Length > 13) then result := JAVA_STRING_TYPE else if StartsWithOneOf(AValue, ['String.valueOf(', 'String.join(', 'String.format(']) and (lastChar = ')') then result := JAVA_STRING_TYPE