Skip to content

Commit

Permalink
Revert of DevTools: improve SCSS parser to correctly handle variable …
Browse files Browse the repository at this point in the history
…expansions (patchset #1 id:1 of https://codereview.chromium.org/1713783003/ )

Reason for revert:
Broke WebKit Linux webkit_tests: https://build.chromium.org/p/chromium.webkit/builders/WebKit%20Linux/builds/60992

Original issue's description:
> DevTools: improve SCSS parser to correctly handle variable expansions
>
> The patch improves SCSS parser to not get stuck after encountering
> variable expansion.
>
> BUG=527993
> R=pfeldman, dgozman
>
> Committed: https://crrev.com/dca95714bf140aa7f672ee80ae25a14ea7295eb2
> Cr-Commit-Position: refs/heads/master@{#376489}

[email protected],[email protected],[email protected]
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=527993

Review URL: https://codereview.chromium.org/1712363002

Cr-Commit-Position: refs/heads/master@{#376533}
  • Loading branch information
imcheng authored and Commit bot committed Feb 19, 2016
1 parent 7a2d28f commit c8d03ed
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions front_end/sass/SASSSupport.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ WebInspector.SASSSupport.SCSSParserStates = {
VariableValue: "VariableValue",
MixinName: "MixinName",
MixinValue: "MixinValue",
Media: "Media"
Media: "Media",
}

/**
Expand Down Expand Up @@ -139,9 +139,7 @@ WebInspector.SASSSupport._innerParseSCSS = function(document, tokenizerFactory)
}
break;
case States.VariableName:
if (tokenValue === "}" && tokenType === UndefTokenType) {
state = States.Initial;
} else if (tokenValue === ")" && tokenType === UndefTokenType) {
if (tokenValue === ")" && tokenType === UndefTokenType) {
state = States.Initial;
} else if (tokenValue === ":" && tokenType === UndefTokenType) {
state = States.VariableValue;
Expand Down

0 comments on commit c8d03ed

Please sign in to comment.