mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-11-18 03:36:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

[ty] Fix Escape handler in playground (#21397)

Browse source
This commit is contained in:
Micha Reiser 2025-11-12 08:54:14 +01:00 • committed by GitHub
parent 725ae69773
commit 19c7994e90
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 22 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
playground/ty/src/Editor/Editor.tsx
View file

@ -70,13 +70,16 @@ export default function Editor({
const serverRef = useRef<PlaygroundServer | null>(null); const serverRef = useRef<PlaygroundServer | null>(null);
if (serverRef.current != null) { if (serverRef.current != null) {
serverRef.current.update({ serverRef.current.update(
{
files, files,
workspace, workspace,
onOpenFile, onOpenFile,
onVendoredFileChange, onVendoredFileChange,
onBackToUserFile, onBackToUserFile,
}); },
isViewingVendoredFile,
);
} }
// Update the diagnostics in the editor. // Update the diagnostics in the editor.
@ -200,6 +203,7 @@ class PlaygroundServer
private rangeSemanticTokensDisposable: IDisposable; private rangeSemanticTokensDisposable: IDisposable;
private signatureHelpDisposable: IDisposable; private signatureHelpDisposable: IDisposable;
private documentHighlightDisposable: IDisposable; private documentHighlightDisposable: IDisposable;
private inVendoredFileCondition: editor.IContextKey<boolean>;
// Cache for vendored file handles // Cache for vendored file handles
private vendoredFileHandles = new Map<string, FileHandle>(); private vendoredFileHandles = new Map<string, FileHandle>();
@ -249,8 +253,16 @@ class PlaygroundServer
this.documentHighlightDisposable = this.documentHighlightDisposable =
monaco.languages.registerDocumentHighlightProvider("python", this); monaco.languages.registerDocumentHighlightProvider("python", this);
this.inVendoredFileCondition = editor.createContextKey<boolean>(
"inVendoredFile",
false,
);
// Register Esc key command // Register Esc key command
editor.addCommand(monaco.KeyCode.Escape, this.props.onBackToUserFile); editor.addCommand(
monaco.KeyCode.Escape,
() => this.props.onBackToUserFile(),
"inVendoredFile",
);
} }
triggerCharacters: string[] = ["."]; triggerCharacters: string[] = ["."];
@ -452,8 +464,9 @@ class PlaygroundServer
return undefined; return undefined;
} }
update(props: PlaygroundServerProps) { update(props: PlaygroundServerProps, isViewingVendoredFile: boolean) {
this.props = props; this.props = props;
this.inVendoredFileCondition.set(isViewingVendoredFile);
} }
private getOrCreateVendoredFileHandle(vendoredPath: string): FileHandle { private getOrCreateVendoredFileHandle(vendoredPath: string): FileHandle {