Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(348)

Unified Diff: editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/dart/DartStringDoubleClickSelector.java

Issue 121733002: Fix double-clicking in string interpolation (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/dart/DartStringDoubleClickSelector.java
diff --git a/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/dart/DartStringDoubleClickSelector.java b/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/dart/DartStringDoubleClickSelector.java
index 4752b50e23bd0e572d8b4162e9ca83a8351e9678..28ab21cfd30362511a0cc8a85ab1c91da42ac06d 100644
--- a/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/dart/DartStringDoubleClickSelector.java
+++ b/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/dart/DartStringDoubleClickSelector.java
@@ -13,6 +13,11 @@
*/
package com.google.dart.tools.ui.internal.text.dart;
+import com.google.dart.engine.ast.ASTNode;
+import com.google.dart.engine.ast.InterpolationString;
+import com.google.dart.engine.ast.visitor.NodeLocator;
+import com.google.dart.tools.ui.internal.text.editor.CompilationUnitEditor;
+
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
@@ -40,6 +45,22 @@ public class DartStringDoubleClickSelector extends DartDoubleClickSelector {
textViewer.setSelectedRange(region.getOffset(), region.getLength());
} else {
region = selectWord(document, offset);
+ try {
+ String selected = document.get(region.getOffset(), region.getLength());
+ if (selected.indexOf('$') >= 0) {
+ CompilationUnitEditor editor = ((CompilationUnitEditor.AdaptedSourceViewer) textViewer).getEditor();
+ NodeLocator locator = new NodeLocator(offset);
+ ASTNode node = locator.searchWithin(editor.getInputUnit());
+ if (node instanceof InterpolationString) {
+ IRegion strRegion = computeStringRegion(node);
+ if (strRegion != null) {
+ region = strRegion;
+ }
+ }
+ }
+ } catch (BadLocationException ex) {
+ // ignore it
+ }
textViewer.setSelectedRange(region.getOffset(), region.getLength());
}
}

Powered by Google App Engine
This is Rietveld 408576698