Merging upstream version 25.32.0.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
160ab5bf81
commit
02152e9ba6
74 changed files with 2284 additions and 1814 deletions
|
@ -19,6 +19,7 @@ pub struct TokenTypeSettings {
|
|||
pub string: TokenType,
|
||||
pub var: TokenType,
|
||||
pub heredoc_string_alternative: TokenType,
|
||||
pub hint: TokenType,
|
||||
}
|
||||
|
||||
#[pymethods]
|
||||
|
@ -38,6 +39,7 @@ impl TokenTypeSettings {
|
|||
string: TokenType,
|
||||
var: TokenType,
|
||||
heredoc_string_alternative: TokenType,
|
||||
hint: TokenType,
|
||||
) -> Self {
|
||||
TokenTypeSettings {
|
||||
bit_string,
|
||||
|
@ -53,6 +55,7 @@ impl TokenTypeSettings {
|
|||
string,
|
||||
var,
|
||||
heredoc_string_alternative,
|
||||
hint,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -75,9 +78,11 @@ pub struct TokenizerSettings {
|
|||
pub var_single_tokens: HashSet<char>,
|
||||
pub commands: HashSet<TokenType>,
|
||||
pub command_prefix_tokens: HashSet<TokenType>,
|
||||
pub tokens_preceding_hint: HashSet<TokenType>,
|
||||
pub heredoc_tag_is_identifier: bool,
|
||||
pub string_escapes_allowed_in_raw_strings: bool,
|
||||
pub nested_comments: bool,
|
||||
pub hint_start: String,
|
||||
}
|
||||
|
||||
#[pymethods]
|
||||
|
@ -99,9 +104,11 @@ impl TokenizerSettings {
|
|||
var_single_tokens: HashSet<String>,
|
||||
commands: HashSet<TokenType>,
|
||||
command_prefix_tokens: HashSet<TokenType>,
|
||||
tokens_preceding_hint: HashSet<TokenType>,
|
||||
heredoc_tag_is_identifier: bool,
|
||||
string_escapes_allowed_in_raw_strings: bool,
|
||||
nested_comments: bool,
|
||||
hint_start: String,
|
||||
) -> Self {
|
||||
let to_char = |v: &String| {
|
||||
if v.len() == 1 {
|
||||
|
@ -150,9 +157,11 @@ impl TokenizerSettings {
|
|||
var_single_tokens: var_single_tokens_native,
|
||||
commands,
|
||||
command_prefix_tokens,
|
||||
tokens_preceding_hint,
|
||||
heredoc_tag_is_identifier,
|
||||
string_escapes_allowed_in_raw_strings,
|
||||
nested_comments,
|
||||
hint_start,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue