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:05 UTC
[8/9] git commit: [flex-falcon] [refs/heads/dual] - part of rule
skipping fix
part of rule skipping fix
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/383abc88
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/383abc88
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/383abc88
Branch: refs/heads/dual
Commit: 383abc88eb24b3f6b7b80a68dec2f09aea5970bf
Parents: 0f20898
Author: Alex Harui <ah...@apache.org>
Authored: Wed Mar 1 13:02:58 2017 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Mar 1 13:02:58 2017 -0800
----------------------------------------------------------------------
.../internal/css/semantics/CSSSemanticAnalyzer.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/383abc88/compiler/src/main/java/org/apache/flex/compiler/internal/css/semantics/CSSSemanticAnalyzer.java
----------------------------------------------------------------------
diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/css/semantics/CSSSemanticAnalyzer.java b/compiler/src/main/java/org/apache/flex/compiler/internal/css/semantics/CSSSemanticAnalyzer.java
index 64dfa7f..e2f244c 100644
--- a/compiler/src/main/java/org/apache/flex/compiler/internal/css/semantics/CSSSemanticAnalyzer.java
+++ b/compiler/src/main/java/org/apache/flex/compiler/internal/css/semantics/CSSSemanticAnalyzer.java
@@ -219,12 +219,13 @@ public class CSSSemanticAnalyzer
final IXMLNameResolver xmlNameResolver,
final ICSSDocument css,
final Collection<ICompilerProblem> problems,
+ final IFlexProject project,
final boolean isCompatibilityVersion3)
{
assert xmlNameResolver != null : "Expected xmlNameResolver";
assert css != null : "Expected CSS";
- final ImmutableSet<ICSSSelector> allSelectors = getAllSelectors(css);
+ final ImmutableSet<ICSSSelector> allSelectors = getAllSelectors(css, project);
if (isCompatibilityVersion3)
return resolveSelectorsAsFlex3Style(allSelectors);
@@ -314,13 +315,15 @@ public class CSSSemanticAnalyzer
* @param document CSS document
* @return All the selectors in the CSS.
*/
- public static ImmutableSet<ICSSSelector> getAllSelectors(final ICSSDocument document)
+ public static ImmutableSet<ICSSSelector> getAllSelectors(final ICSSDocument document, final IFlexProject project)
{
assert document != null : "Expected CSS document";
final ImmutableSet.Builder<ICSSSelector> builder = new ImmutableSet.Builder<ICSSSelector>();
for (final ICSSRule rule : document.getRules())
{
+ if (!project.isPlatformRule(rule))
+ continue;
for (final ICSSSelector subject : rule.getSelectorGroup())
{
ICSSSelector selector = subject;
@@ -469,7 +472,7 @@ public class CSSSemanticAnalyzer
{
final boolean isFlex3CSS = flexProject.getCSSManager().isFlex3CSS();
final ImmutableMap<ICSSSelector, String> resolvedSelectors =
- resolveSelectors(flexProject, cssDocument, problems, isFlex3CSS);
+ resolveSelectors(flexProject, cssDocument, problems, flexProject, isFlex3CSS);
final Predicate<ICSSRule> predicate;
if (isFlex3CSS)
{