You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2017/03/01 21:04:03 UTC
[6/9] git commit: [flex-falcon] [refs/heads/dual] - ignore internal
abc errors when JS compiling
ignore internal abc errors when JS compiling
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/cb0275a8
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/cb0275a8
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/cb0275a8
Branch: refs/heads/dual
Commit: cb0275a82ada009f26c27db7876bcac8e0dbcf19
Parents: 07aa378
Author: Alex Harui <ah...@apache.org>
Authored: Wed Mar 1 13:00:23 2017 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Mar 1 13:00:23 2017 -0800
----------------------------------------------------------------------
.../internal/units/CompilationUnitBase.java | 23 +++++++++++++++++---
1 file changed, 20 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/cb0275a8/compiler/src/main/java/org/apache/flex/compiler/internal/units/CompilationUnitBase.java
----------------------------------------------------------------------
diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/units/CompilationUnitBase.java b/compiler/src/main/java/org/apache/flex/compiler/internal/units/CompilationUnitBase.java
index 99d656e..0ae3bc0 100644
--- a/compiler/src/main/java/org/apache/flex/compiler/internal/units/CompilationUnitBase.java
+++ b/compiler/src/main/java/org/apache/flex/compiler/internal/units/CompilationUnitBase.java
@@ -68,6 +68,7 @@ import org.apache.flex.compiler.internal.units.requests.RequestMaker;
import org.apache.flex.compiler.internal.units.requests.SyntaxTreeRequestResult;
import org.apache.flex.compiler.mxml.IXMLNameResolver;
import org.apache.flex.compiler.problems.ICompilerProblem;
+import org.apache.flex.compiler.problems.InternalCompilerProblem;
import org.apache.flex.compiler.problems.InternalCompilerProblem2;
import org.apache.flex.compiler.projects.ICompilerProject;
import org.apache.flex.compiler.projects.IFlexProject;
@@ -168,7 +169,7 @@ public abstract class CompilationUnitBase implements ICompilationUnit
{
final boolean isFlex3CSS = ((IFlexProject)project).getCSSManager().isFlex3CSS();
final ImmutableMap<ICSSSelector, String> resolvedSelectors =
- CSSSemanticAnalyzer.resolveSelectors(xmlNameResolver, cssDocument, problems, isFlex3CSS);
+ CSSSemanticAnalyzer.resolveSelectors(xmlNameResolver, cssDocument, problems, (IFlexProject) project, isFlex3CSS);
// Store resolved type selectors required by CSS code generation.
cssCompilationSession.resolvedSelectors.putAll(resolvedSelectors);
@@ -176,6 +177,8 @@ public abstract class CompilationUnitBase implements ICompilationUnit
// Store resolved embed compilation units required by CSS code generation.
for (final ICSSRule cssRule : cssDocument.getRules())
{
+ if (project instanceof IFlexProject && !((IFlexProject)project).isPlatformRule(cssRule))
+ continue;
final Map<CSSFunctionCallPropertyValue, EmbedCompilationUnit> resolvedEmbedProperties =
new HashMap<CSSFunctionCallPropertyValue, EmbedCompilationUnit>();
CSSSemanticAnalyzer.resolveDependencies(
@@ -1052,8 +1055,22 @@ public abstract class CompilationUnitBase implements ICompilationUnit
Collections.addAll(problems, getSyntaxTreeRequest().get().getProblems());
Collections.addAll(problems, getFileScopeRequest().get().getProblems());
Collections.addAll(problems, getOutgoingDependenciesRequest().get().getProblems());
- Collections.addAll(problems, getABCBytesRequest().get().getProblems());
- Collections.addAll(problems, getSWFTagsRequest().get().getProblems());
+ if (targetType == null)
+ {
+ ICompilerProblem[] probs = getABCBytesRequest().get().getProblems();
+ for (ICompilerProblem prob : probs)
+ {
+ if (!(prob instanceof InternalCompilerProblem2))
+ {
+ problems.add(prob);
+ }
+ }
+ }
+ else
+ {
+ Collections.addAll(problems, getABCBytesRequest().get().getProblems());
+ Collections.addAll(problems, getSWFTagsRequest().get().getProblems());
+ }
}
@Override