| OLD | NEW |
| 1 var initialize_SassTest = function() { | 1 var initialize_SassTest = function() { |
| 2 | 2 |
| 3 InspectorTest.preloadModule("sass"); | 3 InspectorTest.preloadModule("sass"); |
| 4 | 4 |
| 5 var sassSourceMapFactory = null; | 5 var sassSourceMapFactory = null; |
| 6 InspectorTest.sassSourceMapFactory = function() | 6 InspectorTest.sassSourceMapFactory = function() |
| 7 { | 7 { |
| 8 if (!sassSourceMapFactory) | 8 if (!sassSourceMapFactory) |
| 9 sassSourceMapFactory = new WebInspector.SASSSourceMapFactory(); | 9 sassSourceMapFactory = new Sass.SASSSourceMapFactory(); |
| 10 return sassSourceMapFactory; | 10 return sassSourceMapFactory; |
| 11 } | 11 } |
| 12 | 12 |
| 13 InspectorTest.parseSCSS = function(url, text) | 13 InspectorTest.parseSCSS = function(url, text) |
| 14 { | 14 { |
| 15 return WebInspector.SASSSupport.parseSCSS(url, text); | 15 return Sass.SASSSupport.parseSCSS(url, text); |
| 16 } | 16 } |
| 17 InspectorTest.parseCSS = InspectorTest.parseSCSS; | 17 InspectorTest.parseCSS = InspectorTest.parseSCSS; |
| 18 | 18 |
| 19 InspectorTest.loadASTMapping = function(header, callback) | 19 InspectorTest.loadASTMapping = function(header, callback) |
| 20 { | 20 { |
| 21 var completeSourceMapURL = WebInspector.ParsedURL.completeURL(header.sourceU
RL, header.sourceMapURL); | 21 var completeSourceMapURL = Common.ParsedURL.completeURL(header.sourceURL, he
ader.sourceMapURL); |
| 22 WebInspector.TextSourceMap.load(completeSourceMapURL, header.sourceURL).then
(onSourceMapLoaded); | 22 SDK.TextSourceMap.load(completeSourceMapURL, header.sourceURL).then(onSource
MapLoaded); |
| 23 | 23 |
| 24 function onSourceMapLoaded(sourceMap) | 24 function onSourceMapLoaded(sourceMap) |
| 25 { | 25 { |
| 26 InspectorTest.sassSourceMapFactory().editableSourceMap(header.cssModel()
.target(), sourceMap) | 26 InspectorTest.sassSourceMapFactory().editableSourceMap(header.cssModel()
.target(), sourceMap) |
| 27 .then(map => callback(map)); | 27 .then(map => callback(map)); |
| 28 } | 28 } |
| 29 } | 29 } |
| 30 | 30 |
| 31 InspectorTest.dumpAST = function(ast) | 31 InspectorTest.dumpAST = function(ast) |
| 32 { | 32 { |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 var changesPerRule = new Map(); | 89 var changesPerRule = new Map(); |
| 90 for (var change of diff.changes) { | 90 for (var change of diff.changes) { |
| 91 var oldRule = change.oldRule; | 91 var oldRule = change.oldRule; |
| 92 var ruleChanges = changesPerRule.get(oldRule); | 92 var ruleChanges = changesPerRule.get(oldRule); |
| 93 if (!ruleChanges) { | 93 if (!ruleChanges) { |
| 94 ruleChanges = []; | 94 ruleChanges = []; |
| 95 changesPerRule.set(oldRule, ruleChanges); | 95 changesPerRule.set(oldRule, ruleChanges); |
| 96 } | 96 } |
| 97 ruleChanges.push(change); | 97 ruleChanges.push(change); |
| 98 } | 98 } |
| 99 var T = WebInspector.SASSSupport.PropertyChangeType; | 99 var T = Sass.SASSSupport.PropertyChangeType; |
| 100 for (var rule of changesPerRule.keys()) { | 100 for (var rule of changesPerRule.keys()) { |
| 101 var changes = changesPerRule.get(rule); | 101 var changes = changesPerRule.get(rule); |
| 102 var names = []; | 102 var names = []; |
| 103 var values = []; | 103 var values = []; |
| 104 for (var property of rule.properties) { | 104 for (var property of rule.properties) { |
| 105 names.push(str(property.name, " ")); | 105 names.push(str(property.name, " ")); |
| 106 values.push(str(property.value)); | 106 values.push(str(property.value)); |
| 107 } | 107 } |
| 108 for (var i = changes.length - 1; i >= 0; --i) { | 108 for (var i = changes.length - 1; i >= 0; --i) { |
| 109 var change = changes[i]; | 109 var change = changes[i]; |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 192 | 192 |
| 193 InspectorTest.updateCSSText = function(url, newText) | 193 InspectorTest.updateCSSText = function(url, newText) |
| 194 { | 194 { |
| 195 var styleSheetIds = InspectorTest.cssModel.styleSheetIdsForURL(url) | 195 var styleSheetIds = InspectorTest.cssModel.styleSheetIdsForURL(url) |
| 196 var promises = styleSheetIds.map(id => InspectorTest.cssModel.setStyleSheetT
ext(id, newText, true)); | 196 var promises = styleSheetIds.map(id => InspectorTest.cssModel.setStyleSheetT
ext(id, newText, true)); |
| 197 return Promise.all(promises); | 197 return Promise.all(promises); |
| 198 } | 198 } |
| 199 | 199 |
| 200 InspectorTest.updateSASSText = function(url, newText) | 200 InspectorTest.updateSASSText = function(url, newText) |
| 201 { | 201 { |
| 202 var uiSourceCode = WebInspector.workspace.uiSourceCodeForURL(url); | 202 var uiSourceCode = Workspace.workspace.uiSourceCodeForURL(url); |
| 203 uiSourceCode.addRevision(newText); | 203 uiSourceCode.addRevision(newText); |
| 204 } | 204 } |
| 205 | 205 |
| 206 InspectorTest.runCSSEditTests = function(header, tests) | 206 InspectorTest.runCSSEditTests = function(header, tests) |
| 207 { | 207 { |
| 208 var astSourceMap; | 208 var astSourceMap; |
| 209 InspectorTest.loadASTMapping(header, onMapping); | 209 InspectorTest.loadASTMapping(header, onMapping); |
| 210 | 210 |
| 211 function onMapping(map) | 211 function onMapping(map) |
| 212 { | 212 { |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 272 InspectorTest.addResult("\n" + prefix + titleText + suffix + "\n"); | 272 InspectorTest.addResult("\n" + prefix + titleText + suffix + "\n"); |
| 273 } | 273 } |
| 274 | 274 |
| 275 function logSourceEdits(text, edits) | 275 function logSourceEdits(text, edits) |
| 276 { | 276 { |
| 277 var lines = []; | 277 var lines = []; |
| 278 for (var i = 0; i < edits.length; ++i) { | 278 for (var i = 0; i < edits.length; ++i) { |
| 279 var edit = edits[i]; | 279 var edit = edits[i]; |
| 280 var range = edit.oldRange; | 280 var range = edit.oldRange; |
| 281 var line = String.sprintf("{%d, %d, %d, %d}", range.startLine, range
.startColumn, range.endLine, range.endColumn); | 281 var line = String.sprintf("{%d, %d, %d, %d}", range.startLine, range
.startColumn, range.endLine, range.endColumn); |
| 282 line += String.sprintf(" '%s' => '%s'", (new WebInspector.Text(text)
).extract(range), edit.newText); | 282 line += String.sprintf(" '%s' => '%s'", (new Common.Text(text)).extr
act(range), edit.newText); |
| 283 lines.push(line); | 283 lines.push(line); |
| 284 } | 284 } |
| 285 lines = indent(lines); | 285 lines = indent(lines); |
| 286 lines.unshift("Edits:"); | 286 lines.unshift("Edits:"); |
| 287 InspectorTest.addResult(lines.join("\n")); | 287 InspectorTest.addResult(lines.join("\n")); |
| 288 } | 288 } |
| 289 } | 289 } |
| 290 | 290 |
| 291 InspectorTest.createEdit = function(source, pattern, newText, matchNumber) | 291 InspectorTest.createEdit = function(source, pattern, newText, matchNumber) |
| 292 { | 292 { |
| 293 matchNumber = matchNumber || 0; | 293 matchNumber = matchNumber || 0; |
| 294 var re = new RegExp(pattern.escapeForRegExp(), "g"); | 294 var re = new RegExp(pattern.escapeForRegExp(), "g"); |
| 295 var match; | 295 var match; |
| 296 while ((match = re.exec(source)) !== null && matchNumber) { | 296 while ((match = re.exec(source)) !== null && matchNumber) { |
| 297 --matchNumber; | 297 --matchNumber; |
| 298 } | 298 } |
| 299 if (!match) | 299 if (!match) |
| 300 return null; | 300 return null; |
| 301 var sourceRange = new WebInspector.SourceRange(match.index, match[0].length)
; | 301 var sourceRange = new Common.SourceRange(match.index, match[0].length); |
| 302 var textRange = new WebInspector.Text(source).toTextRange(sourceRange); | 302 var textRange = new Common.Text(source).toTextRange(sourceRange); |
| 303 return new WebInspector.SourceEdit("", textRange, newText); | 303 return new Common.SourceEdit("", textRange, newText); |
| 304 } | 304 } |
| 305 | 305 |
| 306 } | 306 } |
| 307 | 307 |
| OLD | NEW |