foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-12-22 23:34:47 -05:00
Code Issues Packages 1 Wiki Activity

fix(lsp): improve exception handling on tsc snapshots (#9628)

Browse source 
Refs #9348
This commit is contained in:
Kitson Kelly 2021-03-01 11:53:20 +11:00 committed by GitHub
parent c2a7386a42
commit dbdbe7a1cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
cli/lsp/tsc.rs
View file

@ -1074,7 +1074,7 @@ struct State<'a> {
last_id: usize, last_id: usize,
response: Option<Response>, response: Option<Response>,
state_snapshot: StateSnapshot, state_snapshot: StateSnapshot,
snapshots: HashMap<(Cow<'a, str>, Cow<'a, str>), String>, snapshots: HashMap<(ModuleSpecifier, Cow<'a, str>), String>,
} }
impl<'a> State<'a> { impl<'a> State<'a> {
@ -1092,18 +1092,23 @@ impl<'a> State<'a> {
/// If a snapshot is missing from the state cache, add it. /// If a snapshot is missing from the state cache, add it.
fn cache_snapshot( fn cache_snapshot(
state: &mut State, state: &mut State,
specifier: String, specifier: &ModuleSpecifier,
version: String, version: String,
) -> Result<(), AnyError> { ) -> Result<(), AnyError> {
if !state if !state
.snapshots .snapshots
.contains_key(&(specifier.clone().into(), version.clone().into())) .contains_key(&(specifier.clone(), version.clone().into()))
{ {
let s = resolve_url(&specifier)?; let content = state
let content = state.state_snapshot.documents.content(&s)?.unwrap(); .state_snapshot
.documents
.content(specifier)?
.ok_or_else(|| {
anyhow!("Specifier unexpectedly doesn't have content: {}", specifier)
})?;
state state
.snapshots .snapshots
.insert((specifier.into(), version.into()), content); .insert((specifier.clone(), version.into()), content);
} }
Ok(()) Ok(())
} }
@ -1135,9 +1140,8 @@ fn dispose(
args: SourceSnapshotArgs, args: SourceSnapshotArgs,
) -> Result<bool, AnyError> { ) -> Result<bool, AnyError> {
let mark = state.state_snapshot.performance.mark("op_dispose"); let mark = state.state_snapshot.performance.mark("op_dispose");
state let specifier = resolve_url(&args.specifier)?;
.snapshots state.snapshots.remove(&(specifier, args.version.into()));
.remove(&(args.specifier.into(), args.version.into()));
state.state_snapshot.performance.measure(mark); state.state_snapshot.performance.measure(mark);
Ok(true) Ok(true)
} }
@ -1158,15 +1162,18 @@ fn get_change_range(
args: GetChangeRangeArgs, args: GetChangeRangeArgs,
) -> Result<Value, AnyError> { ) -> Result<Value, AnyError> {
let mark = state.state_snapshot.performance.mark("op_get_change_range"); let mark = state.state_snapshot.performance.mark("op_get_change_range");
cache_snapshot(state, args.specifier.clone(), args.version.clone())?; let specifier = resolve_url(&args.specifier)?;
if state.state_snapshot.documents.contains_key(&specifier) {
cache_snapshot(state, &specifier, args.version.clone())?;
}
if let Some(current) = state if let Some(current) = state
.snapshots .snapshots
.get(&(args.specifier.clone().into(), args.version.clone().into())) .get(&(specifier.clone(), args.version.clone().into()))
{
if let Some(prev) = state
.snapshots
.get(&(specifier, args.old_version.clone().into()))
{ {
if let Some(prev) = state.snapshots.get(&(
args.specifier.clone().into(),
args.old_version.clone().into(),
)) {
state.state_snapshot.performance.measure(mark); state.state_snapshot.performance.measure(mark);
Ok(text::get_range_change(prev, current)) Ok(text::get_range_change(prev, current))
} else { } else {
@ -1205,10 +1212,10 @@ fn get_length(
if let Some(Some(asset)) = state.state_snapshot.assets.get(&specifier) { if let Some(Some(asset)) = state.state_snapshot.assets.get(&specifier) {
Ok(asset.length) Ok(asset.length)
} else if state.state_snapshot.documents.contains_key(&specifier) { } else if state.state_snapshot.documents.contains_key(&specifier) {
cache_snapshot(state, args.specifier.clone(), args.version.clone())?; cache_snapshot(state, &specifier, args.version.clone())?;
let content = state let content = state
.snapshots .snapshots
.get(&(args.specifier.into(), args.version.into())) .get(&(specifier, args.version.into()))
.unwrap(); .unwrap();
state.state_snapshot.performance.measure(mark); state.state_snapshot.performance.measure(mark);
Ok(content.encode_utf16().count()) Ok(content.encode_utf16().count())
@ -1235,10 +1242,10 @@ fn get_text(state: &mut State, args: GetTextArgs) -> Result<String, AnyError> {
if let Some(Some(content)) = state.state_snapshot.assets.get(&specifier) { if let Some(Some(content)) = state.state_snapshot.assets.get(&specifier) {
content.text.clone() content.text.clone()
} else if state.state_snapshot.documents.contains_key(&specifier) { } else if state.state_snapshot.documents.contains_key(&specifier) {
cache_snapshot(state, args.specifier.clone(), args.version.clone())?; cache_snapshot(state, &specifier, args.version.clone())?;
state state
.snapshots .snapshots
.get(&(args.specifier.into(), args.version.into())) .get(&(specifier, args.version.into()))
.unwrap() .unwrap()
.clone() .clone()
} else { } else {