sass 3.2.19 → 3.4.25
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.yardopts +3 -1
- data/CODE_OF_CONDUCT.md +10 -0
- data/CONTRIBUTING.md +148 -0
- data/MIT-LICENSE +1 -1
- data/README.md +87 -61
- data/Rakefile +119 -15
- data/VERSION +1 -1
- data/VERSION_DATE +1 -1
- data/VERSION_NAME +1 -1
- data/bin/sass +1 -1
- data/bin/scss +1 -1
- data/extra/sass-spec-ref.sh +32 -0
- data/extra/update_watch.rb +1 -1
- data/lib/sass/cache_stores/base.rb +2 -2
- data/lib/sass/cache_stores/chain.rb +2 -1
- data/lib/sass/cache_stores/filesystem.rb +8 -12
- data/lib/sass/cache_stores/memory.rb +5 -6
- data/lib/sass/cache_stores/null.rb +2 -2
- data/lib/sass/callbacks.rb +3 -2
- data/lib/sass/css.rb +22 -23
- data/lib/sass/deprecation.rb +55 -0
- data/lib/sass/engine.rb +487 -191
- data/lib/sass/environment.rb +172 -58
- data/lib/sass/error.rb +21 -24
- data/lib/sass/exec/base.rb +199 -0
- data/lib/sass/exec/sass_convert.rb +283 -0
- data/lib/sass/exec/sass_scss.rb +440 -0
- data/lib/sass/exec.rb +5 -703
- data/lib/sass/features.rb +47 -0
- data/lib/sass/importers/base.rb +50 -7
- data/lib/sass/importers/deprecated_path.rb +51 -0
- data/lib/sass/importers/filesystem.rb +54 -21
- data/lib/sass/importers.rb +1 -0
- data/lib/sass/logger/base.rb +9 -5
- data/lib/sass/logger/delayed.rb +50 -0
- data/lib/sass/logger/log_level.rb +3 -7
- data/lib/sass/logger.rb +9 -7
- data/lib/sass/media.rb +20 -23
- data/lib/sass/plugin/compiler.rb +321 -145
- data/lib/sass/plugin/configuration.rb +45 -34
- data/lib/sass/plugin/merb.rb +3 -3
- data/lib/sass/plugin/rack.rb +3 -3
- data/lib/sass/plugin/rails.rb +1 -1
- data/lib/sass/plugin/staleness_checker.rb +6 -6
- data/lib/sass/plugin.rb +9 -8
- data/lib/sass/repl.rb +3 -3
- data/lib/sass/script/css_lexer.rb +8 -4
- data/lib/sass/script/css_parser.rb +4 -2
- data/lib/sass/script/css_variable_warning.rb +52 -0
- data/lib/sass/script/functions.rb +1583 -433
- data/lib/sass/script/lexer.rb +198 -79
- data/lib/sass/script/parser.rb +463 -133
- data/lib/sass/script/tree/funcall.rb +313 -0
- data/lib/sass/script/tree/interpolation.rb +223 -0
- data/lib/sass/script/tree/list_literal.rb +104 -0
- data/lib/sass/script/tree/literal.rb +49 -0
- data/lib/sass/script/tree/map_literal.rb +64 -0
- data/lib/sass/script/{node.rb → tree/node.rb} +42 -14
- data/lib/sass/script/tree/operation.rb +156 -0
- data/lib/sass/script/tree/selector.rb +26 -0
- data/lib/sass/script/tree/string_interpolation.rb +125 -0
- data/lib/sass/script/{unary_operation.rb → tree/unary_operation.rb} +6 -6
- data/lib/sass/script/tree/variable.rb +57 -0
- data/lib/sass/script/tree.rb +16 -0
- data/lib/sass/script/{arg_list.rb → value/arg_list.rb} +9 -25
- data/lib/sass/script/value/base.rb +241 -0
- data/lib/sass/script/value/bool.rb +35 -0
- data/lib/sass/script/value/color.rb +698 -0
- data/lib/sass/script/value/helpers.rb +272 -0
- data/lib/sass/script/value/list.rb +113 -0
- data/lib/sass/script/value/map.rb +70 -0
- data/lib/sass/script/{null.rb → value/null.rb} +14 -7
- data/lib/sass/script/{number.rb → value/number.rb} +196 -86
- data/lib/sass/script/value/string.rb +138 -0
- data/lib/sass/script/value.rb +11 -0
- data/lib/sass/script.rb +38 -11
- data/lib/sass/scss/css_parser.rb +25 -5
- data/lib/sass/scss/parser.rb +532 -458
- data/lib/sass/scss/rx.rb +21 -14
- data/lib/sass/scss/static_parser.rb +328 -9
- data/lib/sass/scss.rb +0 -2
- data/lib/sass/selector/abstract_sequence.rb +36 -19
- data/lib/sass/selector/comma_sequence.rb +125 -26
- data/lib/sass/selector/pseudo.rb +266 -0
- data/lib/sass/selector/sequence.rb +200 -71
- data/lib/sass/selector/simple.rb +30 -32
- data/lib/sass/selector/simple_sequence.rb +193 -64
- data/lib/sass/selector.rb +65 -194
- data/lib/sass/shared.rb +2 -2
- data/lib/sass/source/map.rb +213 -0
- data/lib/sass/source/position.rb +39 -0
- data/lib/sass/source/range.rb +41 -0
- data/lib/sass/stack.rb +120 -0
- data/lib/sass/supports.rb +19 -23
- data/lib/sass/tree/at_root_node.rb +83 -0
- data/lib/sass/tree/charset_node.rb +1 -1
- data/lib/sass/tree/comment_node.rb +4 -4
- data/lib/sass/tree/css_import_node.rb +19 -11
- data/lib/sass/tree/debug_node.rb +2 -2
- data/lib/sass/tree/directive_node.rb +21 -4
- data/lib/sass/tree/each_node.rb +8 -8
- data/lib/sass/tree/error_node.rb +18 -0
- data/lib/sass/tree/extend_node.rb +14 -7
- data/lib/sass/tree/for_node.rb +4 -4
- data/lib/sass/tree/function_node.rb +14 -4
- data/lib/sass/tree/if_node.rb +1 -1
- data/lib/sass/tree/import_node.rb +10 -10
- data/lib/sass/tree/keyframe_rule_node.rb +15 -0
- data/lib/sass/tree/media_node.rb +4 -14
- data/lib/sass/tree/mixin_def_node.rb +4 -4
- data/lib/sass/tree/mixin_node.rb +21 -8
- data/lib/sass/tree/node.rb +59 -15
- data/lib/sass/tree/prop_node.rb +42 -24
- data/lib/sass/tree/return_node.rb +3 -2
- data/lib/sass/tree/root_node.rb +19 -3
- data/lib/sass/tree/rule_node.rb +49 -26
- data/lib/sass/tree/supports_node.rb +0 -13
- data/lib/sass/tree/trace_node.rb +2 -1
- data/lib/sass/tree/variable_node.rb +9 -3
- data/lib/sass/tree/visitors/base.rb +5 -8
- data/lib/sass/tree/visitors/check_nesting.rb +62 -36
- data/lib/sass/tree/visitors/convert.rb +111 -76
- data/lib/sass/tree/visitors/cssize.rb +206 -74
- data/lib/sass/tree/visitors/deep_copy.rb +11 -6
- data/lib/sass/tree/visitors/extend.rb +19 -17
- data/lib/sass/tree/visitors/perform.rb +308 -190
- data/lib/sass/tree/visitors/set_options.rb +21 -7
- data/lib/sass/tree/visitors/to_css.rb +273 -92
- data/lib/sass/tree/warn_node.rb +2 -2
- data/lib/sass/tree/while_node.rb +2 -2
- data/lib/sass/util/cross_platform_random.rb +19 -0
- data/lib/sass/util/normalized_map.rb +129 -0
- data/lib/sass/util/ordered_hash.rb +192 -0
- data/lib/sass/util/subset_map.rb +5 -5
- data/lib/sass/util/test.rb +0 -1
- data/lib/sass/util.rb +620 -193
- data/lib/sass/version.rb +22 -24
- data/lib/sass.rb +27 -13
- data/test/sass/cache_test.rb +62 -20
- data/test/sass/callbacks_test.rb +1 -1
- data/test/sass/compiler_test.rb +236 -0
- data/test/sass/conversion_test.rb +472 -44
- data/test/sass/css2sass_test.rb +73 -5
- data/test/sass/css_variable_test.rb +132 -0
- data/test/sass/encoding_test.rb +219 -0
- data/test/sass/engine_test.rb +618 -415
- data/test/sass/exec_test.rb +12 -2
- data/test/sass/extend_test.rb +419 -168
- data/test/sass/functions_test.rb +931 -93
- data/test/sass/importer_test.rb +250 -21
- data/test/sass/logger_test.rb +1 -1
- data/test/sass/more_results/more_import.css +1 -1
- data/test/sass/more_templates/more1.sass +10 -10
- data/test/sass/more_templates/more_import.sass +2 -2
- data/test/sass/plugin_test.rb +26 -34
- data/test/sass/results/compact.css +1 -1
- data/test/sass/results/complex.css +4 -4
- data/test/sass/results/expanded.css +1 -1
- data/test/sass/results/import.css +1 -1
- data/test/sass/results/import_charset_ibm866.css +2 -2
- data/test/sass/results/mixins.css +17 -17
- data/test/sass/results/nested.css +1 -1
- data/test/sass/results/parent_ref.css +2 -2
- data/test/sass/results/script.css +5 -5
- data/test/sass/results/scss_import.css +1 -1
- data/test/sass/script_conversion_test.rb +97 -39
- data/test/sass/script_test.rb +911 -102
- data/test/sass/scss/css_test.rb +215 -34
- data/test/sass/scss/rx_test.rb +8 -4
- data/test/sass/scss/scss_test.rb +2424 -325
- data/test/sass/source_map_test.rb +1055 -0
- data/test/sass/superselector_test.rb +210 -0
- data/test/sass/templates/_partial.sass +1 -1
- data/test/sass/templates/basic.sass +10 -10
- data/test/sass/templates/bork1.sass +1 -1
- data/test/sass/templates/bork5.sass +1 -1
- data/test/sass/templates/compact.sass +10 -10
- data/test/sass/templates/complex.sass +187 -187
- data/test/sass/templates/compressed.sass +10 -10
- data/test/sass/templates/expanded.sass +10 -10
- data/test/sass/templates/import.sass +2 -2
- data/test/sass/templates/importee.sass +3 -3
- data/test/sass/templates/mixins.sass +22 -22
- data/test/sass/templates/multiline.sass +4 -4
- data/test/sass/templates/nested.sass +13 -13
- data/test/sass/templates/parent_ref.sass +12 -12
- data/test/sass/templates/script.sass +70 -70
- data/test/sass/templates/scss_import.scss +2 -1
- data/test/sass/templates/subdir/nested_subdir/_nested_partial.sass +1 -1
- data/test/sass/templates/subdir/nested_subdir/nested_subdir.sass +2 -2
- data/test/sass/templates/subdir/subdir.sass +3 -3
- data/test/sass/templates/units.sass +10 -10
- data/test/sass/test_helper.rb +1 -1
- data/test/sass/util/multibyte_string_scanner_test.rb +11 -3
- data/test/sass/util/normalized_map_test.rb +51 -0
- data/test/sass/util/subset_map_test.rb +2 -2
- data/test/sass/util_test.rb +99 -43
- data/test/sass/value_helpers_test.rb +179 -0
- data/test/sass-spec.yml +3 -0
- data/test/test_helper.rb +42 -12
- data/vendor/listen/CHANGELOG.md +1 -228
- data/vendor/listen/Gemfile +5 -15
- data/vendor/listen/README.md +111 -77
- data/vendor/listen/Rakefile +0 -42
- data/vendor/listen/lib/listen/adapter.rb +195 -82
- data/vendor/listen/lib/listen/adapters/bsd.rb +27 -64
- data/vendor/listen/lib/listen/adapters/darwin.rb +21 -58
- data/vendor/listen/lib/listen/adapters/linux.rb +23 -55
- data/vendor/listen/lib/listen/adapters/polling.rb +25 -34
- data/vendor/listen/lib/listen/adapters/windows.rb +50 -46
- data/vendor/listen/lib/listen/directory_record.rb +96 -61
- data/vendor/listen/lib/listen/listener.rb +135 -37
- data/vendor/listen/lib/listen/turnstile.rb +9 -5
- data/vendor/listen/lib/listen/version.rb +1 -1
- data/vendor/listen/lib/listen.rb +33 -19
- data/vendor/listen/listen.gemspec +6 -0
- data/vendor/listen/spec/listen/adapter_spec.rb +43 -77
- data/vendor/listen/spec/listen/adapters/polling_spec.rb +8 -8
- data/vendor/listen/spec/listen/directory_record_spec.rb +81 -56
- data/vendor/listen/spec/listen/listener_spec.rb +128 -39
- data/vendor/listen/spec/listen_spec.rb +15 -21
- data/vendor/listen/spec/spec_helper.rb +4 -0
- data/vendor/listen/spec/support/adapter_helper.rb +52 -15
- data/vendor/listen/spec/support/directory_record_helper.rb +7 -5
- data/vendor/listen/spec/support/listeners_helper.rb +30 -7
- metadata +161 -111
- data/CONTRIBUTING +0 -3
- data/lib/sass/script/bool.rb +0 -18
- data/lib/sass/script/color.rb +0 -606
- data/lib/sass/script/funcall.rb +0 -245
- data/lib/sass/script/interpolation.rb +0 -79
- data/lib/sass/script/list.rb +0 -85
- data/lib/sass/script/literal.rb +0 -221
- data/lib/sass/script/operation.rb +0 -110
- data/lib/sass/script/string.rb +0 -51
- data/lib/sass/script/string_interpolation.rb +0 -103
- data/lib/sass/script/variable.rb +0 -58
- data/lib/sass/scss/script_lexer.rb +0 -15
- data/lib/sass/scss/script_parser.rb +0 -25
- data/test/Gemfile +0 -3
- data/test/Gemfile.lock +0 -10
- data/vendor/listen/lib/listen/dependency_manager.rb +0 -126
- data/vendor/listen/lib/listen/multi_listener.rb +0 -143
- data/vendor/listen/spec/listen/dependency_manager_spec.rb +0 -107
- data/vendor/listen/spec/listen/multi_listener_spec.rb +0 -174
data/lib/sass/script/lexer.rb
CHANGED
@@ -16,26 +16,29 @@ module Sass
|
|
16
16
|
# `value`: \[`Object`\]
|
17
17
|
# : The Ruby object corresponding to the value of the token.
|
18
18
|
#
|
19
|
-
# `
|
20
|
-
# : The
|
19
|
+
# `source_range`: \[`Sass::Source::Range`\]
|
20
|
+
# : The range in the source file in which the token appeared.
|
21
21
|
#
|
22
|
-
# `
|
23
|
-
# : The number of bytes into the line the SassScript token appeared.
|
24
|
-
#
|
25
|
-
# `pos`: \[`Fixnum`\]
|
22
|
+
# `pos`: \[`Integer`\]
|
26
23
|
# : The scanner position at which the SassScript token appeared.
|
27
|
-
Token = Struct.new(:type, :value, :
|
24
|
+
Token = Struct.new(:type, :value, :source_range, :pos)
|
28
25
|
|
29
26
|
# The line number of the lexer's current position.
|
30
27
|
#
|
31
|
-
# @return [
|
32
|
-
|
28
|
+
# @return [Integer]
|
29
|
+
def line
|
30
|
+
return @line unless @tok
|
31
|
+
@tok.source_range.start_pos.line
|
32
|
+
end
|
33
33
|
|
34
34
|
# The number of bytes into the current line
|
35
|
-
# of the lexer's current position.
|
35
|
+
# of the lexer's current position (1-based).
|
36
36
|
#
|
37
|
-
# @return [
|
38
|
-
|
37
|
+
# @return [Integer]
|
38
|
+
def offset
|
39
|
+
return @offset unless @tok
|
40
|
+
@tok.source_range.start_pos.offset
|
41
|
+
end
|
39
42
|
|
40
43
|
# A hash from operator strings to the corresponding token types.
|
41
44
|
OPERATORS = {
|
@@ -67,10 +70,9 @@ module Sass
|
|
67
70
|
|
68
71
|
OPERATORS_REVERSE = Sass::Util.map_hash(OPERATORS) {|k, v| [v, k]}
|
69
72
|
|
70
|
-
TOKEN_NAMES = Sass::Util.map_hash(OPERATORS_REVERSE) {|k, v| [k, v.inspect]}.merge(
|
71
|
-
|
72
|
-
|
73
|
-
})
|
73
|
+
TOKEN_NAMES = Sass::Util.map_hash(OPERATORS_REVERSE) {|k, v| [k, v.inspect]}.merge(
|
74
|
+
:const => "variable (e.g. $foo)",
|
75
|
+
:ident => "identifier (e.g. middle)")
|
74
76
|
|
75
77
|
# A list of operator strings ordered with longer names first
|
76
78
|
# so that `>` and `<` don't clobber `>=` and `<=`.
|
@@ -78,7 +80,9 @@ module Sass
|
|
78
80
|
|
79
81
|
# A sub-list of {OP_NAMES} that only includes operators
|
80
82
|
# with identifier names.
|
81
|
-
IDENT_OP_NAMES = OP_NAMES.select {|k,
|
83
|
+
IDENT_OP_NAMES = OP_NAMES.select {|k, _v| k =~ /^\w+/}
|
84
|
+
|
85
|
+
PARSEABLE_NUMBER = /(?:(\d*\.\d+)|(\d+))(?:[eE]([+-]?\d+))?(#{UNIT})?/
|
82
86
|
|
83
87
|
# A hash of regular expressions that are used for tokenizing.
|
84
88
|
REGULAR_EXPRESSIONS = {
|
@@ -87,16 +91,22 @@ module Sass
|
|
87
91
|
:single_line_comment => SINGLE_LINE_COMMENT,
|
88
92
|
:variable => /(\$)(#{IDENT})/,
|
89
93
|
:ident => /(#{IDENT})(\()?/,
|
90
|
-
:number =>
|
94
|
+
:number => PARSEABLE_NUMBER,
|
95
|
+
:unary_minus_number => /-#{PARSEABLE_NUMBER}/,
|
91
96
|
:color => HEXCOLOR,
|
92
|
-
:
|
93
|
-
:
|
97
|
+
:id => /##{IDENT}/,
|
98
|
+
:selector => /&/,
|
99
|
+
:ident_op => /(#{Regexp.union(*IDENT_OP_NAMES.map do |s|
|
100
|
+
Regexp.new(Regexp.escape(s) + "(?!#{NMCHAR}|\Z)")
|
101
|
+
end)})/,
|
102
|
+
:op => /(#{Regexp.union(*OP_NAMES)})/,
|
94
103
|
}
|
95
104
|
|
96
105
|
class << self
|
97
106
|
private
|
107
|
+
|
98
108
|
def string_re(open, close)
|
99
|
-
/#{open}((?:\\.|\#(?!\{)|[^#{close}\\#])*)(#{close}|#\{)/
|
109
|
+
/#{open}((?:\\.|\#(?!\{)|[^#{close}\\#])*)(#{close}|#\{)/m
|
100
110
|
end
|
101
111
|
end
|
102
112
|
|
@@ -132,12 +142,12 @@ module Sass
|
|
132
142
|
}
|
133
143
|
|
134
144
|
# @param str [String, StringScanner] The source text to lex
|
135
|
-
# @param line [
|
136
|
-
# Used for error reporting
|
137
|
-
# @param offset [
|
138
|
-
# Used for error reporting
|
145
|
+
# @param line [Integer] The 1-based line on which the SassScript appears.
|
146
|
+
# Used for error reporting and sourcemap building
|
147
|
+
# @param offset [Integer] The 1-based character (not byte) offset in the line in the source.
|
148
|
+
# Used for error reporting and sourcemap building
|
139
149
|
# @param options [{Symbol => Object}] An options hash;
|
140
|
-
# see {file:SASS_REFERENCE.md#
|
150
|
+
# see {file:SASS_REFERENCE.md#Options the Sass options documentation}
|
141
151
|
def initialize(str, line, offset, options)
|
142
152
|
@scanner = str.is_a?(StringScanner) ? str : Sass::Util::MultibyteStringScanner.new(str)
|
143
153
|
@line = line
|
@@ -145,6 +155,8 @@ module Sass
|
|
145
155
|
@options = options
|
146
156
|
@interpolation_stack = []
|
147
157
|
@prev = nil
|
158
|
+
@tok = nil
|
159
|
+
@next_tok = nil
|
148
160
|
end
|
149
161
|
|
150
162
|
# Moves the lexer forward one token.
|
@@ -154,7 +166,7 @@ module Sass
|
|
154
166
|
@tok ||= read_token
|
155
167
|
@tok, tok = nil, @tok
|
156
168
|
@prev = tok
|
157
|
-
|
169
|
+
tok
|
158
170
|
end
|
159
171
|
|
160
172
|
# Returns whether or not there's whitespace before the next token.
|
@@ -169,6 +181,13 @@ module Sass
|
|
169
181
|
end
|
170
182
|
end
|
171
183
|
|
184
|
+
# Returns the given character.
|
185
|
+
#
|
186
|
+
# @return [String]
|
187
|
+
def char(pos = @scanner.pos)
|
188
|
+
@scanner.string[pos, 1]
|
189
|
+
end
|
190
|
+
|
172
191
|
# Returns the next token without moving the lexer forward.
|
173
192
|
#
|
174
193
|
# @return [Token] The next token
|
@@ -179,12 +198,16 @@ module Sass
|
|
179
198
|
# Rewinds the underlying StringScanner
|
180
199
|
# to before the token returned by \{#peek}.
|
181
200
|
def unpeek!
|
182
|
-
|
201
|
+
return unless @tok
|
202
|
+
@scanner.pos = @tok.pos
|
203
|
+
@line = @tok.source_range.start_pos.line
|
204
|
+
@offset = @tok.source_range.start_pos.offset
|
183
205
|
end
|
184
206
|
|
185
207
|
# @return [Boolean] Whether or not there's more source text to lex.
|
186
208
|
def done?
|
187
|
-
|
209
|
+
return if @next_tok
|
210
|
+
whitespace unless after_interpolation? && !@interpolation_stack.empty?
|
188
211
|
@scanner.eos? && @tok.nil?
|
189
212
|
end
|
190
213
|
|
@@ -221,14 +244,17 @@ module Sass
|
|
221
244
|
private
|
222
245
|
|
223
246
|
def read_token
|
224
|
-
|
225
|
-
|
226
|
-
|
227
|
-
|
247
|
+
if (tok = @next_tok)
|
248
|
+
@next_tok = nil
|
249
|
+
return tok
|
250
|
+
end
|
228
251
|
|
229
|
-
|
230
|
-
|
231
|
-
|
252
|
+
return if done?
|
253
|
+
start_pos = source_position
|
254
|
+
value = token
|
255
|
+
return unless value
|
256
|
+
type, val = value
|
257
|
+
Token.new(type, val, range(start_pos), @scanner.pos - @scanner.matched_size)
|
232
258
|
end
|
233
259
|
|
234
260
|
def whitespace
|
@@ -238,13 +264,19 @@ module Sass
|
|
238
264
|
end
|
239
265
|
|
240
266
|
def token
|
241
|
-
if after_interpolation? && (
|
242
|
-
|
267
|
+
if after_interpolation? && (interp = @interpolation_stack.pop)
|
268
|
+
interp_type, interp_value = interp
|
269
|
+
if interp_type == :special_fun
|
270
|
+
return special_fun_body(interp_value)
|
271
|
+
else
|
272
|
+
raise "[BUG]: Unknown interp_type #{interp_type}" unless interp_type == :string
|
273
|
+
return string(interp_value, true)
|
274
|
+
end
|
243
275
|
end
|
244
276
|
|
245
|
-
variable || string(:double, false) || string(:single, false) || number || color ||
|
246
|
-
string(:uri, false) || raw(UNICODERANGE) || special_fun || special_val ||
|
247
|
-
ident || op
|
277
|
+
variable || string(:double, false) || string(:single, false) || number || id || color ||
|
278
|
+
selector || string(:uri, false) || raw(UNICODERANGE) || special_fun || special_val ||
|
279
|
+
ident_op || ident || op
|
248
280
|
end
|
249
281
|
|
250
282
|
def variable
|
@@ -263,82 +295,169 @@ module Sass
|
|
263
295
|
end
|
264
296
|
|
265
297
|
def string(re, open)
|
298
|
+
line, offset = @line, @offset
|
266
299
|
return unless scan(STRING_REGULAR_EXPRESSIONS[re][open])
|
267
|
-
if @scanner[
|
268
|
-
|
269
|
-
|
300
|
+
if @scanner[0] =~ /([^\\]|^)\n/
|
301
|
+
filename = @options[:filename]
|
302
|
+
Sass::Util.sass_warn <<MESSAGE
|
303
|
+
DEPRECATION WARNING on line #{line}, column #{offset}#{" of #{filename}" if filename}:
|
304
|
+
Unescaped multiline strings are deprecated and will be removed in a future version of Sass.
|
305
|
+
To include a newline in a string, use "\\a" or "\\a " as in CSS.
|
306
|
+
MESSAGE
|
307
|
+
end
|
308
|
+
|
309
|
+
if @scanner[2] == '#{' # '
|
310
|
+
@interpolation_stack << [:string, re]
|
311
|
+
start_pos = Sass::Source::Position.new(@line, @offset - 2)
|
312
|
+
@next_tok = Token.new(:string_interpolation, range(start_pos), @scanner.pos - 2)
|
270
313
|
end
|
271
314
|
str =
|
272
315
|
if re == :uri
|
273
|
-
|
316
|
+
url = "#{'url(' unless open}#{@scanner[1]}#{')' unless @scanner[2] == '#{'}"
|
317
|
+
Script::Value::String.new(url)
|
274
318
|
else
|
275
|
-
Script::String.new(@scanner[1]
|
319
|
+
Script::Value::String.new(Sass::Script::Value::String.value(@scanner[1]), :string)
|
276
320
|
end
|
277
321
|
[:string, str]
|
278
322
|
end
|
279
323
|
|
280
324
|
def number
|
281
|
-
|
282
|
-
|
283
|
-
|
284
|
-
|
325
|
+
# Handling unary minus is complicated by the fact that whitespace is an
|
326
|
+
# operator in SassScript. We want "1-2" to be parsed as "1 - 2", but we
|
327
|
+
# want "1 -2" to be parsed as "1 (-2)". To accomplish this, we only
|
328
|
+
# parse a unary minus as part of a number literal if there's whitespace
|
329
|
+
# before and not after it. Cases like "(-2)" are handled by the unary
|
330
|
+
# minus logic in the parser instead.
|
331
|
+
if @scanner.peek(1) == '-'
|
332
|
+
return if @scanner.pos == 0
|
333
|
+
unary_minus_allowed =
|
334
|
+
case @scanner.string[@scanner.pos - 1, 1]
|
335
|
+
when /\s/; true
|
336
|
+
when '/'; @scanner.pos != 1 && @scanner.string[@scanner.pos - 2, 1] == '*'
|
337
|
+
else; false
|
338
|
+
end
|
339
|
+
|
340
|
+
return unless unary_minus_allowed
|
341
|
+
return unless scan(REGULAR_EXPRESSIONS[:unary_minus_number])
|
342
|
+
minus = true
|
343
|
+
else
|
344
|
+
return unless scan(REGULAR_EXPRESSIONS[:number])
|
345
|
+
minus = false
|
346
|
+
end
|
347
|
+
|
348
|
+
value = (@scanner[1] ? @scanner[1].to_f : @scanner[2].to_i) * (minus ? -1 : 1)
|
349
|
+
value *= 10**@scanner[3].to_i if @scanner[3]
|
350
|
+
script_number = Script::Value::Number.new(value, Array(@scanner[4]))
|
351
|
+
[:number, script_number]
|
352
|
+
end
|
353
|
+
|
354
|
+
def id
|
355
|
+
# Colors and ids are tough to tell apart, because they overlap but
|
356
|
+
# neither is a superset of the other. "#xyz" is an id but not a color,
|
357
|
+
# "#000" is a color but not an id, "#abc" is both, and "#0" is neither.
|
358
|
+
# We need to handle all these cases correctly.
|
359
|
+
#
|
360
|
+
# To do so, we first try to parse something as an id. If this works and
|
361
|
+
# the id is also a valid color, we return the color. Otherwise, we
|
362
|
+
# return the id. If it didn't parse as an id, we then try to parse it as
|
363
|
+
# a color. If *this* works, we return the color, and if it doesn't we
|
364
|
+
# give up and throw an error.
|
365
|
+
#
|
366
|
+
# IDs in properties are used in the Basic User Interface Module
|
367
|
+
# (http://www.w3.org/TR/css3-ui/).
|
368
|
+
return unless scan(REGULAR_EXPRESSIONS[:id])
|
369
|
+
if @scanner[0] =~ /^\#[0-9a-fA-F]+$/ && (@scanner[0].length == 4 || @scanner[0].length == 7)
|
370
|
+
return [:color, Script::Value::Color.from_hex(@scanner[0])]
|
371
|
+
end
|
372
|
+
[:ident, @scanner[0]]
|
285
373
|
end
|
286
374
|
|
287
375
|
def color
|
288
|
-
return unless
|
289
|
-
|
290
|
-
|
291
|
-
|
292
|
-
|
293
|
-
|
294
|
-
|
376
|
+
return unless @scanner.match?(REGULAR_EXPRESSIONS[:color])
|
377
|
+
return unless @scanner[0].length == 4 || @scanner[0].length == 7
|
378
|
+
script_color = Script::Value::Color.from_hex(scan(REGULAR_EXPRESSIONS[:color]))
|
379
|
+
[:color, script_color]
|
380
|
+
end
|
381
|
+
|
382
|
+
def selector
|
383
|
+
start_pos = source_position
|
384
|
+
return unless scan(REGULAR_EXPRESSIONS[:selector])
|
385
|
+
script_selector = Script::Tree::Selector.new
|
386
|
+
script_selector.source_range = range(start_pos)
|
387
|
+
[:selector, script_selector]
|
295
388
|
end
|
296
389
|
|
297
390
|
def special_fun
|
298
|
-
|
299
|
-
|
300
|
-
|
301
|
-
|
302
|
-
|
303
|
-
|
304
|
-
|
305
|
-
[
|
306
|
-
|
307
|
-
|
308
|
-
|
391
|
+
prefix = scan(/((-[\w-]+-)?(calc|element)|expression|progid:[a-z\.]*)\(/i)
|
392
|
+
return unless prefix
|
393
|
+
special_fun_body(1, prefix)
|
394
|
+
end
|
395
|
+
|
396
|
+
def special_fun_body(parens, prefix = nil)
|
397
|
+
str = prefix || ''
|
398
|
+
while (scanned = scan(/.*?([()]|\#\{)/m))
|
399
|
+
str << scanned
|
400
|
+
if scanned[-1] == ?(
|
401
|
+
parens += 1
|
402
|
+
next
|
403
|
+
elsif scanned[-1] == ?)
|
404
|
+
parens -= 1
|
405
|
+
next unless parens == 0
|
406
|
+
else
|
407
|
+
raise "[BUG] Unreachable" unless @scanner[1] == '#{' # '
|
408
|
+
str.slice!(-2..-1)
|
409
|
+
@interpolation_stack << [:special_fun, parens]
|
410
|
+
start_pos = Sass::Source::Position.new(@line, @offset - 2)
|
411
|
+
@next_tok = Token.new(:string_interpolation, range(start_pos), @scanner.pos - 2)
|
412
|
+
end
|
413
|
+
|
414
|
+
return [:special_fun, Sass::Script::Value::String.new(str)]
|
415
|
+
end
|
416
|
+
|
417
|
+
scan(/.*/)
|
418
|
+
expected!('")"')
|
309
419
|
end
|
310
420
|
|
311
421
|
def special_val
|
312
|
-
return unless scan(
|
313
|
-
[:string, Script::String.new("!important")]
|
422
|
+
return unless scan(/!#{W}important/i)
|
423
|
+
[:string, Script::Value::String.new("!important")]
|
314
424
|
end
|
315
425
|
|
316
426
|
def ident_op
|
317
|
-
|
427
|
+
op = scan(REGULAR_EXPRESSIONS[:ident_op])
|
428
|
+
return unless op
|
318
429
|
[OPERATORS[op]]
|
319
430
|
end
|
320
431
|
|
321
432
|
def op
|
322
|
-
|
323
|
-
|
324
|
-
|
433
|
+
op = scan(REGULAR_EXPRESSIONS[:op])
|
434
|
+
return unless op
|
435
|
+
name = OPERATORS[op]
|
436
|
+
@interpolation_stack << nil if name == :begin_interpolation
|
437
|
+
[name]
|
325
438
|
end
|
326
439
|
|
327
440
|
def raw(rx)
|
328
|
-
|
441
|
+
val = scan(rx)
|
442
|
+
return unless val
|
329
443
|
[:raw, val]
|
330
444
|
end
|
331
445
|
|
332
446
|
def scan(re)
|
333
|
-
|
447
|
+
str = @scanner.scan(re)
|
448
|
+
return unless str
|
334
449
|
c = str.count("\n")
|
335
450
|
@line += c
|
336
|
-
@offset = (c == 0 ? @offset + str.size : str
|
451
|
+
@offset = (c == 0 ? @offset + str.size : str.size - str.rindex("\n"))
|
337
452
|
str
|
338
453
|
end
|
339
454
|
|
340
|
-
def
|
341
|
-
@
|
455
|
+
def range(start_pos, end_pos = source_position)
|
456
|
+
Sass::Source::Range.new(start_pos, end_pos, @options[:filename], @options[:importer])
|
457
|
+
end
|
458
|
+
|
459
|
+
def source_position
|
460
|
+
Sass::Source::Position.new(@line, @offset)
|
342
461
|
end
|
343
462
|
end
|
344
463
|
end
|