Rename members in ZedSyntaxToken

This commit is contained in:
Marshall Bowers 2023-12-07 14:35:58 -05:00
parent 8ed04fe798
commit 6a164db700

View file

@ -35,94 +35,92 @@ pub struct VsCodeTokenColorSettings {
#[derive(Debug, PartialEq, Copy, Clone, EnumIter)] #[derive(Debug, PartialEq, Copy, Clone, EnumIter)]
pub enum ZedSyntaxToken { pub enum ZedSyntaxToken {
SyntaxAttribute, Attribute,
SyntaxBoolean, Boolean,
SyntaxComment, Comment,
SyntaxCommentDoc, CommentDoc,
SyntaxConstant, Constant,
SyntaxConstructor, Constructor,
SyntaxEmbedded, Embedded,
SyntaxEmphasis, Emphasis,
SyntaxEmphasisStrong, EmphasisStrong,
SyntaxEnum, Enum,
SyntaxFunction, Function,
SyntaxHint, Hint,
SyntaxKeyword, Keyword,
SyntaxLabel, Label,
SyntaxLinkText, LinkText,
SyntaxLinkUri, LinkUri,
SyntaxNumber, Number,
SyntaxOperator, Operator,
SyntaxPredictive, Predictive,
SyntaxPreproc, Preproc,
SyntaxPrimary, Primary,
SyntaxProperty, Property,
SyntaxPunctuation, Punctuation,
SyntaxPunctuationBracket, PunctuationBracket,
SyntaxPunctuationDelimiter, PunctuationDelimiter,
SyntaxPunctuationListMarker, PunctuationListMarker,
SyntaxPunctuationSpecial, PunctuationSpecial,
SyntaxString, String,
SyntaxStringEscape, StringEscape,
SyntaxStringRegex, StringRegex,
SyntaxStringSpecial, StringSpecial,
SyntaxStringSpecialSymbol, StringSpecialSymbol,
SyntaxTag, Tag,
SyntaxTextLiteral, TextLiteral,
SyntaxTitle, Title,
SyntaxType, Type,
SyntaxVariable, Variable,
SyntaxVariableSpecial, VariableSpecial,
SyntaxVariant, Variant,
} }
impl std::fmt::Display for ZedSyntaxToken { impl std::fmt::Display for ZedSyntaxToken {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
use ZedSyntaxToken::*;
write!( write!(
f, f,
"{}", "{}",
match self { match self {
SyntaxAttribute => "attribute", ZedSyntaxToken::Attribute => "attribute",
SyntaxBoolean => "boolean", ZedSyntaxToken::Boolean => "boolean",
SyntaxComment => "comment", ZedSyntaxToken::Comment => "comment",
SyntaxCommentDoc => "comment.doc", ZedSyntaxToken::CommentDoc => "comment.doc",
SyntaxConstant => "constant", ZedSyntaxToken::Constant => "constant",
SyntaxConstructor => "constructor", ZedSyntaxToken::Constructor => "constructor",
SyntaxEmbedded => "embedded", ZedSyntaxToken::Embedded => "embedded",
SyntaxEmphasis => "emphasis", ZedSyntaxToken::Emphasis => "emphasis",
SyntaxEmphasisStrong => "emphasis.strong", ZedSyntaxToken::EmphasisStrong => "emphasis.strong",
SyntaxEnum => "enum", ZedSyntaxToken::Enum => "enum",
SyntaxFunction => "function", ZedSyntaxToken::Function => "function",
SyntaxHint => "hint", ZedSyntaxToken::Hint => "hint",
SyntaxKeyword => "keyword", ZedSyntaxToken::Keyword => "keyword",
SyntaxLabel => "label", ZedSyntaxToken::Label => "label",
SyntaxLinkText => "link_text", ZedSyntaxToken::LinkText => "link_text",
SyntaxLinkUri => "link_uri", ZedSyntaxToken::LinkUri => "link_uri",
SyntaxNumber => "number", ZedSyntaxToken::Number => "number",
SyntaxOperator => "operator", ZedSyntaxToken::Operator => "operator",
SyntaxPredictive => "predictive", ZedSyntaxToken::Predictive => "predictive",
SyntaxPreproc => "preproc", ZedSyntaxToken::Preproc => "preproc",
SyntaxPrimary => "primary", ZedSyntaxToken::Primary => "primary",
SyntaxProperty => "property", ZedSyntaxToken::Property => "property",
SyntaxPunctuation => "punctuation", ZedSyntaxToken::Punctuation => "punctuation",
SyntaxPunctuationBracket => "punctuation.bracket", ZedSyntaxToken::PunctuationBracket => "punctuation.bracket",
SyntaxPunctuationDelimiter => "punctuation.delimiter", ZedSyntaxToken::PunctuationDelimiter => "punctuation.delimiter",
SyntaxPunctuationListMarker => "punctuation.list_marker", ZedSyntaxToken::PunctuationListMarker => "punctuation.list_marker",
SyntaxPunctuationSpecial => "punctuation.special", ZedSyntaxToken::PunctuationSpecial => "punctuation.special",
SyntaxString => "string", ZedSyntaxToken::String => "string",
SyntaxStringEscape => "string.escape", ZedSyntaxToken::StringEscape => "string.escape",
SyntaxStringRegex => "string.regex", ZedSyntaxToken::StringRegex => "string.regex",
SyntaxStringSpecial => "string.special", ZedSyntaxToken::StringSpecial => "string.special",
SyntaxStringSpecialSymbol => "string.special.symbol", ZedSyntaxToken::StringSpecialSymbol => "string.special.symbol",
SyntaxTag => "tag", ZedSyntaxToken::Tag => "tag",
SyntaxTextLiteral => "text.literal", ZedSyntaxToken::TextLiteral => "text.literal",
SyntaxTitle => "title", ZedSyntaxToken::Title => "title",
SyntaxType => "type", ZedSyntaxToken::Type => "type",
SyntaxVariable => "variable", ZedSyntaxToken::Variable => "variable",
SyntaxVariableSpecial => "variable.special", ZedSyntaxToken::VariableSpecial => "variable.special",
SyntaxVariant => "variant", ZedSyntaxToken::Variant => "variant",
} }
) )
} }
@ -130,47 +128,47 @@ impl std::fmt::Display for ZedSyntaxToken {
impl ZedSyntaxToken { impl ZedSyntaxToken {
pub fn to_vscode(&self) -> Vec<&'static str> { pub fn to_vscode(&self) -> Vec<&'static str> {
use ZedSyntaxToken::*;
match self { match self {
SyntaxAttribute => vec!["entity.other.attribute-name"], ZedSyntaxToken::Attribute => vec!["entity.other.attribute-name"],
SyntaxBoolean => vec!["constant.language"], ZedSyntaxToken::Boolean => vec!["constant.language"],
SyntaxComment => vec!["comment"], ZedSyntaxToken::Comment => vec!["comment"],
SyntaxCommentDoc => vec!["comment.block.documentation"], ZedSyntaxToken::CommentDoc => vec!["comment.block.documentation"],
SyntaxConstant => vec!["constant.character"], ZedSyntaxToken::Constant => vec!["constant.character"],
SyntaxConstructor => vec!["entity.name.function.definition.special.constructor"], ZedSyntaxToken::Constructor => {
SyntaxEmbedded => vec!["meta.embedded"], vec!["entity.name.function.definition.special.constructor"]
SyntaxEmphasis => vec!["markup.italic"], }
SyntaxEmphasisStrong => vec![ ZedSyntaxToken::Embedded => vec!["meta.embedded"],
ZedSyntaxToken::Emphasis => vec!["markup.italic"],
ZedSyntaxToken::EmphasisStrong => vec![
"markup.bold", "markup.bold",
"markup.italic markup.bold", "markup.italic markup.bold",
"markup.bold markup.italic", "markup.bold markup.italic",
], ],
SyntaxEnum => vec!["support.type.enum"], ZedSyntaxToken::Enum => vec!["support.type.enum"],
SyntaxFunction => vec![ ZedSyntaxToken::Function => vec![
"entity.name.function", "entity.name.function",
"variable.function", "variable.function",
"support.function", "support.function",
], ],
SyntaxKeyword => vec!["keyword"], ZedSyntaxToken::Keyword => vec!["keyword"],
SyntaxLabel => vec![ ZedSyntaxToken::Label => vec![
"label", "label",
"entity.name", "entity.name",
"entity.name.import", "entity.name.import",
"entity.name.package", "entity.name.package",
], ],
SyntaxLinkText => vec!["markup.underline.link", "string.other.link"], ZedSyntaxToken::LinkText => vec!["markup.underline.link", "string.other.link"],
SyntaxLinkUri => vec!["markup.underline.link", "string.other.link"], ZedSyntaxToken::LinkUri => vec!["markup.underline.link", "string.other.link"],
SyntaxNumber => vec!["constant.numeric", "number"], ZedSyntaxToken::Number => vec!["constant.numeric", "number"],
SyntaxOperator => vec!["operator", "keyword.operator"], ZedSyntaxToken::Operator => vec!["operator", "keyword.operator"],
SyntaxPreproc => vec!["preproc"], ZedSyntaxToken::Preproc => vec!["preproc"],
SyntaxProperty => vec![ ZedSyntaxToken::Property => vec![
"variable.member", "variable.member",
"support.type.property-name", "support.type.property-name",
"variable.object.property", "variable.object.property",
"variable.other.field", "variable.other.field",
], ],
SyntaxPunctuation => vec![ ZedSyntaxToken::Punctuation => vec![
"punctuation", "punctuation",
"punctuation.section", "punctuation.section",
"punctuation.accessor", "punctuation.accessor",
@ -178,40 +176,46 @@ impl ZedSyntaxToken {
"punctuation.terminator", "punctuation.terminator",
"punctuation.definition.tag", "punctuation.definition.tag",
], ],
SyntaxPunctuationBracket => vec![ ZedSyntaxToken::PunctuationBracket => vec![
"punctuation.bracket", "punctuation.bracket",
"punctuation.definition.tag.begin", "punctuation.definition.tag.begin",
"punctuation.definition.tag.end", "punctuation.definition.tag.end",
], ],
SyntaxPunctuationDelimiter => vec![ ZedSyntaxToken::PunctuationDelimiter => vec![
"punctuation.delimiter", "punctuation.delimiter",
"punctuation.separator", "punctuation.separator",
"punctuation.terminator", "punctuation.terminator",
], ],
SyntaxPunctuationListMarker => vec!["markup.list punctuation.definition.list.begin"], ZedSyntaxToken::PunctuationListMarker => {
SyntaxPunctuationSpecial => vec!["punctuation.special"], vec!["markup.list punctuation.definition.list.begin"]
SyntaxString => vec!["string"], }
SyntaxStringEscape => vec!["string.escape", "constant.character", "constant.other"], ZedSyntaxToken::PunctuationSpecial => vec!["punctuation.special"],
SyntaxStringRegex => vec!["string.regex"], ZedSyntaxToken::String => vec!["string"],
SyntaxStringSpecial => vec!["string.special", "constant.other.symbol"], ZedSyntaxToken::StringEscape => {
SyntaxStringSpecialSymbol => vec!["string.special.symbol", "constant.other.symbol"], vec!["string.escape", "constant.character", "constant.other"]
SyntaxTag => vec!["tag", "entity.name.tag", "meta.tag.sgml"], }
SyntaxTextLiteral => vec!["text.literal", "string"], ZedSyntaxToken::StringRegex => vec!["string.regex"],
SyntaxTitle => vec!["title", "entity.name"], ZedSyntaxToken::StringSpecial => vec!["string.special", "constant.other.symbol"],
SyntaxType => vec!["entity.name.type", "support.type", "support.class"], ZedSyntaxToken::StringSpecialSymbol => {
SyntaxVariable => vec![ vec!["string.special.symbol", "constant.other.symbol"]
}
ZedSyntaxToken::Tag => vec!["tag", "entity.name.tag", "meta.tag.sgml"],
ZedSyntaxToken::TextLiteral => vec!["text.literal", "string"],
ZedSyntaxToken::Title => vec!["title", "entity.name"],
ZedSyntaxToken::Type => vec!["entity.name.type", "support.type", "support.class"],
ZedSyntaxToken::Variable => vec![
"variable", "variable",
"variable.language", "variable.language",
"variable.member", "variable.member",
"variable.parameter.function-call", "variable.parameter.function-call",
], ],
SyntaxVariableSpecial => vec![ ZedSyntaxToken::VariableSpecial => vec![
"variable.special", "variable.special",
"variable.member", "variable.member",
"variable.annotation", "variable.annotation",
"variable.language", "variable.language",
], ],
SyntaxVariant => vec!["variant"], ZedSyntaxToken::Variant => vec!["variant"],
_ => vec![], _ => vec![],
} }
} }