Skip to content

Use to_sass for @debug, @warn and @error message #1862

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 17, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/eval.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ namespace Sass {

}

std::string result(unquote(message->to_string(ctx.c_options)));
std::string result(unquote(message->to_sass()));
Backtrace top(backtrace(), w->pstate(), "");
std::cerr << "WARNING: " << result;
std::cerr << top.to_string();
Expand Down Expand Up @@ -373,7 +373,7 @@ namespace Sass {

}

std::string result(unquote(message->to_string(ctx.c_options)));
std::string result(unquote(message->to_sass()));
ctx.c_options.output_style = outstyle;
error(result, e->pstate());
return 0;
Expand Down Expand Up @@ -407,7 +407,7 @@ namespace Sass {
}

std::string cwd(ctx.cwd());
std::string result(unquote(message->to_string(ctx.c_options)));
std::string result(unquote(message->to_sass()));
std::string abs_path(Sass::File::rel2abs(d->pstate().path, cwd, cwd));
std::string rel_path(Sass::File::abs2rel(d->pstate().path, cwd, cwd));
std::string output_path(Sass::File::path_for_console(rel_path, abs_path, d->pstate().path));
Expand Down
6 changes: 4 additions & 2 deletions src/inspect.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -394,8 +394,10 @@ namespace Sass {
if (list->separator() == SASS_HASH)
{ sep[0] = i % 2 ? ':' : ','; }
Expression* list_item = (*list)[i];
if (list_item->is_invisible()) {
continue;
if (output_style() != TO_SASS) {
if (list_item->is_invisible()) {
continue;
}
}
if (items_output) {
append_string(sep);
Expand Down