editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/internal/corext/refactoring/code/ExtractUtils.java - Issue 10939027: Issue 5116. Support both 'dynamic' and 'Dynamic'

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: editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/internal/corext/refactoring/code/ExtractUtils.java

Issue 10939027: Issue 5116. Support both 'dynamic' and 'Dynamic' (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Use DartParser.DYNAMIC_KEYWORD Created 8 years, 3 months 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 | « compiler/javatests/com/google/dart/compiler/type/TypeAnalyzerCompilerTest.java ('k') | editor/tools/plugins/com.google.dart.tools.ui_test/src/com/google/dart/tools/ui/refactoring/ExtractUtilsTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/internal/corext/refactoring/code/ExtractUtils.java

diff --git a/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/internal/corext/refactoring/code/ExtractUtils.java b/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/internal/corext/refactoring/code/ExtractUtils.java

index 278fc0fdbb6a9f3a8d8c3b2d4a3a2d0d0919ca5e..4e45a81b4a0f164946a84697af3dfccd735c7f34 100644

--- a/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/internal/corext/refactoring/code/ExtractUtils.java

+++ b/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/internal/corext/refactoring/code/ExtractUtils.java

@@ -23,6 +23,7 @@ import com.google.dart.compiler.ast.DartStatement;

import com.google.dart.compiler.ast.DartUnit;

import com.google.dart.compiler.common.HasSourceInfo;

import com.google.dart.compiler.common.SourceInfo;

+import com.google.dart.compiler.parser.DartParser;

import com.google.dart.compiler.parser.DartScanner;

import com.google.dart.compiler.parser.Token;

import com.google.dart.compiler.type.Type;

@@ -108,7 +109,10 @@ public class ExtractUtils {

}

Type type = expression.getType();

String typeSource = getTypeSource(type);

- if ("Dynamic".equals(typeSource)) {

+ if ("dynamic".equals(typeSource)) {

+ return null;

+ }

+ if (DartParser.DYNAMIC_KEYWORD_DEPRECATED.equals(typeSource)) {

return null;

}

return typeSource;

@@ -119,8 +123,14 @@ public class ExtractUtils {

public static String getTypeSource(Type type) {

String typeSource = type.toString();

- typeSource = StringUtils.replace(typeSource, "<Dynamic>", "");

- typeSource = StringUtils.replace(typeSource, "<Dynamic, Dynamic>", "");

+ typeSource = StringUtils.replace(typeSource, "<dynamic>", "");

+ typeSource = StringUtils.replace(typeSource, "<dynamic, dynamic>", "");

+ typeSource = StringUtils.replace(

+ typeSource,

+ "<" + DartParser.DYNAMIC_KEYWORD_DEPRECATED + ">",

+ "");

+ typeSource = StringUtils.replace(typeSource, "<" + DartParser.DYNAMIC_KEYWORD_DEPRECATED + ", "

+ + DartParser.DYNAMIC_KEYWORD_DEPRECATED + ">", "");

return typeSource;

}