diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-04-19 16:47:18 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2021-04-19 16:47:18 +0100 |
commit | 2b5f35ca4b5569ec8947083be3fecff938c3b8ba (patch) | |
tree | e15a3c7fde5b3e08e058b4b8cc0d555954c92a20 | |
parent | 9b853435d3bc7e30226ed149daddb2d472bf4fbd (diff) | |
parent | 1c75d8975c971721670b85a20079c428f3b3d1be (diff) |
Merge #8582
8582: Fix typo: comparision -> comparison r=kjeremy a=stanciuadrian
Closes #8576
Co-authored-by: Adrian Stanciu <[email protected]>
-rw-r--r-- | crates/ide/src/syntax_highlighting/highlight.rs | 2 | ||||
-rw-r--r-- | crates/ide/src/syntax_highlighting/tags.rs | 4 | ||||
-rw-r--r-- | crates/rust-analyzer/src/semantic_tokens.rs | 2 | ||||
-rw-r--r-- | crates/rust-analyzer/src/to_proto.rs | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/crates/ide/src/syntax_highlighting/highlight.rs b/crates/ide/src/syntax_highlighting/highlight.rs index 8cc877c1c..18552459b 100644 --- a/crates/ide/src/syntax_highlighting/highlight.rs +++ b/crates/ide/src/syntax_highlighting/highlight.rs | |||
@@ -222,7 +222,7 @@ pub(super) fn element( | |||
222 | T![>] | T![<] | T![==] | T![>=] | T![<=] | T![!=] | 222 | T![>] | T![<] | T![==] | T![>=] | T![<=] | T![!=] |
223 | if element.parent().and_then(ast::BinExpr::cast).is_some() => | 223 | if element.parent().and_then(ast::BinExpr::cast).is_some() => |
224 | { | 224 | { |
225 | HlTag::Operator(HlOperator::Comparision).into() | 225 | HlTag::Operator(HlOperator::Comparison).into() |
226 | } | 226 | } |
227 | _ if element.parent().and_then(ast::BinExpr::cast).is_some() => { | 227 | _ if element.parent().and_then(ast::BinExpr::cast).is_some() => { |
228 | HlTag::Operator(HlOperator::Other).into() | 228 | HlTag::Operator(HlOperator::Other).into() |
diff --git a/crates/ide/src/syntax_highlighting/tags.rs b/crates/ide/src/syntax_highlighting/tags.rs index 8128d231d..e58392d67 100644 --- a/crates/ide/src/syntax_highlighting/tags.rs +++ b/crates/ide/src/syntax_highlighting/tags.rs | |||
@@ -96,7 +96,7 @@ pub enum HlOperator { | |||
96 | /// &&, ||, ! | 96 | /// &&, ||, ! |
97 | Logical, | 97 | Logical, |
98 | /// >, <, ==, >=, <=, != | 98 | /// >, <, ==, >=, <=, != |
99 | Comparision, | 99 | Comparison, |
100 | /// | 100 | /// |
101 | Other, | 101 | Other, |
102 | } | 102 | } |
@@ -151,7 +151,7 @@ impl HlTag { | |||
151 | HlOperator::Bitwise => "bitwise", | 151 | HlOperator::Bitwise => "bitwise", |
152 | HlOperator::Arithmetic => "arithmetic", | 152 | HlOperator::Arithmetic => "arithmetic", |
153 | HlOperator::Logical => "logical", | 153 | HlOperator::Logical => "logical", |
154 | HlOperator::Comparision => "comparision", | 154 | HlOperator::Comparison => "comparison", |
155 | HlOperator::Other => "operator", | 155 | HlOperator::Other => "operator", |
156 | }, | 156 | }, |
157 | HlTag::StringLiteral => "string_literal", | 157 | HlTag::StringLiteral => "string_literal", |
diff --git a/crates/rust-analyzer/src/semantic_tokens.rs b/crates/rust-analyzer/src/semantic_tokens.rs index adc059817..ecab89b2a 100644 --- a/crates/rust-analyzer/src/semantic_tokens.rs +++ b/crates/rust-analyzer/src/semantic_tokens.rs | |||
@@ -49,7 +49,7 @@ define_semantic_token_types![ | |||
49 | (CHAR_LITERAL, "characterLiteral"), | 49 | (CHAR_LITERAL, "characterLiteral"), |
50 | (COLON, "colon"), | 50 | (COLON, "colon"), |
51 | (COMMA, "comma"), | 51 | (COMMA, "comma"), |
52 | (COMPARISION, "comparision"), | 52 | (COMPARISON, "comparison"), |
53 | (CONST_PARAMETER, "constParameter"), | 53 | (CONST_PARAMETER, "constParameter"), |
54 | (DOT, "dot"), | 54 | (DOT, "dot"), |
55 | (ESCAPE_SEQUENCE, "escapeSequence"), | 55 | (ESCAPE_SEQUENCE, "escapeSequence"), |
diff --git a/crates/rust-analyzer/src/to_proto.rs b/crates/rust-analyzer/src/to_proto.rs index fe4d0733d..c2361b32e 100644 --- a/crates/rust-analyzer/src/to_proto.rs +++ b/crates/rust-analyzer/src/to_proto.rs | |||
@@ -469,7 +469,7 @@ fn semantic_token_type_and_modifiers( | |||
469 | HlOperator::Bitwise => semantic_tokens::BITWISE, | 469 | HlOperator::Bitwise => semantic_tokens::BITWISE, |
470 | HlOperator::Arithmetic => semantic_tokens::ARITHMETIC, | 470 | HlOperator::Arithmetic => semantic_tokens::ARITHMETIC, |
471 | HlOperator::Logical => semantic_tokens::LOGICAL, | 471 | HlOperator::Logical => semantic_tokens::LOGICAL, |
472 | HlOperator::Comparision => semantic_tokens::COMPARISION, | 472 | HlOperator::Comparison => semantic_tokens::COMPARISON, |
473 | HlOperator::Other => semantic_tokens::OPERATOR, | 473 | HlOperator::Other => semantic_tokens::OPERATOR, |
474 | }, | 474 | }, |
475 | HlTag::StringLiteral => lsp_types::SemanticTokenType::STRING, | 475 | HlTag::StringLiteral => lsp_types::SemanticTokenType::STRING, |