| Index: third_party/WebKit/Source/devtools/front_end/sass/SASSSourceMapFactory.js
|
| diff --git a/third_party/WebKit/Source/devtools/front_end/sass/SASSSourceMapFactory.js b/third_party/WebKit/Source/devtools/front_end/sass/SASSSourceMapFactory.js
|
| index fffaa53f1fca832f6683631f3bb30f584b679002..5375c2b5cce7927cb43220de276ab29c2d5bb636 100644
|
| --- a/third_party/WebKit/Source/devtools/front_end/sass/SASSSourceMapFactory.js
|
| +++ b/third_party/WebKit/Source/devtools/front_end/sass/SASSSourceMapFactory.js
|
| @@ -2,35 +2,35 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
| /**
|
| - * @implements {WebInspector.SourceMapFactory}
|
| + * @implements {SDK.SourceMapFactory}
|
| * @unrestricted
|
| */
|
| -WebInspector.SASSSourceMapFactory = class {
|
| +Sass.SASSSourceMapFactory = class {
|
| constructor() {
|
| - this._astService = new WebInspector.ASTService();
|
| + this._astService = new Sass.ASTService();
|
| }
|
|
|
| /**
|
| * @override
|
| - * @param {!WebInspector.Target} target
|
| - * @param {!WebInspector.SourceMap} sourceMap
|
| - * @return {!Promise<?WebInspector.SourceMap>}
|
| + * @param {!SDK.Target} target
|
| + * @param {!SDK.SourceMap} sourceMap
|
| + * @return {!Promise<?SDK.SourceMap>}
|
| */
|
| editableSourceMap(target, sourceMap) {
|
| - var cssModel = WebInspector.CSSModel.fromTarget(target);
|
| + var cssModel = SDK.CSSModel.fromTarget(target);
|
| if (!cssModel)
|
| - return Promise.resolve(/** @type {?WebInspector.SourceMap} */ (null));
|
| + return Promise.resolve(/** @type {?SDK.SourceMap} */ (null));
|
|
|
| var header =
|
| cssModel.styleSheetHeaders().find(styleSheetHeader => styleSheetHeader.sourceMapURL === sourceMap.url());
|
| if (!header)
|
| - return Promise.resolve(/** @type {?WebInspector.SourceMap} */ (null));
|
| + return Promise.resolve(/** @type {?SDK.SourceMap} */ (null));
|
|
|
| - /** @type {!Map<string, !WebInspector.SASSSupport.AST>} */
|
| + /** @type {!Map<string, !Sass.SASSSupport.AST>} */
|
| var models = new Map();
|
| var promises = [];
|
| for (let url of sourceMap.sourceURLs()) {
|
| - var contentProvider = sourceMap.sourceContentProvider(url, WebInspector.resourceTypes.SourceMapStyleSheet);
|
| + var contentProvider = sourceMap.sourceContentProvider(url, Common.resourceTypes.SourceMapStyleSheet);
|
| var sassPromise = contentProvider.requestContent()
|
| .then(text => this._astService.parseSCSS(url, text || ''))
|
| .then(ast => models.set(ast.document.url, ast));
|
| @@ -45,28 +45,28 @@ WebInspector.SASSSourceMapFactory = class {
|
|
|
| return Promise.all(promises)
|
| .then(this._onSourcesParsed.bind(this, sourceMap, models))
|
| - .catchException(/** @type {?WebInspector.SourceMap} */ (null));
|
| + .catchException(/** @type {?SDK.SourceMap} */ (null));
|
| }
|
|
|
| /**
|
| - * @param {!WebInspector.SourceMap} sourceMap
|
| - * @param {!Map<string, !WebInspector.SASSSupport.AST>} models
|
| - * @return {?WebInspector.SourceMap}
|
| + * @param {!SDK.SourceMap} sourceMap
|
| + * @param {!Map<string, !Sass.SASSSupport.AST>} models
|
| + * @return {?SDK.SourceMap}
|
| */
|
| _onSourcesParsed(sourceMap, models) {
|
| - var editCallback = WebInspector.SASSProcessor.processCSSEdits.bind(WebInspector.SASSProcessor, this._astService);
|
| - var map = new WebInspector.ASTSourceMap(sourceMap.compiledURL(), sourceMap.url(), models, editCallback);
|
| + var editCallback = Sass.SASSProcessor.processCSSEdits.bind(Sass.SASSProcessor, this._astService);
|
| + var map = new Sass.ASTSourceMap(sourceMap.compiledURL(), sourceMap.url(), models, editCallback);
|
| var valid = true;
|
| map.compiledModel().visit(onNode);
|
| return valid ? map : null;
|
|
|
| /**
|
| - * @param {!WebInspector.SASSSupport.Node} cssNode
|
| + * @param {!Sass.SASSSupport.Node} cssNode
|
| */
|
| function onNode(cssNode) {
|
| if (!valid)
|
| return;
|
| - if (!(cssNode instanceof WebInspector.SASSSupport.TextNode))
|
| + if (!(cssNode instanceof Sass.SASSSupport.TextNode))
|
| return;
|
| var entry = sourceMap.findEntry(cssNode.range.startLine, cssNode.range.startColumn);
|
| if (!entry || !entry.sourceURL || typeof entry.sourceLineNumber === 'undefined' ||
|
| @@ -78,7 +78,7 @@ WebInspector.SASSSourceMapFactory = class {
|
| var sassNode = sassAST.findNodeForPosition(entry.sourceLineNumber, entry.sourceColumnNumber);
|
| if (!sassNode)
|
| return;
|
| - if (cssNode.parent && (cssNode.parent instanceof WebInspector.SASSSupport.Property) &&
|
| + if (cssNode.parent && (cssNode.parent instanceof Sass.SASSSupport.Property) &&
|
| cssNode === cssNode.parent.name && cssNode.text.trim() !== sassNode.text.trim()) {
|
| valid = false;
|
| reportError(cssNode, sassNode);
|
| @@ -88,17 +88,17 @@ WebInspector.SASSSourceMapFactory = class {
|
| }
|
|
|
| /**
|
| - * @param {!WebInspector.SASSSupport.TextNode} cssNode
|
| - * @param {!WebInspector.SASSSupport.TextNode} sassNode
|
| + * @param {!Sass.SASSSupport.TextNode} cssNode
|
| + * @param {!Sass.SASSSupport.TextNode} sassNode
|
| */
|
| function reportError(cssNode, sassNode) {
|
| - var text = WebInspector.UIString('LiveSASS failed to start: %s', sourceMap.url());
|
| - text += WebInspector.UIString('\nSourceMap is misaligned: %s != %s', cssNode.text.trim(), sassNode.text.trim());
|
| + var text = Common.UIString('LiveSASS failed to start: %s', sourceMap.url());
|
| + text += Common.UIString('\nSourceMap is misaligned: %s != %s', cssNode.text.trim(), sassNode.text.trim());
|
| text += '\ncompiled: ' + cssNode.document.url + ':' + (cssNode.range.startLine + 1) + ':' +
|
| (cssNode.range.startColumn + 1);
|
| text += '\nsource: ' + sassNode.document.url + ':' + (sassNode.range.startLine + 1) + ':' +
|
| (sassNode.range.startColumn + 1);
|
| - WebInspector.console.error(text);
|
| + Common.console.error(text);
|
| }
|
| }
|
| };
|
|
|