Skip to content

Commit 33718b0

Browse files
committed
Revert "Remove raw css imports"
This reverts commit 27d5026.
1 parent d18fd47 commit 33718b0

File tree

2 files changed

+18
-5
lines changed

2 files changed

+18
-5
lines changed

src/file.cpp

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ namespace Sass {
323323
// (2) underscore + given
324324
// (3) underscore + given + extension
325325
// (4) given + extension
326-
std::vector<Include> resolve_includes(const std::string& root, const std::string& file, const std::vector<std::string>& exts)
326+
std::vector<Include> resolve_includes(const std::string& root, const std::string& file, const std::vector<std::string>& exts, const std::vector<std::string>& d_exts)
327327
{
328328
std::string filename = join_paths(root, file);
329329
// split the filename
@@ -342,13 +342,25 @@ namespace Sass {
342342
for(auto ext : exts) {
343343
rel_path = join_paths(base, "_" + name + ext);
344344
abs_path = join_paths(root, rel_path);
345-
if (file_exists(abs_path)) includes.push_back({{ rel_path, root }, abs_path, ext == ".css" });
345+
if (file_exists(abs_path)) includes.push_back({{ rel_path, root }, abs_path });
346346
}
347347
// next test plain name with exts
348348
for(auto ext : exts) {
349349
rel_path = join_paths(base, name + ext);
350350
abs_path = join_paths(root, rel_path);
351-
if (file_exists(abs_path)) includes.push_back({{ rel_path, root }, abs_path, ext == ".css" });
351+
if (file_exists(abs_path)) includes.push_back({{ rel_path, root }, abs_path });
352+
}
353+
// next test d_exts plus underscore
354+
for(auto ext : d_exts) {
355+
rel_path = join_paths(base, "_" + name + ext);
356+
abs_path = join_paths(root, rel_path);
357+
if (file_exists(abs_path)) includes.push_back({{ rel_path, root }, abs_path, true });
358+
}
359+
// next test plain name with d_exts
360+
for(auto ext : d_exts) {
361+
rel_path = join_paths(base, name + ext);
362+
abs_path = join_paths(root, rel_path);
363+
if (file_exists(abs_path)) includes.push_back({{ rel_path, root }, abs_path, true });
352364
}
353365
// nothing found
354366
return includes;

src/file.hpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,11 @@ namespace Sass {
127127
namespace File {
128128

129129
static std::vector<std::string> defaultExtensions = { ".scss", ".sass" };
130+
static std::vector<std::string> deprecatedExtensions = { ".css" };
130131

131132
std::vector<Include> resolve_includes(const std::string& root, const std::string& file,
132-
const std::vector<std::string>& exts = defaultExtensions);
133-
133+
const std::vector<std::string>& exts = defaultExtensions,
134+
const std::vector<std::string>& d_exts = deprecatedExtensions);
134135

135136
}
136137

0 commit comments

Comments
 (0)