update to analyzer 0.27.0
diff --git a/CHANGELOG.md b/CHANGELOG.md index 5063d31..43e5553 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md
@@ -1,3 +1,7 @@ +## 0.3.1 + +* Update to analyzer `>=0.27.0 <0.28.0`. + ## 0.3.0+1 * Upgrade `test` to a real dependency.
diff --git a/lib/src/resolver_impl.dart b/lib/src/resolver_impl.dart index 9670c3a..73e7750 100644 --- a/lib/src/resolver_impl.dart +++ b/lib/src/resolver_impl.dart
@@ -255,7 +255,8 @@ SourceSpan getSourceSpan(Element element) { var sourceFile = getSourceFile(element); if (sourceFile == null) return null; - return sourceFile.span(element.node.offset, element.node.end); + return sourceFile.span( + element.computeNode().offset, element.computeNode().end); } TextEditTransaction createTextEditTransaction(Element element) { @@ -289,7 +290,6 @@ /// Implementation of Analyzer's Source for Barback based assets. class _AssetBasedSource extends Source { - /// Asset ID where this source can be found. final AssetId assetId;
diff --git a/lib/src/resolvers.dart b/lib/src/resolvers.dart index fa2f953..cb02ea8 100644 --- a/lib/src/resolvers.dart +++ b/lib/src/resolvers.dart
@@ -9,6 +9,7 @@ import 'package:analyzer/src/generated/engine.dart' show AnalysisOptions; import 'package:analyzer/src/generated/sdk.dart' show DartSdk; +import 'package:analyzer/src/generated/engine.dart'; import 'package:analyzer/src/generated/source.dart' show DartUriResolver; import 'entry_point.dart'; @@ -33,6 +34,7 @@ Resolvers.fromSdk(this.dartSdk, this.dartUriResolver, {this.options}); factory Resolvers(dartSdkDirectory, {AnalysisOptions options}) { + _initAnalysisEngine(); var sdk = new DirectoryBasedDartSdkProxy(dartSdkDirectory); var uriResolver = new DartUriResolverProxy(sdk); return new Resolvers.fromSdk(sdk, uriResolver, options: options); @@ -40,6 +42,7 @@ factory Resolvers.fromMock(Map<String, String> sources, {bool reportMissing: false, AnalysisOptions options}) { + _initAnalysisEngine(); var sdk = new MockDartSdk(sources, reportMissing: reportMissing); return new Resolvers.fromSdk(sdk, sdk.resolver, options: options); } @@ -120,3 +123,10 @@ /// Return a Future to indicate when apply is completed. applyResolver(Transform transform, Resolver resolver); } + +bool _analysisEngineInitialized = false; +_initAnalysisEngine() { + if (_analysisEngineInitialized) return; + _analysisEngineInitialized = true; + AnalysisEngine.instance.processRequiredPlugins(); +}
diff --git a/pubspec.yaml b/pubspec.yaml index 014f81d..f41da73 100644 --- a/pubspec.yaml +++ b/pubspec.yaml
@@ -1,12 +1,12 @@ name: code_transformers -version: 0.3.0+1 +version: 0.3.1 author: Dart Team <misc@dartlang.org> description: Collection of utilities related to creating barback transformers. homepage: https://github.com/dart-lang/code-transformers environment: sdk: '>=1.0.0 <2.0.0' dependencies: - analyzer: '>=0.26.0 <0.27.0' + analyzer: '>=0.27.0 <0.28.0' barback: '>=0.14.2 <0.16.0' cli_util: '>=0.0.1 <0.1.0' path: '>=0.9.0 <2.0.0'