marceloverdijk#22 Single or Double Quotes around imports

Author: Christophe Popov

.gitignore

@@ -1,5 +1,7 @@
-
+.idea/
 .classpath
 .project
 .settings/
+*.iml
+*.ipr
 target/

src/main/java/org/lesscss/LessSource.java

@@ -34,8 +34,8 @@ public class LessSource {
     /**
      * The <code>Pattern</code> used to match imported files.
      */
-    private static final Pattern IMPORT_PATTERN = Pattern.compile("^(?!\\s*//\\s*)@import\\s+(url\\()?\\s*\"(.+)\\s*\"(\\))?\\s*;.*$", MULTILINE);
-    
+    private static final Pattern IMPORT_PATTERN = Pattern.compile("^(?!\\s*//\\s*)@import\\s+(url\\()?\\s*(\"|')(.+)\\s*(\"|')(\\))?\\s*;.*$", MULTILINE);
+
     private File file;
     private String content;
     private String normalizedContent;
@@ -103,7 +103,7 @@ public String getNormalizedContent() {
     public long getLastModified() {
         return file.lastModified();
     }
-    
+
     /**
      * Returns the time that the LESS source, or one of its imports, was last modified.
      * 
@@ -134,11 +134,11 @@ public long getLastModifiedIncludingImports() {
     public Map<String, LessSource> getImports() {
         return imports;
     }
-    
+
     private void resolveImports() throws FileNotFoundException, IOException {
         Matcher importMatcher = IMPORT_PATTERN.matcher(normalizedContent);
         while (importMatcher.find()) {
-            String importedFile = importMatcher.group(2);
+            String importedFile = importMatcher.group(3);
             importedFile = importedFile.matches(".*\\.(le?|c)ss$") ? importedFile : importedFile + ".less";
             boolean css = importedFile.matches(".*css$");
             if (!css) {

src/test/java/integration/ImportIT.java

@@ -27,4 +27,9 @@ public void testImport() throws Exception {
     public void testImportEndsInLess() throws Exception {
         testCompile(toFile("import/endsinless/less/import.less"), toFile("import/endsinless/css/import.css"));
     }
+
+    @Test
+    public void testImportSingleQuotes() throws Exception {
+        testCompile(toFile("import/less/import_quotes.less"), toFile("import/css/import.css"));
+    }
 }

src/test/java/org/lesscss/LessSourceTest.java

@@ -20,11 +20,13 @@
 import static org.powermock.api.mockito.PowerMockito.when;
 import java.io.File;
 import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.reflect.FieldUtils;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -40,15 +42,13 @@ public class LessSourceTest {
     private LessSource lessSource;
 
     @Mock private File file;
-    
+
     @Mock private LessSource import1;
     @Mock private LessSource import2;
     @Mock private LessSource import3;
 
     private Map<String, LessSource> imports;
-    
-    private String content = "content";
-    private String absolutePath = "path";
+
     private long lastModified = 1l;
 
     @Before
@@ -61,17 +61,13 @@ public void setUp() throws Exception {
 
     @Test
     public void testNewLessSourceWithoutImports() throws Exception {
-        when(file.exists()).thenReturn(true);
-        mockStatic(FileUtils.class);
-        when(FileUtils.readFileToString(file)).thenReturn(content);
-        when(file.getAbsolutePath()).thenReturn(absolutePath);
-        when(file.lastModified()).thenReturn(lastModified);
+        mockFile(true,"content","absolutePath");
 
         lessSource = new LessSource(file);
 
-        assertEquals(absolutePath, lessSource.getAbsolutePath());
-        assertEquals(content, lessSource.getContent());
-        assertEquals(content, lessSource.getNormalizedContent());
+        assertEquals("absolutePath", lessSource.getAbsolutePath());
+        assertEquals("content", lessSource.getContent());
+        assertEquals("content", lessSource.getNormalizedContent());
         assertEquals(lastModified, lessSource.getLastModified());
         assertEquals(lastModified, lessSource.getLastModifiedIncludingImports());
         assertEquals(0, lessSource.getImports().size());
@@ -93,11 +89,7 @@ public void testNewLessSourceFileNotFound() throws Exception {
 
     @Test
     public void testLastModifiedIncludingImportsWhenNoImportModifiedLater() throws Exception {
-        when(file.exists()).thenReturn(true);
-        mockStatic(FileUtils.class);
-        when(FileUtils.readFileToString(file)).thenReturn(content);
-        when(file.getAbsolutePath()).thenReturn(absolutePath);
-        when(file.lastModified()).thenReturn(1l);
+        mockFile(true,"content","absolutePath");
 
         when(import1.getLastModifiedIncludingImports()).thenReturn(0l);
         when(import2.getLastModifiedIncludingImports()).thenReturn(0l);
@@ -111,11 +103,7 @@ public void testLastModifiedIncludingImportsWhenNoImportModifiedLater() throws E
 
     @Test
     public void testLastModifiedIncludingImportsWhenImportModifiedLater() throws Exception {
-        when(file.exists()).thenReturn(true);
-        mockStatic(FileUtils.class);
-        when(FileUtils.readFileToString(file)).thenReturn(content);
-        when(file.getAbsolutePath()).thenReturn(absolutePath);
-        when(file.lastModified()).thenReturn(1l);
+        mockFile(true,"content","absolutePath");
 
         when(import1.getLastModifiedIncludingImports()).thenReturn(0l);
         when(import2.getLastModifiedIncludingImports()).thenReturn(2l);
@@ -126,4 +114,14 @@ public void testLastModifiedIncludingImportsWhenImportModifiedLater() throws Exc
 
         assertEquals(2l, lessSource.getLastModifiedIncludingImports());
     }
+
+    private File mockFile(boolean fileExists, String content, String absolutePath) throws IOException {
+        when(file.exists()).thenReturn(fileExists);
+        mockStatic(FileUtils.class);
+        when(FileUtils.readFileToString(file)).thenReturn(content);
+        when(file.getAbsolutePath()).thenReturn(absolutePath);
+        when(file.lastModified()).thenReturn(lastModified);
+        when(file.getParent()).thenReturn("folder");
+        return file;
+    }
 }

src/test/resources/import/less/import_quotes.less

@@ -0,0 +1,4 @@
+@import 'import1.less';
+//@import 'import2.less';
+// @import 'import3.less';
+@import "import4";