Merge pull request #49 from google/ddc_strong_mode

strong mode

Author: devoncarew

changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.2.9
+- made ddc (strong mode) compliant
+- fixed an issues returning the TextMarker positions of bookmarks
+
 ## 0.2.8
 - updated to CodeMirror 5.5.0
 - expose `defineExtension` and `defineDocExtension`

lib/codemirror.dart

@@ -1109,21 +1109,32 @@ class TextMarker extends ProxyHolder {
   /**
    * Returns a {from, to} object (both holding document positions), indicating
    * the current position of the marked range, or `null` if the marker is no
-   * longer in the document.
+   * longer in the document. For a bookmark, this list will be length 1.
    */
   List<Position> find() {
     var result = call('find');
     if (result is! JsObject) return null;
+
     try {
-      return [
-        new Position.fromProxy(result['from']),
-        new Position.fromProxy(result['to'])
-      ];
+      if (result is List) {
+        return [
+          new Position.fromProxy(result['from']),
+          new Position.fromProxy(result['to'])
+        ];
+      } else {
+        return [new Position.fromProxy(result)];
+      }
     } catch (e) {
       return null;
     }
   }
 
+  /// Return the first (or only) position in this marker / bookmark.
+  Position findStart() {
+    List<Position> positions = find();
+    return (positions == null || positions.isEmpty) ? null : positions.first;
+  }
+
   /**
    * Call if you've done something that might change the size of the marker (for
    * example changing the content of a replacedWith node), and want to cheaply

lib/hints.dart

@@ -65,7 +65,7 @@ class Hints {
     _init();
 
     JsFunction function = new JsFunction.withThis((win, editor, showHints, [options]) {
-      var results = helper(new CodeMirror.fromJsObject(editor),
+      dynamic results = helper(new CodeMirror.fromJsObject(editor),
           new HintsOptions.fromProxy(options));
 
       if (results is Future) {

pubspec.yaml

@@ -3,7 +3,7 @@
 # license that can be found in the LICENSE file.
 
 name: codemirror
-version: 0.2.8+5.5.0
+version: 0.2.9+5.5.0
 description: A Dart wrapper around the CodeMirror text editor.
 author: Devon Carew <[email protected]>
 homepage: https://github.com/google/codemirror.dart

tool/travis.sh

@@ -14,5 +14,10 @@ dart tool/grind.dart build
 pub global activate tuneup
 pub global run tuneup check
 
+# And that DDC is happy with it.
+pub global activate dev_compiler
+pub global run dev_compiler lib/codemirror.dart
+pub global run dev_compiler lib/hints.dart
+
 # Run the tests.
 #dart test/all.dart