Skip to content
This repository was archived by the owner on Jan 9, 2019. It is now read-only.

Allow @import RegEx to find all Import Types #61

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Allow @import RegEx to find all Import Types #61

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e64f7bf
Allow @import RegEx to find all Import Types
JanThiel Sep 9, 2014
4019b9b
Fixed Import Type processing for new Import Directives
JanThiel Sep 10, 2014
3e132e6
Update LessSource.java
JanThiel Sep 10, 2014
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
8 changes: 6 additions & 2 deletions src/main/java/org/lesscss/LessSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ 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\\(|\\((less|css)\\))?\\s*(\"|')(.+)\\s*(\"|')(\\))?(.*);).*$", MULTILINE);
private static final Pattern IMPORT_PATTERN = Pattern.compile("^(?!\\s*//\\s*).*(@import\\s+(url\\(|\\((less|css|once|inline|reference|multiple)\\))?\\s*(\"|')(.+)\\s*(\"|')(\\))?(.*);).*$", MULTILINE);

private Resource resource;
private String content;
Expand Down Expand Up @@ -192,10 +192,14 @@ public Map<String, LessSource> getImports() {
private void resolveImports() throws IOException {
Matcher importMatcher = IMPORT_PATTERN.matcher(normalizedContent);
while (importMatcher.find()) {
// Extract the import type, grab the file name to import
String importedResource = importMatcher.group(5);
// Check whether a file ending is present (file.css | file.less), if not, add .less
importedResource = importedResource.matches(".*\\.(le?|c)ss$") ? importedResource : importedResource + ".less";
// Get the import type. First check if directive is set. If so, take it. If none directive is set, use file ending
String importType = importMatcher.group(3)==null ? importedResource.substring(importedResource.lastIndexOf(".") + 1) : importMatcher.group(3);
if (importType.equals("less")) {
// Only process files that are LESS imports (recognized by Import directive or file ending in "importType")
if (importType.equals("less") || importType.equals("reference") || importType.equals("once") || importType.equals("multiple")) {
logger.debug("Importing %s", importedResource);

if( !imports.containsKey(importedResource) ) {
Expand Down