diff options
Diffstat (limited to 'crates/ra_ide')
| -rw-r--r-- | crates/ra_ide/src/syntax_highlighting.rs | 2 | ||||
| -rw-r--r-- | crates/ra_ide/src/syntax_highlighting/tags.rs | 2 | ||||
| -rw-r--r-- | crates/ra_ide/test_data/highlight_doctest.html | 54 | ||||
| -rw-r--r-- | crates/ra_ide/test_data/highlight_injection.html | 20 | ||||
| -rw-r--r-- | crates/ra_ide/test_data/highlight_strings.html | 104 | ||||
| -rw-r--r-- | crates/ra_ide/test_data/highlight_unsafe.html | 28 | ||||
| -rw-r--r-- | crates/ra_ide/test_data/highlighting.html | 160 | ||||
| -rw-r--r-- | crates/ra_ide/test_data/rainbow_highlighting.html | 20 |
8 files changed, 196 insertions, 194 deletions
diff --git a/crates/ra_ide/src/syntax_highlighting.rs b/crates/ra_ide/src/syntax_highlighting.rs index 6067207d9..6ac44c2c0 100644 --- a/crates/ra_ide/src/syntax_highlighting.rs +++ b/crates/ra_ide/src/syntax_highlighting.rs | |||
| @@ -553,7 +553,7 @@ fn highlight_element( | |||
| 553 | T![!] if element.parent().and_then(ast::MacroCall::cast).is_some() => { | 553 | T![!] if element.parent().and_then(ast::MacroCall::cast).is_some() => { |
| 554 | Highlight::new(HighlightTag::Macro) | 554 | Highlight::new(HighlightTag::Macro) |
| 555 | } | 555 | } |
| 556 | p if p.is_punct() => HighlightTag::Operator.into(), | 556 | p if p.is_punct() => HighlightTag::Punctuation.into(), |
| 557 | 557 | ||
| 558 | k if k.is_keyword() => { | 558 | k if k.is_keyword() => { |
| 559 | let h = Highlight::new(HighlightTag::Keyword); | 559 | let h = Highlight::new(HighlightTag::Keyword); |
diff --git a/crates/ra_ide/src/syntax_highlighting/tags.rs b/crates/ra_ide/src/syntax_highlighting/tags.rs index 719c6ed3c..49ec94bdc 100644 --- a/crates/ra_ide/src/syntax_highlighting/tags.rs +++ b/crates/ra_ide/src/syntax_highlighting/tags.rs | |||
| @@ -32,6 +32,7 @@ pub enum HighlightTag { | |||
| 32 | Macro, | 32 | Macro, |
| 33 | Module, | 33 | Module, |
| 34 | NumericLiteral, | 34 | NumericLiteral, |
| 35 | Punctuation, | ||
| 35 | SelfKeyword, | 36 | SelfKeyword, |
| 36 | SelfType, | 37 | SelfType, |
| 37 | Static, | 38 | Static, |
| @@ -83,6 +84,7 @@ impl HighlightTag { | |||
| 83 | HighlightTag::Generic => "generic", | 84 | HighlightTag::Generic => "generic", |
| 84 | HighlightTag::Keyword => "keyword", | 85 | HighlightTag::Keyword => "keyword", |
| 85 | HighlightTag::Lifetime => "lifetime", | 86 | HighlightTag::Lifetime => "lifetime", |
| 87 | HighlightTag::Punctuation => "punctuation", | ||
| 86 | HighlightTag::Macro => "macro", | 88 | HighlightTag::Macro => "macro", |
| 87 | HighlightTag::Module => "module", | 89 | HighlightTag::Module => "module", |
| 88 | HighlightTag::NumericLiteral => "numeric_literal", | 90 | HighlightTag::NumericLiteral => "numeric_literal", |
diff --git a/crates/ra_ide/test_data/highlight_doctest.html b/crates/ra_ide/test_data/highlight_doctest.html index 8170ad895..1cc17d6d0 100644 --- a/crates/ra_ide/test_data/highlight_doctest.html +++ b/crates/ra_ide/test_data/highlight_doctest.html | |||
| @@ -36,67 +36,67 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd | |||
| 36 | .unresolved_reference { color: #FC5555; text-decoration: wavy underline; } | 36 | .unresolved_reference { color: #FC5555; text-decoration: wavy underline; } |
| 37 | </style> | 37 | </style> |
| 38 | <pre><code><span class="comment documentation">/// ```</span> | 38 | <pre><code><span class="comment documentation">/// ```</span> |
| 39 | <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="generic injected"> </span><span class="operator injected">_</span><span class="generic injected"> </span><span class="operator injected">=</span><span class="generic injected"> </span><span class="string_literal injected">"early doctests should not go boom"</span><span class="operator injected">;</span><span class="operator injected"> | 39 | <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="generic injected"> </span><span class="punctuation injected">_</span><span class="generic injected"> </span><span class="punctuation injected">=</span><span class="generic injected"> </span><span class="string_literal injected">"early doctests should not go boom"</span><span class="punctuation injected">;</span><span class="punctuation injected"> |
| 40 | </span><span class="comment documentation">/// ```</span> | 40 | </span><span class="comment documentation">/// ```</span> |
| 41 | <span class="keyword">struct</span> <span class="struct declaration">Foo</span> <span class="operator">{</span> | 41 | <span class="keyword">struct</span> <span class="struct declaration">Foo</span> <span class="punctuation">{</span> |
| 42 | <span class="field declaration">bar</span><span class="operator">:</span> <span class="builtin_type">bool</span><span class="operator">,</span> | 42 | <span class="field declaration">bar</span><span class="punctuation">:</span> <span class="builtin_type">bool</span><span class="punctuation">,</span> |
| 43 | <span class="operator">}</span> | 43 | <span class="punctuation">}</span> |
| 44 | 44 | ||
| 45 | <span class="keyword">impl</span> <span class="struct">Foo</span> <span class="operator">{</span> | 45 | <span class="keyword">impl</span> <span class="struct">Foo</span> <span class="punctuation">{</span> |
| 46 | <span class="keyword">pub</span> <span class="keyword">const</span> <span class="constant declaration">bar</span><span class="operator">:</span> <span class="builtin_type">bool</span> <span class="operator">=</span> <span class="bool_literal">true</span><span class="operator">;</span> | 46 | <span class="keyword">pub</span> <span class="keyword">const</span> <span class="constant declaration">bar</span><span class="punctuation">:</span> <span class="builtin_type">bool</span> <span class="punctuation">=</span> <span class="bool_literal">true</span><span class="punctuation">;</span> |
| 47 | 47 | ||
| 48 | <span class="comment documentation">/// Constructs a new `Foo`.</span> | 48 | <span class="comment documentation">/// Constructs a new `Foo`.</span> |
| 49 | <span class="comment documentation">///</span> | 49 | <span class="comment documentation">///</span> |
| 50 | <span class="comment documentation">/// # Examples</span> | 50 | <span class="comment documentation">/// # Examples</span> |
| 51 | <span class="comment documentation">///</span> | 51 | <span class="comment documentation">///</span> |
| 52 | <span class="comment documentation">/// ```</span> | 52 | <span class="comment documentation">/// ```</span> |
| 53 | <span class="comment documentation">/// #</span><span class="generic injected"> </span><span class="operator injected">#</span><span class="operator injected">!</span><span class="operator injected">[</span><span class="function attribute injected">allow</span><span class="operator injected">(</span><span class="attribute injected">unused_mut</span><span class="operator injected">)</span><span class="operator injected">]</span> | 53 | <span class="comment documentation">/// #</span><span class="generic injected"> </span><span class="punctuation injected">#</span><span class="punctuation injected">!</span><span class="punctuation injected">[</span><span class="function attribute injected">allow</span><span class="punctuation injected">(</span><span class="attribute injected">unused_mut</span><span class="punctuation injected">)</span><span class="punctuation injected">]</span> |
| 54 | <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="generic injected"> </span><span class="keyword injected">mut</span><span class="generic injected"> </span><span class="variable declaration injected mutable">foo</span><span class="operator injected">:</span><span class="generic injected"> </span><span class="struct injected">Foo</span><span class="generic injected"> </span><span class="operator injected">=</span><span class="generic injected"> </span><span class="struct injected">Foo</span><span class="operator injected">::</span><span class="function injected">new</span><span class="operator injected">(</span><span class="operator injected">)</span><span class="operator injected">;</span><span class="operator injected"> | 54 | <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="generic injected"> </span><span class="keyword injected">mut</span><span class="generic injected"> </span><span class="variable declaration injected mutable">foo</span><span class="punctuation injected">:</span><span class="generic injected"> </span><span class="struct injected">Foo</span><span class="generic injected"> </span><span class="punctuation injected">=</span><span class="generic injected"> </span><span class="struct injected">Foo</span><span class="punctuation injected">::</span><span class="function injected">new</span><span class="punctuation injected">(</span><span class="punctuation injected">)</span><span class="punctuation injected">;</span><span class="punctuation injected"> |
| 55 | </span> <span class="comment documentation">/// ```</span> | 55 | </span> <span class="comment documentation">/// ```</span> |
| 56 | <span class="keyword">pub</span> <span class="keyword">const</span> <span class="keyword">fn</span> <span class="function declaration">new</span><span class="operator">(</span><span class="operator">)</span> <span class="operator">-></span> <span class="struct">Foo</span> <span class="operator">{</span> | 56 | <span class="keyword">pub</span> <span class="keyword">const</span> <span class="keyword">fn</span> <span class="function declaration">new</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="punctuation">-></span> <span class="struct">Foo</span> <span class="punctuation">{</span> |
| 57 | <span class="struct">Foo</span> <span class="operator">{</span> <span class="field">bar</span><span class="operator">:</span> <span class="bool_literal">true</span> <span class="operator">}</span> | 57 | <span class="struct">Foo</span> <span class="punctuation">{</span> <span class="field">bar</span><span class="punctuation">:</span> <span class="bool_literal">true</span> <span class="punctuation">}</span> |
| 58 | <span class="operator">}</span> | 58 | <span class="punctuation">}</span> |
| 59 | 59 | ||
| 60 | <span class="comment documentation">/// `bar` method on `Foo`.</span> | 60 | <span class="comment documentation">/// `bar` method on `Foo`.</span> |
| 61 | <span class="comment documentation">///</span> | 61 | <span class="comment documentation">///</span> |
| 62 | <span class="comment documentation">/// # Examples</span> | 62 | <span class="comment documentation">/// # Examples</span> |
| 63 | <span class="comment documentation">///</span> | 63 | <span class="comment documentation">///</span> |
| 64 | <span class="comment documentation">/// ```</span> | 64 | <span class="comment documentation">/// ```</span> |
| 65 | <span class="comment documentation">/// </span><span class="keyword injected">use</span><span class="generic injected"> </span><span class="module injected">x</span><span class="operator injected">::</span><span class="module injected">y</span><span class="operator injected">;</span> | 65 | <span class="comment documentation">/// </span><span class="keyword injected">use</span><span class="generic injected"> </span><span class="module injected">x</span><span class="punctuation injected">::</span><span class="module injected">y</span><span class="punctuation injected">;</span> |
| 66 | <span class="comment documentation">///</span> | 66 | <span class="comment documentation">///</span> |
| 67 | <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="generic injected"> </span><span class="variable declaration injected">foo</span><span class="generic injected"> </span><span class="operator injected">=</span><span class="generic injected"> </span><span class="struct injected">Foo</span><span class="operator injected">::</span><span class="function injected">new</span><span class="operator injected">(</span><span class="operator injected">)</span><span class="operator injected">;</span> | 67 | <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="generic injected"> </span><span class="variable declaration injected">foo</span><span class="generic injected"> </span><span class="punctuation injected">=</span><span class="generic injected"> </span><span class="struct injected">Foo</span><span class="punctuation injected">::</span><span class="function injected">new</span><span class="punctuation injected">(</span><span class="punctuation injected">)</span><span class="punctuation injected">;</span> |
| 68 | <span class="comment documentation">///</span> | 68 | <span class="comment documentation">///</span> |
| 69 | <span class="comment documentation">/// </span><span class="comment injected">// calls bar on foo</span> | 69 | <span class="comment documentation">/// </span><span class="comment injected">// calls bar on foo</span> |
| 70 | <span class="comment documentation">/// </span><span class="macro injected">assert!</span><span class="operator injected">(</span><span class="generic injected">foo</span><span class="operator injected">.</span><span class="generic injected">bar</span><span class="operator injected">(</span><span class="operator injected">)</span><span class="operator injected">)</span><span class="operator injected">;</span> | 70 | <span class="comment documentation">/// </span><span class="macro injected">assert!</span><span class="punctuation injected">(</span><span class="generic injected">foo</span><span class="punctuation injected">.</span><span class="generic injected">bar</span><span class="punctuation injected">(</span><span class="punctuation injected">)</span><span class="punctuation injected">)</span><span class="punctuation injected">;</span> |
| 71 | <span class="comment documentation">///</span> | 71 | <span class="comment documentation">///</span> |
| 72 | <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="generic injected"> </span><span class="variable declaration injected">bar</span><span class="generic injected"> </span><span class="operator injected">=</span><span class="generic injected"> </span><span class="variable injected">foo</span><span class="operator injected">.</span><span class="field injected">bar</span><span class="generic injected"> </span><span class="operator injected">||</span><span class="generic injected"> </span><span class="struct injected">Foo</span><span class="operator injected">::</span><span class="constant injected">bar</span><span class="operator injected">;</span> | 72 | <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="generic injected"> </span><span class="variable declaration injected">bar</span><span class="generic injected"> </span><span class="punctuation injected">=</span><span class="generic injected"> </span><span class="variable injected">foo</span><span class="punctuation injected">.</span><span class="field injected">bar</span><span class="generic injected"> </span><span class="punctuation injected">||</span><span class="generic injected"> </span><span class="struct injected">Foo</span><span class="punctuation injected">::</span><span class="constant injected">bar</span><span class="punctuation injected">;</span> |
| 73 | <span class="comment documentation">///</span> | 73 | <span class="comment documentation">///</span> |
| 74 | <span class="comment documentation">/// </span><span class="comment injected">/* multi-line | 74 | <span class="comment documentation">/// </span><span class="comment injected">/* multi-line |
| 75 | </span><span class="comment documentation">/// </span><span class="comment injected"> comment */</span> | 75 | </span><span class="comment documentation">/// </span><span class="comment injected"> comment */</span> |
| 76 | <span class="comment documentation">///</span> | 76 | <span class="comment documentation">///</span> |
| 77 | <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="generic injected"> </span><span class="variable declaration injected">multi_line_string</span><span class="generic injected"> </span><span class="operator injected">=</span><span class="generic injected"> </span><span class="string_literal injected">"Foo | 77 | <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="generic injected"> </span><span class="variable declaration injected">multi_line_string</span><span class="generic injected"> </span><span class="punctuation injected">=</span><span class="generic injected"> </span><span class="string_literal injected">"Foo |
| 78 | </span><span class="comment documentation">/// </span><span class="string_literal injected"> bar | 78 | </span><span class="comment documentation">/// </span><span class="string_literal injected"> bar |
| 79 | </span><span class="comment documentation">/// </span><span class="string_literal injected"> "</span><span class="operator injected">;</span> | 79 | </span><span class="comment documentation">/// </span><span class="string_literal injected"> "</span><span class="punctuation injected">;</span> |
| 80 | <span class="comment documentation">///</span> | 80 | <span class="comment documentation">///</span> |
| 81 | <span class="comment documentation">/// ```</span> | 81 | <span class="comment documentation">/// ```</span> |
| 82 | <span class="comment documentation">///</span> | 82 | <span class="comment documentation">///</span> |
| 83 | <span class="comment documentation">/// ```rust,no_run</span> | 83 | <span class="comment documentation">/// ```rust,no_run</span> |
| 84 | <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="generic injected"> </span><span class="variable declaration injected">foobar</span><span class="generic injected"> </span><span class="operator injected">=</span><span class="generic injected"> </span><span class="struct injected">Foo</span><span class="operator injected">::</span><span class="function injected">new</span><span class="operator injected">(</span><span class="operator injected">)</span><span class="operator injected">.</span><span class="function injected">bar</span><span class="operator injected">(</span><span class="operator injected">)</span><span class="operator injected">;</span><span class="operator injected"> | 84 | <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="generic injected"> </span><span class="variable declaration injected">foobar</span><span class="generic injected"> </span><span class="punctuation injected">=</span><span class="generic injected"> </span><span class="struct injected">Foo</span><span class="punctuation injected">::</span><span class="function injected">new</span><span class="punctuation injected">(</span><span class="punctuation injected">)</span><span class="punctuation injected">.</span><span class="function injected">bar</span><span class="punctuation injected">(</span><span class="punctuation injected">)</span><span class="punctuation injected">;</span><span class="punctuation injected"> |
| 85 | </span> <span class="comment documentation">/// ```</span> | 85 | </span> <span class="comment documentation">/// ```</span> |
| 86 | <span class="comment documentation">///</span> | 86 | <span class="comment documentation">///</span> |
| 87 | <span class="comment documentation">/// ```sh</span> | 87 | <span class="comment documentation">/// ```sh</span> |
| 88 | <span class="comment documentation">/// echo 1</span> | 88 | <span class="comment documentation">/// echo 1</span> |
| 89 | <span class="comment documentation">/// ```</span> | 89 | <span class="comment documentation">/// ```</span> |
| 90 | <span class="keyword">pub</span> <span class="keyword">fn</span> <span class="function declaration">foo</span><span class="operator">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="operator">)</span> <span class="operator">-></span> <span class="builtin_type">bool</span> <span class="operator">{</span> | 90 | <span class="keyword">pub</span> <span class="keyword">fn</span> <span class="function declaration">foo</span><span class="punctuation">(</span><span class="punctuation">&</span><span class="self_keyword">self</span><span class="punctuation">)</span> <span class="punctuation">-></span> <span class="builtin_type">bool</span> <span class="punctuation">{</span> |
| 91 | <span class="bool_literal">true</span> | 91 | <span class="bool_literal">true</span> |
| 92 | <span class="operator">}</span> | 92 | <span class="punctuation">}</span> |
| 93 | <span class="operator">}</span> | 93 | <span class="punctuation">}</span> |
| 94 | 94 | ||
| 95 | <span class="comment documentation">/// ```</span> | 95 | <span class="comment documentation">/// ```</span> |
| 96 | <span class="comment documentation">/// </span><span class="macro injected">noop!</span><span class="operator injected">(</span><span class="numeric_literal injected">1</span><span class="operator injected">)</span><span class="operator injected">;</span><span class="operator injected"> | 96 | <span class="comment documentation">/// </span><span class="macro injected">noop!</span><span class="punctuation injected">(</span><span class="numeric_literal injected">1</span><span class="punctuation injected">)</span><span class="punctuation injected">;</span><span class="punctuation injected"> |
| 97 | </span><span class="comment documentation">/// ```</span> | 97 | </span><span class="comment documentation">/// ```</span> |
| 98 | <span class="macro">macro_rules!</span> <span class="macro declaration">noop</span> <span class="operator">{</span> | 98 | <span class="macro">macro_rules!</span> <span class="macro declaration">noop</span> <span class="punctuation">{</span> |
| 99 | <span class="operator">(</span><span class="operator">$</span>expr<span class="operator">:</span>expr<span class="operator">)</span> <span class="operator">=</span><span class="operator">></span> <span class="operator">{</span> | 99 | <span class="punctuation">(</span><span class="punctuation">$</span>expr<span class="punctuation">:</span>expr<span class="punctuation">)</span> <span class="punctuation">=</span><span class="punctuation">></span> <span class="punctuation">{</span> |
| 100 | <span class="operator">$</span>expr | 100 | <span class="punctuation">$</span>expr |
| 101 | <span class="operator">}</span> | 101 | <span class="punctuation">}</span> |
| 102 | <span class="operator">}</span></code></pre> \ No newline at end of file | 102 | <span class="punctuation">}</span></code></pre> \ No newline at end of file |
diff --git a/crates/ra_ide/test_data/highlight_injection.html b/crates/ra_ide/test_data/highlight_injection.html index 62cba023d..461cfc437 100644 --- a/crates/ra_ide/test_data/highlight_injection.html +++ b/crates/ra_ide/test_data/highlight_injection.html | |||
| @@ -35,14 +35,14 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd | |||
| 35 | 35 | ||
| 36 | .unresolved_reference { color: #FC5555; text-decoration: wavy underline; } | 36 | .unresolved_reference { color: #FC5555; text-decoration: wavy underline; } |
| 37 | </style> | 37 | </style> |
| 38 | <pre><code><span class="keyword">fn</span> <span class="function declaration">fixture</span><span class="operator">(</span><span class="value_param declaration">ra_fixture</span><span class="operator">:</span> <span class="operator">&</span><span class="builtin_type">str</span><span class="operator">)</span> <span class="operator">{</span><span class="operator">}</span> | 38 | <pre><code><span class="keyword">fn</span> <span class="function declaration">fixture</span><span class="punctuation">(</span><span class="value_param declaration">ra_fixture</span><span class="punctuation">:</span> <span class="punctuation">&</span><span class="builtin_type">str</span><span class="punctuation">)</span> <span class="punctuation">{</span><span class="punctuation">}</span> |
| 39 | 39 | ||
| 40 | <span class="keyword">fn</span> <span class="function declaration">main</span><span class="operator">(</span><span class="operator">)</span> <span class="operator">{</span> | 40 | <span class="keyword">fn</span> <span class="function declaration">main</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="punctuation">{</span> |
| 41 | <span class="function">fixture</span><span class="operator">(</span><span class="string_literal">r#"</span> | 41 | <span class="function">fixture</span><span class="punctuation">(</span><span class="string_literal">r#"</span> |
| 42 | <span class="keyword">trait</span> <span class="trait declaration">Foo</span> <span class="operator">{</span> | 42 | <span class="keyword">trait</span> <span class="trait declaration">Foo</span> <span class="punctuation">{</span> |
| 43 | <span class="keyword">fn</span> <span class="function declaration">foo</span><span class="operator">(</span><span class="operator">)</span> <span class="operator">{</span> | 43 | <span class="keyword">fn</span> <span class="function declaration">foo</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="punctuation">{</span> |
| 44 | <span class="macro">println!</span><span class="operator">(</span><span class="string_literal">"2 + 2 = {}"</span><span class="operator">,</span> <span class="numeric_literal">4</span><span class="operator">)</span><span class="operator">;</span> | 44 | <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"2 + 2 = {}"</span><span class="punctuation">,</span> <span class="numeric_literal">4</span><span class="punctuation">)</span><span class="punctuation">;</span> |
| 45 | <span class="operator">}</span> | 45 | <span class="punctuation">}</span> |
| 46 | <span class="operator">}</span><span class="string_literal">"#</span> | 46 | <span class="punctuation">}</span><span class="string_literal">"#</span> |
| 47 | <span class="operator">)</span><span class="operator">;</span> | 47 | <span class="punctuation">)</span><span class="punctuation">;</span> |
| 48 | <span class="operator">}</span></code></pre> \ No newline at end of file | 48 | <span class="punctuation">}</span></code></pre> \ No newline at end of file |
diff --git a/crates/ra_ide/test_data/highlight_strings.html b/crates/ra_ide/test_data/highlight_strings.html index 1ee7bdee4..9f98e73e7 100644 --- a/crates/ra_ide/test_data/highlight_strings.html +++ b/crates/ra_ide/test_data/highlight_strings.html | |||
| @@ -35,62 +35,62 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd | |||
| 35 | 35 | ||
| 36 | .unresolved_reference { color: #FC5555; text-decoration: wavy underline; } | 36 | .unresolved_reference { color: #FC5555; text-decoration: wavy underline; } |
| 37 | </style> | 37 | </style> |
| 38 | <pre><code><span class="macro">macro_rules!</span> <span class="macro declaration">println</span> <span class="operator">{</span> | 38 | <pre><code><span class="macro">macro_rules!</span> <span class="macro declaration">println</span> <span class="punctuation">{</span> |
| 39 | <span class="operator">(</span><span class="operator">$</span><span class="operator">(</span><span class="operator">$</span>arg<span class="operator">:</span>tt<span class="operator">)</span>*<span class="operator">)</span> <span class="operator">=</span><span class="operator">></span> <span class="operator">(</span><span class="operator">{</span> | 39 | <span class="punctuation">(</span><span class="punctuation">$</span><span class="punctuation">(</span><span class="punctuation">$</span>arg<span class="punctuation">:</span>tt<span class="punctuation">)</span>*<span class="punctuation">)</span> <span class="punctuation">=</span><span class="punctuation">></span> <span class="punctuation">(</span><span class="punctuation">{</span> |
| 40 | <span class="operator">$</span><span class="keyword">crate</span><span class="operator">:</span><span class="operator">:</span>io<span class="operator">:</span><span class="operator">:</span>_print<span class="operator">(</span><span class="operator">$</span><span class="keyword">crate</span><span class="operator">:</span><span class="operator">:</span>format_args_nl<span class="operator">!</span><span class="operator">(</span><span class="operator">$</span><span class="operator">(</span><span class="operator">$</span>arg<span class="operator">)</span>*<span class="operator">)</span><span class="operator">)</span><span class="operator">;</span> | 40 | <span class="punctuation">$</span><span class="keyword">crate</span><span class="punctuation">:</span><span class="punctuation">:</span>io<span class="punctuation">:</span><span class="punctuation">:</span>_print<span class="punctuation">(</span><span class="punctuation">$</span><span class="keyword">crate</span><span class="punctuation">:</span><span class="punctuation">:</span>format_args_nl<span class="punctuation">!</span><span class="punctuation">(</span><span class="punctuation">$</span><span class="punctuation">(</span><span class="punctuation">$</span>arg<span class="punctuation">)</span>*<span class="punctuation">)</span><span class="punctuation">)</span><span class="punctuation">;</span> |
| 41 | <span class="operator">}</span><span class="operator">)</span> | 41 | <span class="punctuation">}</span><span class="punctuation">)</span> |
| 42 | <span class="operator">}</span> | 42 | <span class="punctuation">}</span> |
| 43 | #[rustc_builtin_macro] | 43 | #[rustc_builtin_macro] |
| 44 | <span class="macro">macro_rules!</span> <span class="macro declaration">format_args_nl</span> <span class="operator">{</span> | 44 | <span class="macro">macro_rules!</span> <span class="macro declaration">format_args_nl</span> <span class="punctuation">{</span> |
| 45 | <span class="operator">(</span><span class="operator">$</span>fmt<span class="operator">:</span>expr<span class="operator">)</span> <span class="operator">=</span><span class="operator">></span> <span class="operator">{</span><span class="operator">{</span> <span class="comment">/* compiler built-in */</span> <span class="operator">}</span><span class="operator">}</span><span class="operator">;</span> | 45 | <span class="punctuation">(</span><span class="punctuation">$</span>fmt<span class="punctuation">:</span>expr<span class="punctuation">)</span> <span class="punctuation">=</span><span class="punctuation">></span> <span class="punctuation">{</span><span class="punctuation">{</span> <span class="comment">/* compiler built-in */</span> <span class="punctuation">}</span><span class="punctuation">}</span><span class="punctuation">;</span> |
| 46 | <span class="operator">(</span><span class="operator">$</span>fmt<span class="operator">:</span>expr<span class="operator">,</span> <span class="operator">$</span><span class="operator">(</span><span class="operator">$</span>args<span class="operator">:</span>tt<span class="operator">)</span>*<span class="operator">)</span> <span class="operator">=</span><span class="operator">></span> <span class="operator">{</span><span class="operator">{</span> <span class="comment">/* compiler built-in */</span> <span class="operator">}</span><span class="operator">}</span><span class="operator">;</span> | 46 | <span class="punctuation">(</span><span class="punctuation">$</span>fmt<span class="punctuation">:</span>expr<span class="punctuation">,</span> <span class="punctuation">$</span><span class="punctuation">(</span><span class="punctuation">$</span>args<span class="punctuation">:</span>tt<span class="punctuation">)</span>*<span class="punctuation">)</span> <span class="punctuation">=</span><span class="punctuation">></span> <span class="punctuation">{</span><span class="punctuation">{</span> <span class="comment">/* compiler built-in */</span> <span class="punctuation">}</span><span class="punctuation">}</span><span class="punctuation">;</span> |
| 47 | <span class="operator">}</span> | 47 | <span class="punctuation">}</span> |
| 48 | 48 | ||
| 49 | <span class="keyword">fn</span> <span class="function declaration">main</span><span class="operator">(</span><span class="operator">)</span> <span class="operator">{</span> | 49 | <span class="keyword">fn</span> <span class="function declaration">main</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="punctuation">{</span> |
| 50 | <span class="comment">// from https://doc.rust-lang.org/std/fmt/index.html</span> | 50 | <span class="comment">// from https://doc.rust-lang.org/std/fmt/index.html</span> |
| 51 | <span class="macro">println!</span><span class="operator">(</span><span class="string_literal">"Hello"</span><span class="operator">)</span><span class="operator">;</span> <span class="comment">// => "Hello"</span> | 51 | <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello"</span><span class="punctuation">)</span><span class="punctuation">;</span> <span class="comment">// => "Hello"</span> |
| 52 | <span class="macro">println!</span><span class="operator">(</span><span class="string_literal">"Hello, </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="operator">,</span> <span class="string_literal">"world"</span><span class="operator">)</span><span class="operator">;</span> <span class="comment">// => "Hello, world!"</span> | 52 | <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello, </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="punctuation">,</span> <span class="string_literal">"world"</span><span class="punctuation">)</span><span class="punctuation">;</span> <span class="comment">// => "Hello, world!"</span> |
| 53 | <span class="macro">println!</span><span class="operator">(</span><span class="string_literal">"The number is </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="operator">,</span> <span class="numeric_literal">1</span><span class="operator">)</span><span class="operator">;</span> <span class="comment">// => "The number is 1"</span> | 53 | <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"The number is </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="punctuation">,</span> <span class="numeric_literal">1</span><span class="punctuation">)</span><span class="punctuation">;</span> <span class="comment">// => "The number is 1"</span> |
| 54 | <span class="macro">println!</span><span class="operator">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">?</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="operator">,</span> <span class="operator">(</span><span class="numeric_literal">3</span><span class="operator">,</span> <span class="numeric_literal">4</span><span class="operator">)</span><span class="operator">)</span><span class="operator">;</span> <span class="comment">// => "(3, 4)"</span> | 54 | <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">?</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="punctuation">,</span> <span class="punctuation">(</span><span class="numeric_literal">3</span><span class="punctuation">,</span> <span class="numeric_literal">4</span><span class="punctuation">)</span><span class="punctuation">)</span><span class="punctuation">;</span> <span class="comment">// => "(3, 4)"</span> |
| 55 | <span class="macro">println!</span><span class="operator">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="variable">value</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="operator">,</span> value<span class="operator">=</span><span class="numeric_literal">4</span><span class="operator">)</span><span class="operator">;</span> <span class="comment">// => "4"</span> | 55 | <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="variable">value</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="punctuation">,</span> value<span class="punctuation">=</span><span class="numeric_literal">4</span><span class="punctuation">)</span><span class="punctuation">;</span> <span class="comment">// => "4"</span> |
| 56 | <span class="macro">println!</span><span class="operator">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal"> </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="operator">,</span> <span class="numeric_literal">1</span><span class="operator">,</span> <span class="numeric_literal">2</span><span class="operator">)</span><span class="operator">;</span> <span class="comment">// => "1 2"</span> | 56 | <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal"> </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="punctuation">,</span> <span class="numeric_literal">1</span><span class="punctuation">,</span> <span class="numeric_literal">2</span><span class="punctuation">)</span><span class="punctuation">;</span> <span class="comment">// => "1 2"</span> |
| 57 | <span class="macro">println!</span><span class="operator">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="numeric_literal">0</span><span class="numeric_literal">4</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="operator">,</span> <span class="numeric_literal">42</span><span class="operator">)</span><span class="operator">;</span> <span class="comment">// => "0042" with leading zerosV</span> | 57 | <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="numeric_literal">0</span><span class="numeric_literal">4</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="punctuation">,</span> <span class="numeric_literal">42</span><span class="punctuation">)</span><span class="punctuation">;</span> <span class="comment">// => "0042" with leading zerosV</span> |
| 58 | <span class="macro">println!</span><span class="operator">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="numeric_literal">1</span><span class="format_specifier">}</span><span class="string_literal"> </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal"> </span><span class="format_specifier">{</span><span class="numeric_literal">0</span><span class="format_specifier">}</span><span class="string_literal"> </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="operator">,</span> <span class="numeric_literal">1</span><span class="operator">,</span> <span class="numeric_literal">2</span><span class="operator">)</span><span class="operator">;</span> <span class="comment">// => "2 1 1 2"</span> | 58 | <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="numeric_literal">1</span><span class="format_specifier">}</span><span class="string_literal"> </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal"> </span><span class="format_specifier">{</span><span class="numeric_literal">0</span><span class="format_specifier">}</span><span class="string_literal"> </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="punctuation">,</span> <span class="numeric_literal">1</span><span class="punctuation">,</span> <span class="numeric_literal">2</span><span class="punctuation">)</span><span class="punctuation">;</span> <span class="comment">// => "2 1 1 2"</span> |
| 59 | <span class="macro">println!</span><span class="operator">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="variable">argument</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="operator">,</span> argument <span class="operator">=</span> <span class="string_literal">"test"</span><span class="operator">)</span><span class="operator">;</span> <span class="comment">// => "test"</span> | 59 | <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="variable">argument</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="punctuation">,</span> argument <span class="punctuation">=</span> <span class="string_literal">"test"</span><span class="punctuation">)</span><span class="punctuation">;</span> <span class="comment">// => "test"</span> |
| 60 | <span class="macro">println!</span><span class="operator">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="variable">name</span><span class="format_specifier">}</span><span class="string_literal"> </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="operator">,</span> <span class="numeric_literal">1</span><span class="operator">,</span> name <span class="operator">=</span> <span class="numeric_literal">2</span><span class="operator">)</span><span class="operator">;</span> <span class="comment">// => "2 1"</span> | 60 | <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="variable">name</span><span class="format_specifier">}</span><span class="string_literal"> </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="punctuation">,</span> <span class="numeric_literal">1</span><span class="punctuation">,</span> name <span class="punctuation">=</span> <span class="numeric_literal">2</span><span class="punctuation">)</span><span class="punctuation">;</span> <span class="comment">// => "2 1"</span> |
| 61 | <span class="macro">println!</span><span class="operator">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="variable">a</span><span class="format_specifier">}</span><span class="string_literal"> </span><span class="format_specifier">{</span><span class="variable">c</span><span class="format_specifier">}</span><span class="string_literal"> </span><span class="format_specifier">{</span><span class="variable">b</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="operator">,</span> a<span class="operator">=</span><span class="string_literal">"a"</span><span class="operator">,</span> b<span class="operator">=</span><span class="char_literal">'b'</span><span class="operator">,</span> c<span class="operator">=</span><span class="numeric_literal">3</span><span class="operator">)</span><span class="operator">;</span> <span class="comment">// => "a 3 b"</span> | 61 | <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="variable">a</span><span class="format_specifier">}</span><span class="string_literal"> </span><span class="format_specifier">{</span><span class="variable">c</span><span class="format_specifier">}</span><span class="string_literal"> </span><span class="format_specifier">{</span><span class="variable">b</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="punctuation">,</span> a<span class="punctuation">=</span><span class="string_literal">"a"</span><span class="punctuation">,</span> b<span class="punctuation">=</span><span class="char_literal">'b'</span><span class="punctuation">,</span> c<span class="punctuation">=</span><span class="numeric_literal">3</span><span class="punctuation">)</span><span class="punctuation">;</span> <span class="comment">// => "a 3 b"</span> |
| 62 | <span class="macro">println!</span><span class="operator">(</span><span class="string_literal">"{{</span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">}}"</span><span class="operator">,</span> <span class="numeric_literal">2</span><span class="operator">)</span><span class="operator">;</span> <span class="comment">// => "{2}"</span> | 62 | <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"{{</span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">}}"</span><span class="punctuation">,</span> <span class="numeric_literal">2</span><span class="punctuation">)</span><span class="punctuation">;</span> <span class="comment">// => "{2}"</span> |
| 63 | <span class="macro">println!</span><span class="operator">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="numeric_literal">5</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="operator">,</span> <span class="string_literal">"x"</span><span class="operator">)</span><span class="operator">;</span> | 63 | <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="numeric_literal">5</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="punctuation">,</span> <span class="string_literal">"x"</span><span class="punctuation">)</span><span class="punctuation">;</span> |
| 64 | <span class="macro">println!</span><span class="operator">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="numeric_literal">1</span><span class="format_specifier">$</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="operator">,</span> <span class="string_literal">"x"</span><span class="operator">,</span> <span class="numeric_literal">5</span><span class="operator">)</span><span class="operator">;</span> | 64 | <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="numeric_literal">1</span><span class="format_specifier">$</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="punctuation">,</span> <span class="string_literal">"x"</span><span class="punctuation">,</span> <span class="numeric_literal">5</span><span class="punctuation">)</span><span class="punctuation">;</span> |
| 65 | <span class="macro">println!</span><span class="operator">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="numeric_literal">1</span><span class="format_specifier">:</span><span class="numeric_literal">0</span><span class="format_specifier">$</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="operator">,</span> <span class="numeric_literal">5</span><span class="operator">,</span> <span class="string_literal">"x"</span><span class="operator">)</span><span class="operator">;</span> | 65 | <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="numeric_literal">1</span><span class="format_specifier">:</span><span class="numeric_literal">0</span><span class="format_specifier">$</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="punctuation">,</span> <span class="numeric_literal">5</span><span class="punctuation">,</span> <span class="string_literal">"x"</span><span class="punctuation">)</span><span class="punctuation">;</span> |
| 66 | <span class="macro">println!</span><span class="operator">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="variable">width</span><span class="format_specifier">$</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="operator">,</span> <span class="string_literal">"x"</span><span class="operator">,</span> width <span class="operator">=</span> <span class="numeric_literal">5</span><span class="operator">)</span><span class="operator">;</span> | 66 | <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="variable">width</span><span class="format_specifier">$</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="punctuation">,</span> <span class="string_literal">"x"</span><span class="punctuation">,</span> width <span class="punctuation">=</span> <span class="numeric_literal">5</span><span class="punctuation">)</span><span class="punctuation">;</span> |
| 67 | <span class="macro">println!</span><span class="operator">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier"><</span><span class="numeric_literal">5</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="operator">,</span> <span class="string_literal">"x"</span><span class="operator">)</span><span class="operator">;</span> | 67 | <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier"><</span><span class="numeric_literal">5</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="punctuation">,</span> <span class="string_literal">"x"</span><span class="punctuation">)</span><span class="punctuation">;</span> |
| 68 | <span class="macro">println!</span><span class="operator">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">-</span><span class="format_specifier"><</span><span class="numeric_literal">5</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="operator">,</span> <span class="string_literal">"x"</span><span class="operator">)</span><span class="operator">;</span> | 68 | <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">-</span><span class="format_specifier"><</span><span class="numeric_literal">5</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="punctuation">,</span> <span class="string_literal">"x"</span><span class="punctuation">)</span><span class="punctuation">;</span> |
| 69 | <span class="macro">println!</span><span class="operator">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">^</span><span class="numeric_literal">5</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="operator">,</span> <span class="string_literal">"x"</span><span class="operator">)</span><span class="operator">;</span> | 69 | <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">^</span><span class="numeric_literal">5</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="punctuation">,</span> <span class="string_literal">"x"</span><span class="punctuation">)</span><span class="punctuation">;</span> |
| 70 | <span class="macro">println!</span><span class="operator">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">></span><span class="numeric_literal">5</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="operator">,</span> <span class="string_literal">"x"</span><span class="operator">)</span><span class="operator">;</span> | 70 | <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">></span><span class="numeric_literal">5</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="punctuation">,</span> <span class="string_literal">"x"</span><span class="punctuation">)</span><span class="punctuation">;</span> |
| 71 | <span class="macro">println!</span><span class="operator">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">+</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="operator">,</span> <span class="numeric_literal">5</span><span class="operator">)</span><span class="operator">;</span> | 71 | <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">+</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="punctuation">,</span> <span class="numeric_literal">5</span><span class="punctuation">)</span><span class="punctuation">;</span> |
| 72 | <span class="macro">println!</span><span class="operator">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">#</span><span class="variable">x</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="operator">,</span> <span class="numeric_literal">27</span><span class="operator">)</span><span class="operator">;</span> | 72 | <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">#</span><span class="variable">x</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="punctuation">,</span> <span class="numeric_literal">27</span><span class="punctuation">)</span><span class="punctuation">;</span> |
| 73 | <span class="macro">println!</span><span class="operator">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="numeric_literal">0</span><span class="numeric_literal">5</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="operator">,</span> <span class="numeric_literal">5</span><span class="operator">)</span><span class="operator">;</span> | 73 | <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="numeric_literal">0</span><span class="numeric_literal">5</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="punctuation">,</span> <span class="numeric_literal">5</span><span class="punctuation">)</span><span class="punctuation">;</span> |
| 74 | <span class="macro">println!</span><span class="operator">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="numeric_literal">0</span><span class="numeric_literal">5</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="operator">,</span> <span class="operator">-</span><span class="numeric_literal">5</span><span class="operator">)</span><span class="operator">;</span> | 74 | <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="numeric_literal">0</span><span class="numeric_literal">5</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="punctuation">,</span> <span class="punctuation">-</span><span class="numeric_literal">5</span><span class="punctuation">)</span><span class="punctuation">;</span> |
| 75 | <span class="macro">println!</span><span class="operator">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">#</span><span class="numeric_literal">0</span><span class="numeric_literal">10</span><span class="variable">x</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="operator">,</span> <span class="numeric_literal">27</span><span class="operator">)</span><span class="operator">;</span> | 75 | <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">#</span><span class="numeric_literal">0</span><span class="numeric_literal">10</span><span class="variable">x</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="punctuation">,</span> <span class="numeric_literal">27</span><span class="punctuation">)</span><span class="punctuation">;</span> |
| 76 | <span class="macro">println!</span><span class="operator">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="numeric_literal">0</span><span class="format_specifier">}</span><span class="string_literal"> is </span><span class="format_specifier">{</span><span class="numeric_literal">1</span><span class="format_specifier">:</span><span class="format_specifier">.</span><span class="numeric_literal">5</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="operator">,</span> <span class="string_literal">"x"</span><span class="operator">,</span> <span class="numeric_literal">0.01</span><span class="operator">)</span><span class="operator">;</span> | 76 | <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="numeric_literal">0</span><span class="format_specifier">}</span><span class="string_literal"> is </span><span class="format_specifier">{</span><span class="numeric_literal">1</span><span class="format_specifier">:</span><span class="format_specifier">.</span><span class="numeric_literal">5</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="punctuation">,</span> <span class="string_literal">"x"</span><span class="punctuation">,</span> <span class="numeric_literal">0.01</span><span class="punctuation">)</span><span class="punctuation">;</span> |
| 77 | <span class="macro">println!</span><span class="operator">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="numeric_literal">1</span><span class="format_specifier">}</span><span class="string_literal"> is </span><span class="format_specifier">{</span><span class="numeric_literal">2</span><span class="format_specifier">:</span><span class="format_specifier">.</span><span class="numeric_literal">0</span><span class="format_specifier">$</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="operator">,</span> <span class="numeric_literal">5</span><span class="operator">,</span> <span class="string_literal">"x"</span><span class="operator">,</span> <span class="numeric_literal">0.01</span><span class="operator">)</span><span class="operator">;</span> | 77 | <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="numeric_literal">1</span><span class="format_specifier">}</span><span class="string_literal"> is </span><span class="format_specifier">{</span><span class="numeric_literal">2</span><span class="format_specifier">:</span><span class="format_specifier">.</span><span class="numeric_literal">0</span><span class="format_specifier">$</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="punctuation">,</span> <span class="numeric_literal">5</span><span class="punctuation">,</span> <span class="string_literal">"x"</span><span class="punctuation">,</span> <span class="numeric_literal">0.01</span><span class="punctuation">)</span><span class="punctuation">;</span> |
| 78 | <span class="macro">println!</span><span class="operator">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="numeric_literal">0</span><span class="format_specifier">}</span><span class="string_literal"> is </span><span class="format_specifier">{</span><span class="numeric_literal">2</span><span class="format_specifier">:</span><span class="format_specifier">.</span><span class="numeric_literal">1</span><span class="format_specifier">$</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="operator">,</span> <span class="string_literal">"x"</span><span class="operator">,</span> <span class="numeric_literal">5</span><span class="operator">,</span> <span class="numeric_literal">0.01</span><span class="operator">)</span><span class="operator">;</span> | 78 | <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="numeric_literal">0</span><span class="format_specifier">}</span><span class="string_literal"> is </span><span class="format_specifier">{</span><span class="numeric_literal">2</span><span class="format_specifier">:</span><span class="format_specifier">.</span><span class="numeric_literal">1</span><span class="format_specifier">$</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="punctuation">,</span> <span class="string_literal">"x"</span><span class="punctuation">,</span> <span class="numeric_literal">5</span><span class="punctuation">,</span> <span class="numeric_literal">0.01</span><span class="punctuation">)</span><span class="punctuation">;</span> |
| 79 | <span class="macro">println!</span><span class="operator">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal"> is </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">.</span><span class="format_specifier">*</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="operator">,</span> <span class="string_literal">"x"</span><span class="operator">,</span> <span class="numeric_literal">5</span><span class="operator">,</span> <span class="numeric_literal">0.01</span><span class="operator">)</span><span class="operator">;</span> | 79 | <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal"> is </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">.</span><span class="format_specifier">*</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="punctuation">,</span> <span class="string_literal">"x"</span><span class="punctuation">,</span> <span class="numeric_literal">5</span><span class="punctuation">,</span> <span class="numeric_literal">0.01</span><span class="punctuation">)</span><span class="punctuation">;</span> |
| 80 | <span class="macro">println!</span><span class="operator">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal"> is </span><span class="format_specifier">{</span><span class="numeric_literal">2</span><span class="format_specifier">:</span><span class="format_specifier">.</span><span class="format_specifier">*</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="operator">,</span> <span class="string_literal">"x"</span><span class="operator">,</span> <span class="numeric_literal">5</span><span class="operator">,</span> <span class="numeric_literal">0.01</span><span class="operator">)</span><span class="operator">;</span> | 80 | <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal"> is </span><span class="format_specifier">{</span><span class="numeric_literal">2</span><span class="format_specifier">:</span><span class="format_specifier">.</span><span class="format_specifier">*</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="punctuation">,</span> <span class="string_literal">"x"</span><span class="punctuation">,</span> <span class="numeric_literal">5</span><span class="punctuation">,</span> <span class="numeric_literal">0.01</span><span class="punctuation">)</span><span class="punctuation">;</span> |
| 81 | <span class="macro">println!</span><span class="operator">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal"> is </span><span class="format_specifier">{</span><span class="variable">number</span><span class="format_specifier">:</span><span class="format_specifier">.</span><span class="variable">prec</span><span class="format_specifier">$</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="operator">,</span> <span class="string_literal">"x"</span><span class="operator">,</span> prec <span class="operator">=</span> <span class="numeric_literal">5</span><span class="operator">,</span> number <span class="operator">=</span> <span class="numeric_literal">0.01</span><span class="operator">)</span><span class="operator">;</span> | 81 | <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal"> is </span><span class="format_specifier">{</span><span class="variable">number</span><span class="format_specifier">:</span><span class="format_specifier">.</span><span class="variable">prec</span><span class="format_specifier">$</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="punctuation">,</span> <span class="string_literal">"x"</span><span class="punctuation">,</span> prec <span class="punctuation">=</span> <span class="numeric_literal">5</span><span class="punctuation">,</span> number <span class="punctuation">=</span> <span class="numeric_literal">0.01</span><span class="punctuation">)</span><span class="punctuation">;</span> |
| 82 | <span class="macro">println!</span><span class="operator">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">, `</span><span class="format_specifier">{</span><span class="variable">name</span><span class="format_specifier">:</span><span class="format_specifier">.</span><span class="format_specifier">*</span><span class="format_specifier">}</span><span class="string_literal">` has 3 fractional digits"</span><span class="operator">,</span> <span class="string_literal">"Hello"</span><span class="operator">,</span> <span class="numeric_literal">3</span><span class="operator">,</span> name<span class="operator">=</span><span class="numeric_literal">1234.56</span><span class="operator">)</span><span class="operator">;</span> | 82 | <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">, `</span><span class="format_specifier">{</span><span class="variable">name</span><span class="format_specifier">:</span><span class="format_specifier">.</span><span class="format_specifier">*</span><span class="format_specifier">}</span><span class="string_literal">` has 3 fractional digits"</span><span class="punctuation">,</span> <span class="string_literal">"Hello"</span><span class="punctuation">,</span> <span class="numeric_literal">3</span><span class="punctuation">,</span> name<span class="punctuation">=</span><span class="numeric_literal">1234.56</span><span class="punctuation">)</span><span class="punctuation">;</span> |
| 83 | <span class="macro">println!</span><span class="operator">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">, `</span><span class="format_specifier">{</span><span class="variable">name</span><span class="format_specifier">:</span><span class="format_specifier">.</span><span class="format_specifier">*</span><span class="format_specifier">}</span><span class="string_literal">` has 3 characters"</span><span class="operator">,</span> <span class="string_literal">"Hello"</span><span class="operator">,</span> <span class="numeric_literal">3</span><span class="operator">,</span> name<span class="operator">=</span><span class="string_literal">"1234.56"</span><span class="operator">)</span><span class="operator">;</span> | 83 | <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">, `</span><span class="format_specifier">{</span><span class="variable">name</span><span class="format_specifier">:</span><span class="format_specifier">.</span><span class="format_specifier">*</span><span class="format_specifier">}</span><span class="string_literal">` has 3 characters"</span><span class="punctuation">,</span> <span class="string_literal">"Hello"</span><span class="punctuation">,</span> <span class="numeric_literal">3</span><span class="punctuation">,</span> name<span class="punctuation">=</span><span class="string_literal">"1234.56"</span><span class="punctuation">)</span><span class="punctuation">;</span> |
| 84 | <span class="macro">println!</span><span class="operator">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">, `</span><span class="format_specifier">{</span><span class="variable">name</span><span class="format_specifier">:</span><span class="format_specifier">></span><span class="numeric_literal">8</span><span class="format_specifier">.</span><span class="format_specifier">*</span><span class="format_specifier">}</span><span class="string_literal">` has 3 right-aligned characters"</span><span class="operator">,</span> <span class="string_literal">"Hello"</span><span class="operator">,</span> <span class="numeric_literal">3</span><span class="operator">,</span> name<span class="operator">=</span><span class="string_literal">"1234.56"</span><span class="operator">)</span><span class="operator">;</span> | 84 | <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">, `</span><span class="format_specifier">{</span><span class="variable">name</span><span class="format_specifier">:</span><span class="format_specifier">></span><span class="numeric_literal">8</span><span class="format_specifier">.</span><span class="format_specifier">*</span><span class="format_specifier">}</span><span class="string_literal">` has 3 right-aligned characters"</span><span class="punctuation">,</span> <span class="string_literal">"Hello"</span><span class="punctuation">,</span> <span class="numeric_literal">3</span><span class="punctuation">,</span> name<span class="punctuation">=</span><span class="string_literal">"1234.56"</span><span class="punctuation">)</span><span class="punctuation">;</span> |
| 85 | <span class="macro">println!</span><span class="operator">(</span><span class="string_literal">"Hello {{}}"</span><span class="operator">)</span><span class="operator">;</span> | 85 | <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello {{}}"</span><span class="punctuation">)</span><span class="punctuation">;</span> |
| 86 | <span class="macro">println!</span><span class="operator">(</span><span class="string_literal">"{{ Hello"</span><span class="operator">)</span><span class="operator">;</span> | 86 | <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"{{ Hello"</span><span class="punctuation">)</span><span class="punctuation">;</span> |
| 87 | 87 | ||
| 88 | <span class="macro">println!</span><span class="operator">(</span><span class="string_literal">r"Hello, </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="operator">,</span> <span class="string_literal">"world"</span><span class="operator">)</span><span class="operator">;</span> | 88 | <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">r"Hello, </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="punctuation">,</span> <span class="string_literal">"world"</span><span class="punctuation">)</span><span class="punctuation">;</span> |
| 89 | 89 | ||
| 90 | <span class="comment">// escape sequences</span> | 90 | <span class="comment">// escape sequences</span> |
| 91 | <span class="macro">println!</span><span class="operator">(</span><span class="string_literal">"Hello</span><span class="escape_sequence">\n</span><span class="string_literal">World"</span><span class="operator">)</span><span class="operator">;</span> | 91 | <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello</span><span class="escape_sequence">\n</span><span class="string_literal">World"</span><span class="punctuation">)</span><span class="punctuation">;</span> |
| 92 | <span class="macro">println!</span><span class="operator">(</span><span class="string_literal">"</span><span class="escape_sequence">\u{48}</span><span class="escape_sequence">\x65</span><span class="escape_sequence">\x6C</span><span class="escape_sequence">\x6C</span><span class="escape_sequence">\x6F</span><span class="string_literal"> World"</span><span class="operator">)</span><span class="operator">;</span> | 92 | <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"</span><span class="escape_sequence">\u{48}</span><span class="escape_sequence">\x65</span><span class="escape_sequence">\x6C</span><span class="escape_sequence">\x6C</span><span class="escape_sequence">\x6F</span><span class="string_literal"> World"</span><span class="punctuation">)</span><span class="punctuation">;</span> |
| 93 | 93 | ||
| 94 | <span class="macro">println!</span><span class="operator">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="escape_sequence">\x41</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="operator">,</span> A <span class="operator">=</span> <span class="numeric_literal">92</span><span class="operator">)</span><span class="operator">;</span> | 94 | <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="escape_sequence">\x41</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="punctuation">,</span> A <span class="punctuation">=</span> <span class="numeric_literal">92</span><span class="punctuation">)</span><span class="punctuation">;</span> |
| 95 | <span class="macro">println!</span><span class="operator">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="variable">ничоси</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="operator">,</span> ничоси <span class="operator">=</span> <span class="numeric_literal">92</span><span class="operator">)</span><span class="operator">;</span> | 95 | <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="variable">ничоси</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="punctuation">,</span> ничоси <span class="punctuation">=</span> <span class="numeric_literal">92</span><span class="punctuation">)</span><span class="punctuation">;</span> |
| 96 | <span class="operator">}</span></code></pre> \ No newline at end of file | 96 | <span class="punctuation">}</span></code></pre> \ No newline at end of file |
diff --git a/crates/ra_ide/test_data/highlight_unsafe.html b/crates/ra_ide/test_data/highlight_unsafe.html index f41d775e4..88ac91f9a 100644 --- a/crates/ra_ide/test_data/highlight_unsafe.html +++ b/crates/ra_ide/test_data/highlight_unsafe.html | |||
| @@ -35,20 +35,20 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd | |||
| 35 | 35 | ||
| 36 | .unresolved_reference { color: #FC5555; text-decoration: wavy underline; } | 36 | .unresolved_reference { color: #FC5555; text-decoration: wavy underline; } |
| 37 | </style> | 37 | </style> |
| 38 | <pre><code><span class="keyword unsafe">unsafe</span> <span class="keyword">fn</span> <span class="function declaration unsafe">unsafe_fn</span><span class="operator">(</span><span class="operator">)</span> <span class="operator">{</span><span class="operator">}</span> | 38 | <pre><code><span class="keyword unsafe">unsafe</span> <span class="keyword">fn</span> <span class="function declaration unsafe">unsafe_fn</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="punctuation">{</span><span class="punctuation">}</span> |
| 39 | 39 | ||
| 40 | <span class="keyword">struct</span> <span class="struct declaration">HasUnsafeFn</span><span class="operator">;</span> | 40 | <span class="keyword">struct</span> <span class="struct declaration">HasUnsafeFn</span><span class="punctuation">;</span> |
| 41 | 41 | ||
| 42 | <span class="keyword">impl</span> <span class="struct">HasUnsafeFn</span> <span class="operator">{</span> | 42 | <span class="keyword">impl</span> <span class="struct">HasUnsafeFn</span> <span class="punctuation">{</span> |
| 43 | <span class="keyword unsafe">unsafe</span> <span class="keyword">fn</span> <span class="function declaration unsafe">unsafe_method</span><span class="operator">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="operator">)</span> <span class="operator">{</span><span class="operator">}</span> | 43 | <span class="keyword unsafe">unsafe</span> <span class="keyword">fn</span> <span class="function declaration unsafe">unsafe_method</span><span class="punctuation">(</span><span class="punctuation">&</span><span class="self_keyword">self</span><span class="punctuation">)</span> <span class="punctuation">{</span><span class="punctuation">}</span> |
| 44 | <span class="operator">}</span> | 44 | <span class="punctuation">}</span> |
| 45 | 45 | ||
| 46 | <span class="keyword">fn</span> <span class="function declaration">main</span><span class="operator">(</span><span class="operator">)</span> <span class="operator">{</span> | 46 | <span class="keyword">fn</span> <span class="function declaration">main</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="punctuation">{</span> |
| 47 | <span class="keyword">let</span> <span class="variable declaration">x</span> <span class="operator">=</span> <span class="operator">&</span><span class="numeric_literal">5</span> <span class="keyword">as</span> *<span class="keyword">const</span> <span class="builtin_type">usize</span><span class="operator">;</span> | 47 | <span class="keyword">let</span> <span class="variable declaration">x</span> <span class="punctuation">=</span> <span class="punctuation">&</span><span class="numeric_literal">5</span> <span class="keyword">as</span> *<span class="keyword">const</span> <span class="builtin_type">usize</span><span class="punctuation">;</span> |
| 48 | <span class="keyword unsafe">unsafe</span> <span class="operator">{</span> | 48 | <span class="keyword unsafe">unsafe</span> <span class="punctuation">{</span> |
| 49 | <span class="function unsafe">unsafe_fn</span><span class="operator">(</span><span class="operator">)</span><span class="operator">;</span> | 49 | <span class="function unsafe">unsafe_fn</span><span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">;</span> |
| 50 | <span class="struct">HasUnsafeFn</span><span class="operator">.</span><span class="function unsafe">unsafe_method</span><span class="operator">(</span><span class="operator">)</span><span class="operator">;</span> | 50 | <span class="struct">HasUnsafeFn</span><span class="punctuation">.</span><span class="function unsafe">unsafe_method</span><span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">;</span> |
| 51 | <span class="keyword">let</span> <span class="variable declaration">y</span> <span class="operator">=</span> <span class="operator unsafe">*</span><span class="operator">(</span><span class="variable">x</span><span class="operator">)</span><span class="operator">;</span> | 51 | <span class="keyword">let</span> <span class="variable declaration">y</span> <span class="punctuation">=</span> <span class="operator unsafe">*</span><span class="punctuation">(</span><span class="variable">x</span><span class="punctuation">)</span><span class="punctuation">;</span> |
| 52 | <span class="keyword">let</span> <span class="variable declaration">z</span> <span class="operator">=</span> <span class="operator">-</span><span class="variable">x</span><span class="operator">;</span> | 52 | <span class="keyword">let</span> <span class="variable declaration">z</span> <span class="punctuation">=</span> <span class="punctuation">-</span><span class="variable">x</span><span class="punctuation">;</span> |
| 53 | <span class="operator">}</span> | 53 | <span class="punctuation">}</span> |
| 54 | <span class="operator">}</span></code></pre> \ No newline at end of file | 54 | <span class="punctuation">}</span></code></pre> \ No newline at end of file |
diff --git a/crates/ra_ide/test_data/highlighting.html b/crates/ra_ide/test_data/highlighting.html index 42ffa831b..767e82f9d 100644 --- a/crates/ra_ide/test_data/highlighting.html +++ b/crates/ra_ide/test_data/highlighting.html | |||
| @@ -35,94 +35,94 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd | |||
| 35 | 35 | ||
| 36 | .unresolved_reference { color: #FC5555; text-decoration: wavy underline; } | 36 | .unresolved_reference { color: #FC5555; text-decoration: wavy underline; } |
| 37 | </style> | 37 | </style> |
| 38 | <pre><code><span class="operator">#</span><span class="operator">[</span><span class="function attribute">derive</span><span class="operator">(</span><span class="attribute">Clone</span><span class="operator">,</span><span class="attribute"> Debug</span><span class="operator">)</span><span class="operator">]</span> | 38 | <pre><code><span class="punctuation">#</span><span class="punctuation">[</span><span class="function attribute">derive</span><span class="punctuation">(</span><span class="attribute">Clone</span><span class="punctuation">,</span><span class="attribute"> Debug</span><span class="punctuation">)</span><span class="punctuation">]</span> |
| 39 | <span class="keyword">struct</span> <span class="struct declaration">Foo</span> <span class="operator">{</span> | 39 | <span class="keyword">struct</span> <span class="struct declaration">Foo</span> <span class="punctuation">{</span> |
| 40 | <span class="keyword">pub</span> <span class="field declaration">x</span><span class="operator">:</span> <span class="builtin_type">i32</span><span class="operator">,</span> | 40 | <span class="keyword">pub</span> <span class="field declaration">x</span><span class="punctuation">:</span> <span class="builtin_type">i32</span><span class="punctuation">,</span> |
| 41 | <span class="keyword">pub</span> <span class="field declaration">y</span><span class="operator">:</span> <span class="builtin_type">i32</span><span class="operator">,</span> | 41 | <span class="keyword">pub</span> <span class="field declaration">y</span><span class="punctuation">:</span> <span class="builtin_type">i32</span><span class="punctuation">,</span> |
| 42 | <span class="operator">}</span> | 42 | <span class="punctuation">}</span> |
| 43 | 43 | ||
| 44 | <span class="keyword">trait</span> <span class="trait declaration">Bar</span> <span class="operator">{</span> | 44 | <span class="keyword">trait</span> <span class="trait declaration">Bar</span> <span class="punctuation">{</span> |
| 45 | <span class="keyword">fn</span> <span class="function declaration">bar</span><span class="operator">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="operator">)</span> <span class="operator">-></span> <span class="builtin_type">i32</span><span class="operator">;</span> | 45 | <span class="keyword">fn</span> <span class="function declaration">bar</span><span class="punctuation">(</span><span class="punctuation">&</span><span class="self_keyword">self</span><span class="punctuation">)</span> <span class="punctuation">-></span> <span class="builtin_type">i32</span><span class="punctuation">;</span> |
| 46 | <span class="operator">}</span> | 46 | <span class="punctuation">}</span> |
| 47 | 47 | ||
| 48 | <span class="keyword">impl</span> <span class="trait">Bar</span> <span class="keyword">for</span> <span class="struct">Foo</span> <span class="operator">{</span> | 48 | <span class="keyword">impl</span> <span class="trait">Bar</span> <span class="keyword">for</span> <span class="struct">Foo</span> <span class="punctuation">{</span> |
| 49 | <span class="keyword">fn</span> <span class="function declaration">bar</span><span class="operator">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="operator">)</span> <span class="operator">-></span> <span class="builtin_type">i32</span> <span class="operator">{</span> | 49 | <span class="keyword">fn</span> <span class="function declaration">bar</span><span class="punctuation">(</span><span class="punctuation">&</span><span class="self_keyword">self</span><span class="punctuation">)</span> <span class="punctuation">-></span> <span class="builtin_type">i32</span> <span class="punctuation">{</span> |
| 50 | <span class="self_keyword">self</span><span class="operator">.</span><span class="field">x</span> | 50 | <span class="self_keyword">self</span><span class="punctuation">.</span><span class="field">x</span> |
| 51 | <span class="operator">}</span> | 51 | <span class="punctuation">}</span> |
| 52 | <span class="operator">}</span> | 52 | <span class="punctuation">}</span> |
| 53 | 53 | ||
| 54 | <span class="keyword">impl</span> <span class="struct">Foo</span> <span class="operator">{</span> | 54 | <span class="keyword">impl</span> <span class="struct">Foo</span> <span class="punctuation">{</span> |
| 55 | <span class="keyword">fn</span> <span class="function declaration">baz</span><span class="operator">(</span><span class="keyword">mut</span> <span class="self_keyword mutable">self</span><span class="operator">)</span> <span class="operator">-></span> <span class="builtin_type">i32</span> <span class="operator">{</span> | 55 | <span class="keyword">fn</span> <span class="function declaration">baz</span><span class="punctuation">(</span><span class="keyword">mut</span> <span class="self_keyword mutable">self</span><span class="punctuation">)</span> <span class="punctuation">-></span> <span class="builtin_type">i32</span> <span class="punctuation">{</span> |
| 56 | <span class="self_keyword">self</span><span class="operator">.</span><span class="field">x</span> | 56 | <span class="self_keyword">self</span><span class="punctuation">.</span><span class="field">x</span> |
| 57 | <span class="operator">}</span> | 57 | <span class="punctuation">}</span> |
| 58 | 58 | ||
| 59 | <span class="keyword">fn</span> <span class="function declaration">qux</span><span class="operator">(</span><span class="operator">&</span><span class="keyword">mut</span> <span class="self_keyword mutable">self</span><span class="operator">)</span> <span class="operator">{</span> | 59 | <span class="keyword">fn</span> <span class="function declaration">qux</span><span class="punctuation">(</span><span class="punctuation">&</span><span class="keyword">mut</span> <span class="self_keyword mutable">self</span><span class="punctuation">)</span> <span class="punctuation">{</span> |
| 60 | <span class="self_keyword mutable">self</span><span class="operator">.</span><span class="field">x</span> <span class="operator">=</span> <span class="numeric_literal">0</span><span class="operator">;</span> | 60 | <span class="self_keyword mutable">self</span><span class="punctuation">.</span><span class="field">x</span> <span class="punctuation">=</span> <span class="numeric_literal">0</span><span class="punctuation">;</span> |
| 61 | <span class="operator">}</span> | 61 | <span class="punctuation">}</span> |
| 62 | <span class="operator">}</span> | 62 | <span class="punctuation">}</span> |
| 63 | 63 | ||
| 64 | <span class="keyword">static</span> <span class="keyword">mut</span> <span class="static declaration mutable">STATIC_MUT</span><span class="operator">:</span> <span class="builtin_type">i32</span> <span class="operator">=</span> <span class="numeric_literal">0</span><span class="operator">;</span> | 64 | <span class="keyword">static</span> <span class="keyword">mut</span> <span class="static declaration mutable">STATIC_MUT</span><span class="punctuation">:</span> <span class="builtin_type">i32</span> <span class="punctuation">=</span> <span class="numeric_literal">0</span><span class="punctuation">;</span> |
| 65 | 65 | ||
| 66 | <span class="keyword">fn</span> <span class="function declaration">foo</span><span class="operator"><</span><span class="lifetime declaration">'a</span><span class="operator">,</span> <span class="type_param declaration">T</span><span class="operator">></span><span class="operator">(</span><span class="operator">)</span> <span class="operator">-></span> <span class="type_param">T</span> <span class="operator">{</span> | 66 | <span class="keyword">fn</span> <span class="function declaration">foo</span><span class="punctuation"><</span><span class="lifetime declaration">'a</span><span class="punctuation">,</span> <span class="type_param declaration">T</span><span class="punctuation">></span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="punctuation">-></span> <span class="type_param">T</span> <span class="punctuation">{</span> |
| 67 | <span class="function">foo</span><span class="operator">::</span><span class="operator"><</span><span class="lifetime">'a</span><span class="operator">,</span> <span class="builtin_type">i32</span><span class="operator">></span><span class="operator">(</span><span class="operator">)</span> | 67 | <span class="function">foo</span><span class="punctuation">::</span><span class="punctuation"><</span><span class="lifetime">'a</span><span class="punctuation">,</span> <span class="builtin_type">i32</span><span class="punctuation">></span><span class="punctuation">(</span><span class="punctuation">)</span> |
| 68 | <span class="operator">}</span> | 68 | <span class="punctuation">}</span> |
| 69 | 69 | ||
| 70 | <span class="macro">macro_rules!</span> <span class="macro declaration">def_fn</span> <span class="operator">{</span> | 70 | <span class="macro">macro_rules!</span> <span class="macro declaration">def_fn</span> <span class="punctuation">{</span> |
| 71 | <span class="operator">(</span><span class="operator">$</span><span class="operator">(</span><span class="operator">$</span>tt<span class="operator">:</span>tt<span class="operator">)</span>*<span class="operator">)</span> <span class="operator">=</span><span class="operator">></span> <span class="operator">{</span><span class="operator">$</span><span class="operator">(</span><span class="operator">$</span>tt<span class="operator">)</span>*<span class="operator">}</span> | 71 | <span class="punctuation">(</span><span class="punctuation">$</span><span class="punctuation">(</span><span class="punctuation">$</span>tt<span class="punctuation">:</span>tt<span class="punctuation">)</span>*<span class="punctuation">)</span> <span class="punctuation">=</span><span class="punctuation">></span> <span class="punctuation">{</span><span class="punctuation">$</span><span class="punctuation">(</span><span class="punctuation">$</span>tt<span class="punctuation">)</span>*<span class="punctuation">}</span> |
| 72 | <span class="operator">}</span> | 72 | <span class="punctuation">}</span> |
| 73 | 73 | ||
| 74 | <span class="macro">def_fn!</span> <span class="operator">{</span> | 74 | <span class="macro">def_fn!</span> <span class="punctuation">{</span> |
| 75 | <span class="keyword">fn</span> <span class="function declaration">bar</span><span class="operator">(</span><span class="operator">)</span> <span class="operator">-</span><span class="operator">></span> <span class="builtin_type">u32</span> <span class="operator">{</span> | 75 | <span class="keyword">fn</span> <span class="function declaration">bar</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="punctuation">-</span><span class="punctuation">></span> <span class="builtin_type">u32</span> <span class="punctuation">{</span> |
| 76 | <span class="numeric_literal">100</span> | 76 | <span class="numeric_literal">100</span> |
| 77 | <span class="operator">}</span> | 77 | <span class="punctuation">}</span> |
| 78 | <span class="operator">}</span> | 78 | <span class="punctuation">}</span> |
| 79 | 79 | ||
| 80 | <span class="macro">macro_rules!</span> <span class="macro declaration">noop</span> <span class="operator">{</span> | 80 | <span class="macro">macro_rules!</span> <span class="macro declaration">noop</span> <span class="punctuation">{</span> |
| 81 | <span class="operator">(</span><span class="operator">$</span>expr<span class="operator">:</span>expr<span class="operator">)</span> <span class="operator">=</span><span class="operator">></span> <span class="operator">{</span> | 81 | <span class="punctuation">(</span><span class="punctuation">$</span>expr<span class="punctuation">:</span>expr<span class="punctuation">)</span> <span class="punctuation">=</span><span class="punctuation">></span> <span class="punctuation">{</span> |
| 82 | <span class="operator">$</span>expr | 82 | <span class="punctuation">$</span>expr |
| 83 | <span class="operator">}</span> | 83 | <span class="punctuation">}</span> |
| 84 | <span class="operator">}</span> | 84 | <span class="punctuation">}</span> |
| 85 | 85 | ||
| 86 | <span class="comment">// comment</span> | 86 | <span class="comment">// comment</span> |
| 87 | <span class="keyword">fn</span> <span class="function declaration">main</span><span class="operator">(</span><span class="operator">)</span> <span class="operator">{</span> | 87 | <span class="keyword">fn</span> <span class="function declaration">main</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="punctuation">{</span> |
| 88 | <span class="macro">println!</span><span class="operator">(</span><span class="string_literal">"Hello, {}!"</span><span class="operator">,</span> <span class="numeric_literal">92</span><span class="operator">)</span><span class="operator">;</span> | 88 | <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello, {}!"</span><span class="punctuation">,</span> <span class="numeric_literal">92</span><span class="punctuation">)</span><span class="punctuation">;</span> |
| 89 | 89 | ||
| 90 | <span class="keyword">let</span> <span class="keyword">mut</span> <span class="variable declaration mutable">vec</span> <span class="operator">=</span> <span class="unresolved_reference">Vec</span><span class="operator">::</span><span class="unresolved_reference">new</span><span class="operator">(</span><span class="operator">)</span><span class="operator">;</span> | 90 | <span class="keyword">let</span> <span class="keyword">mut</span> <span class="variable declaration mutable">vec</span> <span class="punctuation">=</span> <span class="unresolved_reference">Vec</span><span class="punctuation">::</span><span class="unresolved_reference">new</span><span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">;</span> |
| 91 | <span class="keyword control">if</span> <span class="bool_literal">true</span> <span class="operator">{</span> | 91 | <span class="keyword control">if</span> <span class="bool_literal">true</span> <span class="punctuation">{</span> |
| 92 | <span class="keyword">let</span> <span class="variable declaration">x</span> <span class="operator">=</span> <span class="numeric_literal">92</span><span class="operator">;</span> | 92 | <span class="keyword">let</span> <span class="variable declaration">x</span> <span class="punctuation">=</span> <span class="numeric_literal">92</span><span class="punctuation">;</span> |
| 93 | <span class="variable mutable">vec</span><span class="operator">.</span><span class="unresolved_reference">push</span><span class="operator">(</span><span class="struct">Foo</span> <span class="operator">{</span> <span class="field">x</span><span class="operator">,</span> <span class="field">y</span><span class="operator">:</span> <span class="numeric_literal">1</span> <span class="operator">}</span><span class="operator">)</span><span class="operator">;</span> | 93 | <span class="variable mutable">vec</span><span class="punctuation">.</span><span class="unresolved_reference">push</span><span class="punctuation">(</span><span class="struct">Foo</span> <span class="punctuation">{</span> <span class="field">x</span><span class="punctuation">,</span> <span class="field">y</span><span class="punctuation">:</span> <span class="numeric_literal">1</span> <span class="punctuation">}</span><span class="punctuation">)</span><span class="punctuation">;</span> |
| 94 | <span class="operator">}</span> | 94 | <span class="punctuation">}</span> |
| 95 | <span class="keyword unsafe">unsafe</span> <span class="operator">{</span> | 95 | <span class="keyword unsafe">unsafe</span> <span class="punctuation">{</span> |
| 96 | <span class="variable mutable">vec</span><span class="operator">.</span><span class="unresolved_reference">set_len</span><span class="operator">(</span><span class="numeric_literal">0</span><span class="operator">)</span><span class="operator">;</span> | 96 | <span class="variable mutable">vec</span><span class="punctuation">.</span><span class="unresolved_reference">set_len</span><span class="punctuation">(</span><span class="numeric_literal">0</span><span class="punctuation">)</span><span class="punctuation">;</span> |
| 97 | <span class="static mutable">STATIC_MUT</span> <span class="operator">=</span> <span class="numeric_literal">1</span><span class="operator">;</span> | 97 | <span class="static mutable">STATIC_MUT</span> <span class="punctuation">=</span> <span class="numeric_literal">1</span><span class="punctuation">;</span> |
| 98 | <span class="operator">}</span> | 98 | <span class="punctuation">}</span> |
| 99 | 99 | ||
| 100 | <span class="keyword control">for</span> <span class="variable declaration">e</span> <span class="keyword control">in</span> <span class="variable mutable">vec</span> <span class="operator">{</span> | 100 | <span class="keyword control">for</span> <span class="variable declaration">e</span> <span class="keyword control">in</span> <span class="variable mutable">vec</span> <span class="punctuation">{</span> |
| 101 | <span class="comment">// Do nothing</span> | 101 | <span class="comment">// Do nothing</span> |
| 102 | <span class="operator">}</span> | 102 | <span class="punctuation">}</span> |
| 103 | 103 | ||
| 104 | <span class="macro">noop!</span><span class="operator">(</span><span class="macro">noop</span><span class="macro">!</span><span class="operator">(</span><span class="numeric_literal">1</span><span class="operator">)</span><span class="operator">)</span><span class="operator">;</span> | 104 | <span class="macro">noop!</span><span class="punctuation">(</span><span class="macro">noop</span><span class="macro">!</span><span class="punctuation">(</span><span class="numeric_literal">1</span><span class="punctuation">)</span><span class="punctuation">)</span><span class="punctuation">;</span> |
| 105 | 105 | ||
| 106 | <span class="keyword">let</span> <span class="keyword">mut</span> <span class="variable declaration mutable">x</span> <span class="operator">=</span> <span class="numeric_literal">42</span><span class="operator">;</span> | 106 | <span class="keyword">let</span> <span class="keyword">mut</span> <span class="variable declaration mutable">x</span> <span class="punctuation">=</span> <span class="numeric_literal">42</span><span class="punctuation">;</span> |
| 107 | <span class="keyword">let</span> <span class="variable declaration mutable">y</span> <span class="operator">=</span> <span class="operator">&</span><span class="keyword">mut</span> <span class="variable mutable">x</span><span class="operator">;</span> | 107 | <span class="keyword">let</span> <span class="variable declaration mutable">y</span> <span class="punctuation">=</span> <span class="punctuation">&</span><span class="keyword">mut</span> <span class="variable mutable">x</span><span class="punctuation">;</span> |
| 108 | <span class="keyword">let</span> <span class="variable declaration">z</span> <span class="operator">=</span> <span class="operator">&</span><span class="variable mutable">y</span><span class="operator">;</span> | 108 | <span class="keyword">let</span> <span class="variable declaration">z</span> <span class="punctuation">=</span> <span class="punctuation">&</span><span class="variable mutable">y</span><span class="punctuation">;</span> |
| 109 | 109 | ||
| 110 | <span class="keyword">let</span> <span class="struct">Foo</span> <span class="operator">{</span> <span class="field">x</span><span class="operator">:</span> <span class="variable declaration">z</span><span class="operator">,</span> <span class="field">y</span> <span class="operator">}</span> <span class="operator">=</span> <span class="struct">Foo</span> <span class="operator">{</span> <span class="field">x</span><span class="operator">:</span> <span class="variable">z</span><span class="operator">,</span> <span class="field">y</span> <span class="operator">}</span><span class="operator">;</span> | 110 | <span class="keyword">let</span> <span class="struct">Foo</span> <span class="punctuation">{</span> <span class="field">x</span><span class="punctuation">:</span> <span class="variable declaration">z</span><span class="punctuation">,</span> <span class="field">y</span> <span class="punctuation">}</span> <span class="punctuation">=</span> <span class="struct">Foo</span> <span class="punctuation">{</span> <span class="field">x</span><span class="punctuation">:</span> <span class="variable">z</span><span class="punctuation">,</span> <span class="field">y</span> <span class="punctuation">}</span><span class="punctuation">;</span> |
| 111 | 111 | ||
| 112 | <span class="variable">y</span><span class="operator">;</span> | 112 | <span class="variable">y</span><span class="punctuation">;</span> |
| 113 | <span class="operator">}</span> | 113 | <span class="punctuation">}</span> |
| 114 | 114 | ||
| 115 | <span class="keyword">enum</span> <span class="enum declaration">Option</span><span class="operator"><</span><span class="type_param declaration">T</span><span class="operator">></span> <span class="operator">{</span> | 115 | <span class="keyword">enum</span> <span class="enum declaration">Option</span><span class="punctuation"><</span><span class="type_param declaration">T</span><span class="punctuation">></span> <span class="punctuation">{</span> |
| 116 | <span class="enum_variant declaration">Some</span><span class="operator">(</span><span class="type_param">T</span><span class="operator">)</span><span class="operator">,</span> | 116 | <span class="enum_variant declaration">Some</span><span class="punctuation">(</span><span class="type_param">T</span><span class="punctuation">)</span><span class="punctuation">,</span> |
| 117 | <span class="enum_variant declaration">None</span><span class="operator">,</span> | 117 | <span class="enum_variant declaration">None</span><span class="punctuation">,</span> |
| 118 | <span class="operator">}</span> | 118 | <span class="punctuation">}</span> |
| 119 | <span class="keyword">use</span> <span class="enum">Option</span><span class="operator">::</span>*<span class="operator">;</span> | 119 | <span class="keyword">use</span> <span class="enum">Option</span><span class="punctuation">::</span>*<span class="punctuation">;</span> |
| 120 | 120 | ||
| 121 | <span class="keyword">impl</span><span class="operator"><</span><span class="type_param declaration">T</span><span class="operator">></span> <span class="enum">Option</span><span class="operator"><</span><span class="type_param">T</span><span class="operator">></span> <span class="operator">{</span> | 121 | <span class="keyword">impl</span><span class="punctuation"><</span><span class="type_param declaration">T</span><span class="punctuation">></span> <span class="enum">Option</span><span class="punctuation"><</span><span class="type_param">T</span><span class="punctuation">></span> <span class="punctuation">{</span> |
| 122 | <span class="keyword">fn</span> <span class="function declaration">and</span><span class="operator"><</span><span class="type_param declaration">U</span><span class="operator">></span><span class="operator">(</span><span class="self_keyword">self</span><span class="operator">,</span> <span class="value_param declaration">other</span><span class="operator">:</span> <span class="enum">Option</span><span class="operator"><</span><span class="type_param">U</span><span class="operator">></span><span class="operator">)</span> <span class="operator">-></span> <span class="enum">Option</span><span class="operator"><</span><span class="operator">(</span><span class="type_param">T</span><span class="operator">,</span> <span class="type_param">U</span><span class="operator">)</span><span class="operator">></span> <span class="operator">{</span> | 122 | <span class="keyword">fn</span> <span class="function declaration">and</span><span class="punctuation"><</span><span class="type_param declaration">U</span><span class="punctuation">></span><span class="punctuation">(</span><span class="self_keyword">self</span><span class="punctuation">,</span> <span class="value_param declaration">other</span><span class="punctuation">:</span> <span class="enum">Option</span><span class="punctuation"><</span><span class="type_param">U</span><span class="punctuation">></span><span class="punctuation">)</span> <span class="punctuation">-></span> <span class="enum">Option</span><span class="punctuation"><</span><span class="punctuation">(</span><span class="type_param">T</span><span class="punctuation">,</span> <span class="type_param">U</span><span class="punctuation">)</span><span class="punctuation">></span> <span class="punctuation">{</span> |
| 123 | <span class="keyword control">match</span> <span class="value_param">other</span> <span class="operator">{</span> | 123 | <span class="keyword control">match</span> <span class="value_param">other</span> <span class="punctuation">{</span> |
| 124 | <span class="enum_variant">None</span> <span class="operator">=></span> <span class="macro">unimplemented!</span><span class="operator">(</span><span class="operator">)</span><span class="operator">,</span> | 124 | <span class="enum_variant">None</span> <span class="punctuation">=></span> <span class="macro">unimplemented!</span><span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">,</span> |
| 125 | <span class="variable declaration">Nope</span> <span class="operator">=></span> <span class="variable">Nope</span><span class="operator">,</span> | 125 | <span class="variable declaration">Nope</span> <span class="punctuation">=></span> <span class="variable">Nope</span><span class="punctuation">,</span> |
| 126 | <span class="operator">}</span> | 126 | <span class="punctuation">}</span> |
| 127 | <span class="operator">}</span> | 127 | <span class="punctuation">}</span> |
| 128 | <span class="operator">}</span></code></pre> \ No newline at end of file | 128 | <span class="punctuation">}</span></code></pre> \ No newline at end of file |
diff --git a/crates/ra_ide/test_data/rainbow_highlighting.html b/crates/ra_ide/test_data/rainbow_highlighting.html index 47c7c7d63..2fed04a44 100644 --- a/crates/ra_ide/test_data/rainbow_highlighting.html +++ b/crates/ra_ide/test_data/rainbow_highlighting.html | |||
| @@ -35,15 +35,15 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd | |||
| 35 | 35 | ||
| 36 | .unresolved_reference { color: #FC5555; text-decoration: wavy underline; } | 36 | .unresolved_reference { color: #FC5555; text-decoration: wavy underline; } |
| 37 | </style> | 37 | </style> |
| 38 | <pre><code><span class="keyword">fn</span> <span class="function declaration">main</span><span class="operator">(</span><span class="operator">)</span> <span class="operator">{</span> | 38 | <pre><code><span class="keyword">fn</span> <span class="function declaration">main</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="punctuation">{</span> |
| 39 | <span class="keyword">let</span> <span class="variable declaration" data-binding-hash="8121853618659664005" style="color: hsl(261,57%,61%);">hello</span> <span class="operator">=</span> <span class="string_literal">"hello"</span><span class="operator">;</span> | 39 | <span class="keyword">let</span> <span class="variable declaration" data-binding-hash="8121853618659664005" style="color: hsl(261,57%,61%);">hello</span> <span class="punctuation">=</span> <span class="string_literal">"hello"</span><span class="punctuation">;</span> |
| 40 | <span class="keyword">let</span> <span class="variable declaration" data-binding-hash="2705725358298919760" style="color: hsl(17,51%,74%);">x</span> <span class="operator">=</span> <span class="variable" data-binding-hash="8121853618659664005" style="color: hsl(261,57%,61%);">hello</span><span class="operator">.</span><span class="unresolved_reference">to_string</span><span class="operator">(</span><span class="operator">)</span><span class="operator">;</span> | 40 | <span class="keyword">let</span> <span class="variable declaration" data-binding-hash="2705725358298919760" style="color: hsl(17,51%,74%);">x</span> <span class="punctuation">=</span> <span class="variable" data-binding-hash="8121853618659664005" style="color: hsl(261,57%,61%);">hello</span><span class="punctuation">.</span><span class="unresolved_reference">to_string</span><span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">;</span> |
| 41 | <span class="keyword">let</span> <span class="variable declaration" data-binding-hash="3365759661443752373" style="color: hsl(127,76%,66%);">y</span> <span class="operator">=</span> <span class="variable" data-binding-hash="8121853618659664005" style="color: hsl(261,57%,61%);">hello</span><span class="operator">.</span><span class="unresolved_reference">to_string</span><span class="operator">(</span><span class="operator">)</span><span class="operator">;</span> | 41 | <span class="keyword">let</span> <span class="variable declaration" data-binding-hash="3365759661443752373" style="color: hsl(127,76%,66%);">y</span> <span class="punctuation">=</span> <span class="variable" data-binding-hash="8121853618659664005" style="color: hsl(261,57%,61%);">hello</span><span class="punctuation">.</span><span class="unresolved_reference">to_string</span><span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">;</span> |
| 42 | 42 | ||
| 43 | <span class="keyword">let</span> <span class="variable declaration" data-binding-hash="794745962933817518" style="color: hsl(19,74%,76%);">x</span> <span class="operator">=</span> <span class="string_literal">"other color please!"</span><span class="operator">;</span> | 43 | <span class="keyword">let</span> <span class="variable declaration" data-binding-hash="794745962933817518" style="color: hsl(19,74%,76%);">x</span> <span class="punctuation">=</span> <span class="string_literal">"other color please!"</span><span class="punctuation">;</span> |
| 44 | <span class="keyword">let</span> <span class="variable declaration" data-binding-hash="6717528807933952652" style="color: hsl(85,49%,84%);">y</span> <span class="operator">=</span> <span class="variable" data-binding-hash="794745962933817518" style="color: hsl(19,74%,76%);">x</span><span class="operator">.</span><span class="unresolved_reference">to_string</span><span class="operator">(</span><span class="operator">)</span><span class="operator">;</span> | 44 | <span class="keyword">let</span> <span class="variable declaration" data-binding-hash="6717528807933952652" style="color: hsl(85,49%,84%);">y</span> <span class="punctuation">=</span> <span class="variable" data-binding-hash="794745962933817518" style="color: hsl(19,74%,76%);">x</span><span class="punctuation">.</span><span class="unresolved_reference">to_string</span><span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">;</span> |
| 45 | <span class="operator">}</span> | 45 | <span class="punctuation">}</span> |
| 46 | 46 | ||
| 47 | <span class="keyword">fn</span> <span class="function declaration">bar</span><span class="operator">(</span><span class="operator">)</span> <span class="operator">{</span> | 47 | <span class="keyword">fn</span> <span class="function declaration">bar</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="punctuation">{</span> |
| 48 | <span class="keyword">let</span> <span class="keyword">mut</span> <span class="variable declaration mutable" data-binding-hash="8121853618659664005" style="color: hsl(261,57%,61%);">hello</span> <span class="operator">=</span> <span class="string_literal">"hello"</span><span class="operator">;</span> | 48 | <span class="keyword">let</span> <span class="keyword">mut</span> <span class="variable declaration mutable" data-binding-hash="8121853618659664005" style="color: hsl(261,57%,61%);">hello</span> <span class="punctuation">=</span> <span class="string_literal">"hello"</span><span class="punctuation">;</span> |
| 49 | <span class="operator">}</span></code></pre> \ No newline at end of file | 49 | <span class="punctuation">}</span></code></pre> \ No newline at end of file |