@@ -1880,7 +1880,7 @@ impl Inner {
18801880 } ) ?;
18811881 let asset_or_doc = self . get_asset_or_document ( & action_data. specifier ) ?;
18821882 let line_index = asset_or_doc. line_index ( ) ;
1883- let refactor_edit_info = self
1883+ let mut refactor_edit_info = self
18841884 . ts_server
18851885 . get_edits_for_refactor (
18861886 self . snapshot ( ) ,
@@ -1901,34 +1901,19 @@ impl Inner {
19011901 ) ) ,
19021902 asset_or_doc. scope ( ) . cloned ( ) ,
19031903 )
1904- . await ;
1905-
1906- match refactor_edit_info {
1907- Ok ( mut refactor_edit_info) => {
1908- if kind_suffix == ".rewrite.function.returnType"
1909- || kind_suffix == ".move.newFile"
1910- {
1911- refactor_edit_info. edits =
1912- fix_ts_import_changes ( & refactor_edit_info. edits , self ) . map_err (
1913- |err| {
1914- error ! ( "Unable to remap changes: {:#}" , err) ;
1915- LspError :: internal_error ( )
1916- } ,
1917- ) ?
1918- }
1919- code_action. edit = refactor_edit_info. to_workspace_edit ( self ) ?;
1920- }
1921- Err ( err) => {
1922- // TODO(nayeemrmn): Investigate cause for
1923- // https://github.com/denoland/deno/issues/27778. Prevent popups for
1924- // this error for now.
1925- if kind_suffix == ".move.newFile" {
1926- lsp_warn ! ( "{:#}" , err) ;
1927- } else {
1928- return Err ( err) ;
1929- }
1930- }
1904+ . await ?;
1905+ if kind_suffix == ".rewrite.function.returnType"
1906+ || kind_suffix == ".move.newFile"
1907+ {
1908+ refactor_edit_info. edits =
1909+ fix_ts_import_changes ( & refactor_edit_info. edits , self ) . map_err (
1910+ |err| {
1911+ error ! ( "Unable to remap changes: {:#}" , err) ;
1912+ LspError :: internal_error ( )
1913+ } ,
1914+ ) ?
19311915 }
1916+ code_action. edit = refactor_edit_info. to_workspace_edit ( self ) ?;
19321917 code_action
19331918 } else {
19341919 // The code action doesn't need to be resolved
0 commit comments