editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/resolver/ResolverVisitor.java - Issue 592923002: Put union types behind a flag.

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.engine/src/com/google/dart/engine/internal/resolver/ResolverVisitor.java

Issue 592923002: Put union types behind a flag. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Make union-type options available in [AnalysisEngine]. Created 6 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 | « editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/AnalysisEngine.java ('k') | editor/tools/plugins/com.google.dart.engine_test/src/com/google/dart/engine/resolver/HintCodeTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/resolver/ResolverVisitor.java

diff --git a/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/resolver/ResolverVisitor.java b/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/resolver/ResolverVisitor.java

index d5045a239c38d400d8633a13bdd84805c49fecd1..967861c74deb466dc6d269c6afb19fbac28edcaf 100644

--- a/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/resolver/ResolverVisitor.java

+++ b/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/resolver/ResolverVisitor.java

@@ -13,6 +13,7 @@

package com.google.dart.engine.internal.resolver;

+import com.google.dart.engine.AnalysisEngine;

import com.google.dart.engine.ast.Annotation;

import com.google.dart.engine.ast.ArgumentList;

import com.google.dart.engine.ast.AsExpression;

@@ -729,13 +730,15 @@ public class ResolverVisitor extends ScopedVisitor {

overrideManager.applyOverrides(elseOverrides);

}

} else if (!thenIsAbrupt && !elseIsAbrupt) {

- // It would be more precise to ignore the existing override for any variable that

- // is overridden in both branches.

- if (thenOverrides != null) {

- overrideManager.mergeOverrides(thenOverrides);

- }

- if (elseOverrides != null) {

- overrideManager.mergeOverrides(elseOverrides);

+ if (AnalysisEngine.getInstance().getEnableUnionTypes()) {

+ // It would be more precise to ignore the existing override for any variable that

+ // is overridden in both branches.

+ if (thenOverrides != null) {

+ overrideManager.mergeOverrides(thenOverrides);

+ }

+ if (elseOverrides != null) {

+ overrideManager.mergeOverrides(elseOverrides);

+ }

}

return null;