avoid NPEs when no selection

benfry · benfry · commit a683aa83339b · 2017-10-20T17:19:29.000-04:00
diff --git a/app/src/processing/app/ui/Editor.java b/app/src/processing/app/ui/Editor.java
@@ -2222,7 +2222,7 @@ public void handleIndentOutdent(boolean indent) {
         int last = Math.min(location + tabSize, textarea.getDocumentLength());
         textarea.select(location, last);
         // Don't eat code if it's not indented
-        if (textarea.getSelectedText().equals(tabString)) {
+        if (tabString.equals(textarea.getSelectedText())) {
           textarea.setSelectedText("");
         }
       }
@@ -2321,11 +2321,11 @@ protected void handleFindReference() {
     if (ref != null) {
       showReference(ref + ".html");
     } else {
-      String text = textarea.getSelectedText().trim();
-      if (text.length() == 0) {
+      String text = textarea.getSelectedText();
+      if (text == null) {
         statusNotice(Language.text("editor.status.find_reference.select_word_first"));
       } else {
-        statusNotice(Language.interpolate("editor.status.find_reference.not_available", text));
+        statusNotice(Language.interpolate("editor.status.find_reference.not_available", text.trim()));
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -2222,7 +2222,7 @@ public void handleIndentOutdent(boolean indent) {`
`2222`	`2222`	`int last = Math.min(location + tabSize, textarea.getDocumentLength());`
`2223`	`2223`	`textarea.select(location, last);`
`2224`	`2224`	`// Don't eat code if it's not indented`
`2225`		`- if (textarea.getSelectedText().equals(tabString)) {`
	`2225`	`+ if (tabString.equals(textarea.getSelectedText())) {`
`2226`	`2226`	`textarea.setSelectedText("");`
`2227`	`2227`	`}`
`2228`	`2228`	`}`
`@@ -2321,11 +2321,11 @@ protected void handleFindReference() {`
`2321`	`2321`	`if (ref != null) {`
`2322`	`2322`	`showReference(ref + ".html");`
`2323`	`2323`	`} else {`
`2324`		`- String text = textarea.getSelectedText().trim();`
`2325`		`- if (text.length() == 0) {`
	`2324`	`+ String text = textarea.getSelectedText();`
	`2325`	`+ if (text == null) {`
`2326`	`2326`	`statusNotice(Language.text("editor.status.find_reference.select_word_first"));`
`2327`	`2327`	`} else {`
`2328`		`- statusNotice(Language.interpolate("editor.status.find_reference.not_available", text));`
	`2328`	`+ statusNotice(Language.interpolate("editor.status.find_reference.not_available", text.trim()));`
`2329`	`2329`	`}`
`2330`	`2330`	`}`
`2331`	`2331`	`}`