Merge branch 'master' into yard

Rakefile

@@ -104,7 +104,7 @@ task :release_edge do
   end
   edge_version = edge_version.join('.')
   File.open('EDGE_GEM_VERSION', 'w') {|f| f.puts(edge_version)}
-  sh %{git commit -m "Bump edge gem version." EDGE_GEM_VERSION}
+  sh %{git commit -m "Bump edge gem version to #{edge_version}." EDGE_GEM_VERSION}
   sh %{git push origin edge-gem}
 
   # Package the edge gem with the proper version

extra/haml-mode.el

@@ -64,7 +64,7 @@ a specific level to which the current line could be indented.")
 (defvar haml-block-openers
   `("^ *\\([%\\.#][a-z0-9_:\\-]*\\)+\\({.*}\\)?\\(\\[.*\\]\\)?[><]*[ \t]*$"
     "^ *[&!]?[-=~].*do[ \t]*\\(|.*|[ \t]*\\)?$"
-    ,(concat "^ *[&!][-=~][ \t]*\\("
+    ,(concat "^ *[&!]?[-=~][ \t]*\\("
              (regexp-opt '("if" "unless" "while" "until" "else"
                            "begin" "elsif" "rescue" "ensure" "when"))
              "\\)")
@@ -142,11 +142,11 @@ For example, this will highlight all of the following:
 
       ;; Highlight attr hashes
       (when (eq (char-after) ?\{)
-        (let ((beg (+ 1 (point))))
+        (let ((beg (point)))
           (haml-limited-forward-sexp eol)
 
           ;; Check for multiline
-          (while (and (eolp) (eq (char-before) ?,))
+          (while (and (eolp) (eq (char-before) ?,) (not (eobp)))
             (forward-line)
             (let ((eol (save-excursion (end-of-line) (point))))
               ;; If no sexps are closed,
@@ -158,7 +158,7 @@ For example, this will highlight all of the following:
                 (goto-char beg)
                 (haml-limited-forward-sexp eol))))
 
-          (haml-fontify-region-as-ruby beg (point))))
+          (haml-fontify-region-as-ruby (+ 1 beg) (point))))
 
       ;; Move past end chars
       (when (looking-at "[<>&!]+") (goto-char (match-end 0)))
@@ -229,7 +229,7 @@ whichever comes first."
           ;; Move through multiline attrs
           (when (eq (char-before) ?,)
             (save-excursion
-              (while (progn (end-of-line) (eq (char-before) ?,))
+              (while (progn (end-of-line) (eq (char-before) ?,) (not (eobp)))
                 (forward-line))
 
               (forward-line -1)
@@ -445,7 +445,7 @@ character of the next line."
       (return-from haml-indent-p
         (if (eq (char-before) ?,) (cdr (assq 'hash-indent attr-props))
           (beginning-of-line)
-          (+ (cdr (assq 'indent attr-props)) haml-indent-offset)))))
+          (list (+ (cdr (assq 'indent attr-props)) haml-indent-offset) nil)))))
   (loop for opener in haml-block-openers
         if (looking-at opener) return t
         finally return nil))
@@ -483,13 +483,14 @@ beginning the hash."
   "Calculate the maximum sensible indentation for the current line."
   (save-excursion
     (beginning-of-line)
-    (if (bobp) 0
+    (if (bobp) (list 0 nil)
       (haml-forward-through-whitespace t)
       (let ((indent (funcall haml-indent-function)))
         (cond
-         ((integerp indent) indent)
-         (indent (+ (current-indentation) haml-indent-offset))
-         (t (current-indentation)))))))
+         ((consp indent) indent)
+         ((integerp indent) (list indent t))
+         (indent (list (+ (current-indentation) haml-indent-offset) nil))
+         (t (list (current-indentation) nil)))))))
 
 (defun haml-indent-region (start end)
   "Indent each nonblank line in the region.
@@ -507,7 +508,7 @@ between possible indentations."
           (next-line-column
            (if (and (equal last-command this-command) (/= (current-indentation) 0))
                (* (/ (- (current-indentation) 1) haml-indent-offset) haml-indent-offset)
-             (haml-compute-indentation))))
+             (car (haml-compute-indentation)))))
       (while (< (point) end)
         (setq this-line-column next-line-column
               current-column (current-indentation))
@@ -532,16 +533,16 @@ back-dent the line by `haml-indent-offset' spaces.  On reaching column
 0, it will cycle back to the maximum sensible indentation."
   (interactive "*")
   (let ((ci (current-indentation))
-        (cc (current-column))
-        (need (haml-compute-indentation)))
-    (save-excursion
-      (beginning-of-line)
-      (delete-horizontal-space)
-      (if (and (equal last-command this-command) (/= ci 0))
-          (indent-to (* (/ (- ci 1) haml-indent-offset) haml-indent-offset))
-        (indent-to need)))
-    (if (< (current-column) (current-indentation))
-        (forward-to-indentation 0))))
+        (cc (current-column)))
+    (destructuring-bind (need strict) (haml-compute-indentation)
+      (save-excursion
+        (beginning-of-line)
+        (delete-horizontal-space)
+        (if (and (not strict) (equal last-command this-command) (/= ci 0))
+            (indent-to (* (/ (- ci 1) haml-indent-offset) haml-indent-offset))
+          (indent-to need))))
+    (when (< (current-column) (current-indentation))
+      (forward-to-indentation 0))))
 
 (defun haml-reindent-region-by (n)
   "Add N spaces to the beginning of each line in the region.

extra/sass-mode.el

@@ -72,6 +72,7 @@ text nested beneath them.")
 (defconst sass-syntax-table
   (let ((st (make-syntax-table)))
     (modify-syntax-entry ?- "w" st)
+    (modify-syntax-entry ?_ "w" st)
     st))
 
 (defconst sass-script-syntax-table

lib/sass/files.rb

@@ -1,4 +1,5 @@
 require 'digest/sha1'
+require 'pathname'
 
 module Sass
   # This module contains various bits of functionality
@@ -115,9 +116,15 @@ module Sass
     end
 
     def find_full_path(filename, load_paths)
-      segments = filename.split(File::SEPARATOR)
-      segments.push "_#{segments.pop}"
-      partial_name = segments.join(File::SEPARATOR)
+      partial_name = File.join(File.dirname(filename), "_#{File.basename(filename)}")
+
+      if Pathname.new(filename).absolute?
+        [partial_name, filename].each do |name|
+          return name if File.readable?(name)
+        end
+        return nil
+      end
+
       load_paths.each do |path|
         [partial_name, filename].each do |name|
           full_path = File.join(path, name)

lib/sass/tree/file_node.rb

@@ -14,12 +14,14 @@ module Sass
       #
       # @param args [Array] Ignored
       def to_s(*args)
-        super()
+        @to_s ||= (style == :compressed ? super().strip : super())
       rescue Sass::SyntaxError => e
         e.add_backtrace_entry(@filename)
         raise e
       end
 
+      def invisible?; to_s.empty?; end
+
       protected
 
       # Parses the imported file