File tree Expand file tree Collapse file tree 2 files changed +14
-13
lines changed
drift_dev/lib/src/analysis Expand file tree Collapse file tree 2 files changed +14
-13
lines changed Original file line number Diff line number Diff line change @@ -11,11 +11,10 @@ class DriftAnalysisError {
1111 DriftAnalysisError (this .span, this .message);
1212
1313 factory DriftAnalysisError .forDartElement (
14- dart.Element2 element, String message) {
15- return DriftAnalysisError (
16- spanForElement2 (element),
17- message,
18- );
14+ dart.Element2 element,
15+ String message,
16+ ) {
17+ return DriftAnalysisError (spanForElement (element), message);
1918 }
2019
2120 factory DriftAnalysisError .inDartAst (
@@ -51,8 +50,10 @@ class DriftAnalysisError {
5150 }
5251
5352 static FileSpan dartAstSpan (
54- dart.Element2 element, dart.SyntacticEntity entity) {
55- final span = spanForElement2 (element) as FileSpan ;
53+ dart.Element2 element,
54+ dart.SyntacticEntity entity,
55+ ) {
56+ final span = spanForElement (element) as FileSpan ;
5657 return span.file.span (entity.offset, entity.end);
5758 }
5859}
Original file line number Diff line number Diff line change @@ -200,16 +200,16 @@ class _FindDartElements extends RecursiveElementVisitor2<void> {
200200 // weird errors for the Table class itself. In weird cases where we iterate
201201 // over generated code (standalone tool), don't report existing
202202 // implementations as tables.
203- return _isTable.isAssignableFrom2 (element) &&
204- ! _isTable.isExactly2 (element) &&
205- ! _isTableInfo.isAssignableFrom2 (element) &&
203+ return _isTable.isAssignableFrom (element) &&
204+ ! _isTable.isExactly (element) &&
205+ ! _isTableInfo.isAssignableFrom (element) &&
206206 // Temporary workaround until https://github.com/dart-lang/source_gen/pull/628
207207 // gets merged.
208208 ! element.mixins.any ((e) => e.nameIfInterfaceType == 'TableInfo' );
209209 }
210210
211211 bool _isDslView (ClassElement2 element) {
212- return _isView.isAssignableFrom2 (element) && ! _isView.isExactly2 (element);
212+ return _isView.isAssignableFrom (element) && ! _isView.isExactly (element);
213213 }
214214
215215 @override
@@ -245,8 +245,8 @@ class _FindDartElements extends RecursiveElementVisitor2<void> {
245245 } else {
246246 // Check if this class declares a database or a database accessor.
247247
248- final firstDb = _isDatabase.firstAnnotationOf2 (element);
249- final firstDao = _isDao.firstAnnotationOf2 (element);
248+ final firstDb = _isDatabase.firstAnnotationOf (element);
249+ final firstDao = _isDao.firstAnnotationOf (element);
250250 final id = _discoverStep._id (element.name3! );
251251
252252 if (firstDb != null ) {
You can’t perform that action at this time.
0 commit comments