pkg/analysis_server/lib/src/services/refactoring/extract_method.dart - Issue 1527793003: Clean up imports in analysis_server and analyzer_cli (and one missed in analyzer)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: pkg/analysis_server/lib/src/services/refactoring/extract_method.dart

Issue 1527793003: Clean up imports in analysis_server and analyzer_cli (and one missed in analyzer) (Closed) Base URL: https://github.com/dart-lang/sdk.git@master

Patch Set: Created 5 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

« no previous file with comments | « pkg/analysis_server/lib/src/services/refactoring/extract_local.dart ('k') | pkg/analysis_server/lib/src/services/refactoring/inline_local.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: pkg/analysis_server/lib/src/services/refactoring/extract_method.dart

diff --git a/pkg/analysis_server/lib/src/services/refactoring/extract_method.dart b/pkg/analysis_server/lib/src/services/refactoring/extract_method.dart

index 64225fcab0299f739ff60a329a7c6c7377a8d2f6..61352379fd5c39d38bf43e903518510177d9d49b 100644

--- a/pkg/analysis_server/lib/src/services/refactoring/extract_method.dart

+++ b/pkg/analysis_server/lib/src/services/refactoring/extract_method.dart

@@ -20,8 +20,9 @@ import 'package:analysis_server/src/services/refactoring/rename_class_member.dar

import 'package:analysis_server/src/services/refactoring/rename_unit_member.dart';

import 'package:analysis_server/src/services/search/element_visitors.dart';

import 'package:analysis_server/src/services/search/search_engine.dart';

+import 'package:analyzer/dart/element/element.dart';

+import 'package:analyzer/dart/element/type.dart';

import 'package:analyzer/src/generated/ast.dart';

-import 'package:analyzer/src/generated/element.dart';

import 'package:analyzer/src/generated/engine.dart';

import 'package:analyzer/src/generated/java_core.dart';

import 'package:analyzer/src/generated/resolver.dart' show ExitDetector;

@@ -332,8 +333,7 @@ class ExtractMethodRefactoringImpl extends RefactoringImpl

declarationSource = '$annotations$signature$asyncKeyword {$eol';

declarationSource += returnExpressionSource;

if (_returnVariableName != null) {

- declarationSource +=

- '$prefix return $_returnVariableName;$eol';

+ declarationSource += '$prefix return $_returnVariableName;$eol';

}

declarationSource += '$prefix}';

}

@@ -341,8 +341,8 @@ class ExtractMethodRefactoringImpl extends RefactoringImpl

// insert declaration

if (declarationSource != null) {

int offset = _parentMember.end;

- SourceEdit edit = new SourceEdit(

- offset, 0, '$eol$eol$prefix$declarationSource');

+ SourceEdit edit =

+ new SourceEdit(offset, 0, '$eol$eol$prefix$declarationSource');

doSourceChange_addElementEdit(change, unitElement, edit);

}