Skip to content

Bugfix #140 - Do not suppress multiple consecutive spaces #141

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
PhilippSalvisberg merged 2 commits into from
Jan 6, 2022
Merged

Bugfix #140 - Do not suppress multiple consecutive spaces #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
155f3d7
change default host for testing database
PhilippSalvisberg Jan 6, 2022
dde8e11
fixes #140 - Do not suppress multiple consecutive spaces
PhilippSalvisberg Jan 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions sqldev/src/main/java/org/utplsql/sqldev/ui/runner/RunnerPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -923,6 +923,13 @@ private String getLinkedAndFormattedText(final String text) {
localText = localText.substring(0, start) + title + localText.substring(end);
m = p3.matcher(localText);
}
// replaces two consecutive spaces with two non-breaking spaces to fix #140
// assume that consecutive spaces do not conflict with previous replacements
// using CSS "white-space: pre-wrap;" does not work within Swing, it's simply ignored.
// See https://docs.oracle.com/javase/8/docs/api/javax/swing/text/html/CSS.html
// putting text in pre tags is not an option, because this suppresses wrap.
localText = localText.replaceAll(" ", "  ");
// add paragraph for each line to preserve line breaks
StringBuilder sb = new StringBuilder();
for (final String p : localText.split("\n")) {
sb.append("<p>");
Expand Down
2 changes: 1 addition & 1 deletion sqldev/src/test/resources/test.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# properties to connect to Oracle Database using JDBC thin driver
host=localhost
host=fillmore
port=1521
service=odb.docker

Expand Down