From 037cdb5916fc884041aa172bbf4b202bb2453b30 Mon Sep 17 00:00:00 2001 From: Luke Page Date: Mon, 15 Jul 2013 22:03:52 +0100 Subject: [PATCH] fix tests --- lib/less/tree.js | 4 ++-- lib/less/tree/import.js | 2 +- lib/less/tree/ruleset.js | 2 +- test/browser/css/rootpath-relative/urls.css | 1 - test/browser/css/urls.css | 1 - test/css/comments.css | 8 ++++++-- test/css/compression/compression.css | 3 +-- test/css/import-inline.css | 4 +++- test/css/import.css | 2 -- test/css/static-urls/urls.css | 1 - test/css/urls.css | 2 -- test/less/import/invalid-css.less | 2 +- 12 files changed, 15 insertions(+), 17 deletions(-) diff --git a/lib/less/tree.js b/lib/less/tree.js index 290e8aaa..423837ae 100644 --- a/lib/less/tree.js +++ b/lib/less/tree.js @@ -1,6 +1,6 @@ (function (tree) { -tree.debugInfo = function(env, ctx) { +tree.debugInfo = function(env, ctx, lineSeperator) { var result=""; if (env.dumpLineNumbers && !env.compress) { switch(env.dumpLineNumbers) { @@ -11,7 +11,7 @@ tree.debugInfo = function(env, ctx) { result = tree.debugInfo.asMediaQuery(ctx); break; case 'all': - result = tree.debugInfo.asComment(ctx)+tree.debugInfo.asMediaQuery(ctx); + result = tree.debugInfo.asComment(ctx) + (lineSeperator || "") + tree.debugInfo.asMediaQuery(ctx); break; } } diff --git a/lib/less/tree/import.js b/lib/less/tree/import.js index 5a9c66a0..7ad06ee8 100644 --- a/lib/less/tree/import.js +++ b/lib/less/tree/import.js @@ -55,7 +55,7 @@ tree.Import.prototype = { var features = this.features ? ' ' + this.features.toCSS(env) : ''; if (this.css) { - return "@import " + this.path.toCSS() + features + ';\n'; + return "@import " + this.path.toCSS() + features + ';'; } else { return ""; } diff --git a/lib/less/tree/ruleset.js b/lib/less/tree/ruleset.js index 813791cb..2842719e 100644 --- a/lib/less/tree/ruleset.js +++ b/lib/less/tree/ruleset.js @@ -246,7 +246,7 @@ tree.Ruleset.prototype = { } } else { if (rules.length > 0) { - debugInfo = tree.debugInfo(env, this); + debugInfo = tree.debugInfo(env, this, tabSetStr); selector = this.paths .map(function (p) { return p.map(function (s) { diff --git a/test/browser/css/rootpath-relative/urls.css b/test/browser/css/rootpath-relative/urls.css index 817d5818..20b08339 100644 --- a/test/browser/css/rootpath-relative/urls.css +++ b/test/browser/css/rootpath-relative/urls.css @@ -1,5 +1,4 @@ @import "https://www.github.com/cloudhead/imports/modify-this.css"; - @import "https://www.github.com/cloudhead/imports/modify-again.css"; .modify { my-url: url("https://www.github.com/cloudhead/imports/a.png"); diff --git a/test/browser/css/urls.css b/test/browser/css/urls.css index ddb46b15..7001990e 100644 --- a/test/browser/css/urls.css +++ b/test/browser/css/urls.css @@ -1,5 +1,4 @@ @import "http://localhost:8081/browser/less/modify-this.css"; - @import "http://localhost:8081/browser/less/modify-again.css"; .modify { my-url: url("http://localhost:8081/browser/less/a.png"); diff --git a/test/css/comments.css b/test/css/comments.css index 2306c6a8..b85f5b4f 100644 --- a/test/css/comments.css +++ b/test/css/comments.css @@ -32,7 +32,6 @@ color: red; /* A C-style comment */ /* A C-style comment */ - background-color: orange; font-size: 12px; /* lost comment */ @@ -59,7 +58,12 @@ #last { color: #0000ff; } -/* *//* { *//* *//* *//* */#div { +/* */ +/* { */ +/* */ +/* */ +/* */ +#div { color: #A33; } /* } */ diff --git a/test/css/compression/compression.css b/test/css/compression/compression.css index 3fdd6a21..e3582bf3 100644 --- a/test/css/compression/compression.css +++ b/test/css/compression/compression.css @@ -1,5 +1,4 @@ #colours{color1:#fea;color2:#fea;color3:rgba(255,238,170,0.1);string:"#ffeeaa";/*! but not this type Note preserved whitespace - */ -} + */} dimensions{val:.1px;val:0;val:4cm;val:.2;val:5;angles-must-have-unit:0deg;width:auto\9} \ No newline at end of file diff --git a/test/css/import-inline.css b/test/css/import-inline.css index 1c17ab2a..f198d3c1 100644 --- a/test/css/import-inline.css +++ b/test/css/import-inline.css @@ -1,3 +1,5 @@ -this isn't very valid CSS. @media (min-width: 600px) { +this isn't very valid CSS. +@media (min-width: 600px) { #css { color: yellow; } + } diff --git a/test/css/import.css b/test/css/import.css index 616657ac..a3749181 100644 --- a/test/css/import.css +++ b/test/css/import.css @@ -1,7 +1,5 @@ @import url(http://fonts.googleapis.com/css?family=Open+Sans); - @import url(/absolute/something.css) screen and (color) and (max-width: 600px); - @import url("//ha.com/file.css") (min-width: 100px); #import-test { height: 10px; diff --git a/test/css/static-urls/urls.css b/test/css/static-urls/urls.css index b5a690e9..565ccb44 100644 --- a/test/css/static-urls/urls.css +++ b/test/css/static-urls/urls.css @@ -1,5 +1,4 @@ @import "folder (1)/../css/background.css"; - @import "folder (1)/import-test-d.css"; @font-face { src: url("/fonts/garamond-pro.ttf"); diff --git a/test/css/urls.css b/test/css/urls.css index 21b33bca..ef812605 100644 --- a/test/css/urls.css +++ b/test/css/urls.css @@ -1,7 +1,5 @@ @import "import/../css/background.css"; - @import "import/import-test-d.css"; - @import "file.css"; @font-face { src: url("/fonts/garamond-pro.ttf"); diff --git a/test/less/import/invalid-css.less b/test/less/import/invalid-css.less index b7cad97b..ed585d63 100644 --- a/test/less/import/invalid-css.less +++ b/test/less/import/invalid-css.less @@ -1 +1 @@ -this isn't very valid CSS. \ No newline at end of file +this isn't very valid CSS. \ No newline at end of file