fix(repl): use object_id for repl internal #29163
Open
+124
−104
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bartlomieju
reviewed
May 7, 2025
cli/tools/repl/session.rs
Outdated
| format!("__DENO_REPL_INTERNALS_{seconds}__") | ||
| }); | ||
|
|
||
| thread_local! { |
There was a problem hiding this comment.
I'm not a fan of using a thread_local here - consider storing this object id on ReplSession object
bartlomieju
reviewed
May 8, 2025
cli/cdp.rs
Outdated
There was a problem hiding this comment.
What is the reason for changes to all of these structs? It's very surprising that something that is deserialized from JSON uses non-owned string types of Arc. I suggest you revert these changes
bartlomieju
reviewed
May 8, 2025
Cargo.lock
Outdated
There was a problem hiding this comment.
Please revert all these changes
bartlomieju
requested changes
May 8, 2025
cli/cdp.rs
Outdated
Comment on lines
301
to
302
| pub type RemoteObjectId = str; | ||
| pub type OwnedRemoteObjectId = <RemoteObjectId as ToOwned>::Owned; |
cli/cdp.rs
Outdated
Comment on lines
308
to
309
| pub type ScriptId = str; | ||
| pub type OwnedScriptId = <ScriptId as ToOwned>::Owned; |
cli/tools/jupyter/server.rs
Outdated
| @@ -339,15 +335,15 @@ impl JupyterServer { | |||
| // combine results of declarations and globalThis properties | |||
| let mut candidates = get_expression_property_names( | |||
| &mut self.repl_session_proxy, | |||
| "globalThis", | |||
| GLOBALTHIS_EXPRESSION, | |||
cli/tools/repl/session.rs
Outdated
| EvaluationOutput::Error(format!("{} {:#}", colors::red("error:"), err)) | ||
| } | ||
| } | ||
| r.unwrap_or_else(|err| { |
There was a problem hiding this comment.
This is an unrelated change, please revert it
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
close #26599
close #29121
This PR use object_id to interact with repl internal, instead of global variable (
__DENO_REPL_INTERNALS_{seconds}__),so we don't need to hide this in completions, etc.
Also add some error handling instead of simply
unwrap.Before this PR
After the PR
btw, the the code in #26599 still create an error, may be we need to dive into this after merging this pr.
UPDATE
deno_consoleseemly usingglobalThisforIntlandTemporalfor prototype checks?UPDATE: Open #29165 for this