mirror of
https://github.com/astral-sh/ruff.git
synced 2025-10-27 10:26:26 +00:00
[ty] Add semantic token provider to playground (#19232)
Some checks are pending
CI / cargo fmt (push) Waiting to run
CI / cargo clippy (push) Blocked by required conditions
CI / cargo build (msrv) (push) Blocked by required conditions
CI / Determine changes (push) Waiting to run
CI / cargo test (linux) (push) Blocked by required conditions
CI / cargo test (linux, release) (push) Blocked by required conditions
CI / cargo test (windows) (push) Blocked by required conditions
CI / cargo test (wasm) (push) Blocked by required conditions
CI / cargo build (release) (push) Waiting to run
CI / cargo fuzz build (push) Blocked by required conditions
CI / fuzz parser (push) Blocked by required conditions
CI / test scripts (push) Blocked by required conditions
CI / ecosystem (push) Blocked by required conditions
CI / Fuzz for new ty panics (push) Blocked by required conditions
CI / cargo shear (push) Blocked by required conditions
CI / python package (push) Waiting to run
CI / pre-commit (push) Waiting to run
CI / mkdocs (push) Waiting to run
CI / formatter instabilities and black similarity (push) Blocked by required conditions
CI / test ruff-lsp (push) Blocked by required conditions
CI / check playground (push) Blocked by required conditions
CI / benchmarks-instrumented (push) Blocked by required conditions
CI / benchmarks-walltime (push) Blocked by required conditions
[ty Playground] Release / publish (push) Waiting to run
Some checks are pending
CI / cargo fmt (push) Waiting to run
CI / cargo clippy (push) Blocked by required conditions
CI / cargo build (msrv) (push) Blocked by required conditions
CI / Determine changes (push) Waiting to run
CI / cargo test (linux) (push) Blocked by required conditions
CI / cargo test (linux, release) (push) Blocked by required conditions
CI / cargo test (windows) (push) Blocked by required conditions
CI / cargo test (wasm) (push) Blocked by required conditions
CI / cargo build (release) (push) Waiting to run
CI / cargo fuzz build (push) Blocked by required conditions
CI / fuzz parser (push) Blocked by required conditions
CI / test scripts (push) Blocked by required conditions
CI / ecosystem (push) Blocked by required conditions
CI / Fuzz for new ty panics (push) Blocked by required conditions
CI / cargo shear (push) Blocked by required conditions
CI / python package (push) Waiting to run
CI / pre-commit (push) Waiting to run
CI / mkdocs (push) Waiting to run
CI / formatter instabilities and black similarity (push) Blocked by required conditions
CI / test ruff-lsp (push) Blocked by required conditions
CI / check playground (push) Blocked by required conditions
CI / benchmarks-instrumented (push) Blocked by required conditions
CI / benchmarks-walltime (push) Blocked by required conditions
[ty Playground] Release / publish (push) Waiting to run
This commit is contained in:
parent
563268ce53
commit
3926dd8424
3 changed files with 261 additions and 9 deletions
|
|
@ -338,6 +338,52 @@ impl Workspace {
|
|||
})
|
||||
.collect())
|
||||
}
|
||||
|
||||
#[wasm_bindgen(js_name = "semanticTokens")]
|
||||
pub fn semantic_tokens(&self, file_id: &FileHandle) -> Result<Vec<SemanticToken>, Error> {
|
||||
let index = line_index(&self.db, file_id.file);
|
||||
let source = source_text(&self.db, file_id.file);
|
||||
|
||||
let semantic_token = ty_ide::semantic_tokens(&self.db, file_id.file, None);
|
||||
|
||||
let result = semantic_token
|
||||
.iter()
|
||||
.map(|token| SemanticToken {
|
||||
kind: token.token_type.into(),
|
||||
modifiers: token.modifiers.bits(),
|
||||
range: Range::from_text_range(token.range, &index, &source, self.position_encoding),
|
||||
})
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
Ok(result)
|
||||
}
|
||||
|
||||
#[wasm_bindgen(js_name = "semanticTokensInRange")]
|
||||
pub fn semantic_tokens_in_range(
|
||||
&self,
|
||||
file_id: &FileHandle,
|
||||
range: Range,
|
||||
) -> Result<Vec<SemanticToken>, Error> {
|
||||
let index = line_index(&self.db, file_id.file);
|
||||
let source = source_text(&self.db, file_id.file);
|
||||
|
||||
let semantic_token = ty_ide::semantic_tokens(
|
||||
&self.db,
|
||||
file_id.file,
|
||||
Some(range.to_text_range(&index, &source, self.position_encoding)?),
|
||||
);
|
||||
|
||||
let result = semantic_token
|
||||
.iter()
|
||||
.map(|token| SemanticToken {
|
||||
kind: token.token_type.into(),
|
||||
modifiers: token.modifiers.bits(),
|
||||
range: Range::from_text_range(token.range, &index, &source, self.position_encoding),
|
||||
})
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
Ok(result)
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) fn into_error<E: std::fmt::Display>(err: E) -> Error {
|
||||
|
|
@ -631,6 +677,74 @@ pub struct InlayHint {
|
|||
pub position: Position,
|
||||
}
|
||||
|
||||
#[wasm_bindgen]
|
||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||
pub struct SemanticToken {
|
||||
pub kind: SemanticTokenKind,
|
||||
pub modifiers: u32,
|
||||
pub range: Range,
|
||||
}
|
||||
|
||||
#[wasm_bindgen]
|
||||
impl SemanticToken {
|
||||
pub fn kinds() -> Vec<String> {
|
||||
ty_ide::SemanticTokenType::all()
|
||||
.iter()
|
||||
.map(|ty| ty.as_lsp_concept().to_string())
|
||||
.collect()
|
||||
}
|
||||
|
||||
pub fn modifiers() -> Vec<String> {
|
||||
ty_ide::SemanticTokenModifier::all_names()
|
||||
.iter()
|
||||
.map(|name| (*name).to_string())
|
||||
.collect()
|
||||
}
|
||||
}
|
||||
|
||||
#[wasm_bindgen]
|
||||
#[derive(Debug, Copy, Clone, PartialEq, Eq)]
|
||||
#[repr(u32)]
|
||||
pub enum SemanticTokenKind {
|
||||
Namespace,
|
||||
Class,
|
||||
Parameter,
|
||||
SelfParameter,
|
||||
ClsParameter,
|
||||
Variable,
|
||||
Property,
|
||||
Function,
|
||||
Method,
|
||||
Keyword,
|
||||
String,
|
||||
Number,
|
||||
Decorator,
|
||||
BuiltinConstant,
|
||||
TypeParameter,
|
||||
}
|
||||
|
||||
impl From<ty_ide::SemanticTokenType> for SemanticTokenKind {
|
||||
fn from(value: ty_ide::SemanticTokenType) -> Self {
|
||||
match value {
|
||||
ty_ide::SemanticTokenType::Namespace => Self::Namespace,
|
||||
ty_ide::SemanticTokenType::Class => Self::Class,
|
||||
ty_ide::SemanticTokenType::Parameter => Self::Parameter,
|
||||
ty_ide::SemanticTokenType::SelfParameter => Self::SelfParameter,
|
||||
ty_ide::SemanticTokenType::ClsParameter => Self::ClsParameter,
|
||||
ty_ide::SemanticTokenType::Variable => Self::Variable,
|
||||
ty_ide::SemanticTokenType::Property => Self::Property,
|
||||
ty_ide::SemanticTokenType::Function => Self::Function,
|
||||
ty_ide::SemanticTokenType::Method => Self::Method,
|
||||
ty_ide::SemanticTokenType::Keyword => Self::Keyword,
|
||||
ty_ide::SemanticTokenType::String => Self::String,
|
||||
ty_ide::SemanticTokenType::Number => Self::Number,
|
||||
ty_ide::SemanticTokenType::Decorator => Self::Decorator,
|
||||
ty_ide::SemanticTokenType::BuiltinConstant => Self::BuiltinConstant,
|
||||
ty_ide::SemanticTokenType::TypeParameter => Self::TypeParameter,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
struct WasmSystem {
|
||||
fs: MemoryFileSystem,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue