compiler/java/com/google/dart/compiler/resolver/MixinScope.java - Issue 12335071: Issue 8705. Fix for NPE when use method from mixin inside of class.

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: compiler/java/com/google/dart/compiler/resolver/MixinScope.java

Issue 12335071: Issue 8705. Fix for NPE when use method from mixin inside of class. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Created 7 years, 10 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/java/com/google/dart/compiler/resolver/ClassScope.java ('k') | compiler/javatests/com/google/dart/compiler/type/TypeAnalyzerCompilerTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: compiler/java/com/google/dart/compiler/resolver/MixinScope.java

diff --git a/compiler/java/com/google/dart/compiler/resolver/MixinScope.java b/compiler/java/com/google/dart/compiler/resolver/MixinScope.java

index aafa4800c13336487604d67ac4f3f3503a9392f6..e40ff71f0e0bc1eb7167a84464b207589e5e3fb8 100644

--- a/compiler/java/com/google/dart/compiler/resolver/MixinScope.java

+++ b/compiler/java/com/google/dart/compiler/resolver/MixinScope.java

@@ -8,11 +8,11 @@ package com.google.dart.compiler.resolver;

* Lexical scope corresponding to a mixin.

class MixinScope extends Scope {

- private final ClassElement classElement;

+ private final ClassElement mixinElement;

- MixinScope(ClassElement classElement, Scope parent) {

- super(classElement.getName(), parent.getLibrary(), parent);

- this.classElement = classElement;

+ MixinScope(ClassElement mixinElement) {

+ super(mixinElement.getName(), mixinElement.getLibrary(), null);

+ this.mixinElement = mixinElement;

}

@Override

@@ -22,6 +22,6 @@ class MixinScope extends Scope {

@Override

public Element findLocalElement(String name) {

- return Elements.findElement(classElement, name);

+ return Elements.findElement(mixinElement, name);

}