Remove raw css imports

This is a non-standard, and confusion feature. Implementors can now opt into supporting @import'ing additional file extentions with `sass_option_push_import_extension`.
PolyPik · Mar 30, 2018 · 27d5026 · 27d5026
1 parent 6fe62e9
commit 27d5026
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 18 deletions.
diff --git a/src/file.cpp b/src/file.cpp
@@ -323,7 +323,7 @@ namespace Sass {
     // (2) underscore + given
     // (3) underscore + given + extension
     // (4) given + extension
-    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)
+    std::vector<Include> resolve_includes(const std::string& root, const std::string& file, const std::vector<std::string>& exts)
     {
       std::string filename = join_paths(root, file);
       // split the filename
@@ -342,25 +342,13 @@ namespace Sass {
       for(auto ext : exts) {
         rel_path = join_paths(base, "_" + name + ext);
         abs_path = join_paths(root, rel_path);
-        if (file_exists(abs_path)) includes.push_back({{ rel_path, root }, abs_path });
+        if (file_exists(abs_path)) includes.push_back({{ rel_path, root }, abs_path, ext == ".css" });
       }
       // next test plain name with exts
       for(auto ext : exts) {
         rel_path = join_paths(base, name + ext);
         abs_path = join_paths(root, rel_path);
-        if (file_exists(abs_path)) includes.push_back({{ rel_path, root }, abs_path });
-      }
-      // next test d_exts plus underscore
-      for(auto ext : d_exts) {
-        rel_path = join_paths(base, "_" + name + ext);
-        abs_path = join_paths(root, rel_path);
-        if (file_exists(abs_path)) includes.push_back({{ rel_path, root }, abs_path, true });
-      }
-      // next test plain name with d_exts
-      for(auto ext : d_exts) {
-        rel_path = join_paths(base, name + ext);
-        abs_path = join_paths(root, rel_path);
-        if (file_exists(abs_path)) includes.push_back({{ rel_path, root }, abs_path, true });
+        if (file_exists(abs_path)) includes.push_back({{ rel_path, root }, abs_path, ext == ".css" });
       }
       // nothing found
       return includes;

diff --git a/src/file.hpp b/src/file.hpp
@@ -127,11 +127,10 @@ namespace Sass {
   namespace File {
 
     static std::vector<std::string> defaultExtensions = { ".scss", ".sass" };
-    static std::vector<std::string> deprecatedExtensions = { ".css" };
 
     std::vector<Include> resolve_includes(const std::string& root, const std::string& file,
-      const std::vector<std::string>& exts = defaultExtensions,
-      const std::vector<std::string>& d_exts = deprecatedExtensions);
+      const std::vector<std::string>& exts = defaultExtensions);
+
 
   }