Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

monaco: parseSnippet RangeError handling #12463

Merged
merged 2 commits into from
Apr 27, 2023
Merged

monaco: parseSnippet RangeError handling #12463

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7684640
monaco: parseSnippet from JSON handling
FernandoAscencio Apr 25, 2023
c89ff7c
Update packages/monaco/src/browser/monaco-snippet-suggest-provider.ts
FernandoAscencio Apr 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions packages/monaco/src/browser/monaco-snippet-suggest-provider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,9 +158,9 @@ export class MonacoSnippetSuggestProvider implements monaco.languages.Completion
fromJSON(snippets: JsonSerializedSnippets | undefined, { language, source }: SnippetLoadOptions): Disposable {
const toDispose = new DisposableCollection();
this.parseSnippets(snippets, (name, snippet) => {
const { prefix, body, description } = snippet;
const { isFileTemplate, prefix, body, description } = snippet;
const parsedBody = Array.isArray(body) ? body.join('\n') : body;
const parsedPrefixes = Array.isArray(prefix) ? prefix : [prefix];
const parsedPrefixes = !prefix ? [''] : Array.isArray(prefix) ? prefix : [prefix];

if (typeof parsedBody !== 'string') {
return;
Expand All @@ -181,6 +181,7 @@ export class MonacoSnippetSuggestProvider implements monaco.languages.Completion
}
}
parsedPrefixes.forEach(parsedPrefix => toDispose.push(this.push({
isFileTemplate: Boolean(isFileTemplate),
scopes,
name,
prefix: parsedPrefix,
Expand All @@ -196,7 +197,10 @@ export class MonacoSnippetSuggestProvider implements monaco.languages.Completion
if (JsonSerializedSnippet.is(scopeOrTemplate)) {
accept(name, scopeOrTemplate);
} else {
this.parseSnippets(scopeOrTemplate, accept);
// eslint-disable-next-line @typescript-eslint/no-shadow
for (const [name, template] of Object.entries(scopeOrTemplate)) {
accept(name, template);
}
}
}
}
Expand Down Expand Up @@ -240,18 +244,20 @@ export interface JsonSerializedSnippets {
[name: string]: JsonSerializedSnippet | { [name: string]: JsonSerializedSnippet };
}
export interface JsonSerializedSnippet {
isFileTemplate?: boolean;
body: string | string[];
scope: string;
prefix: string | string[];
scope?: string;
prefix?: string | string[];
description: string;
}
export namespace JsonSerializedSnippet {
export function is(obj: unknown): obj is JsonSerializedSnippet {
return isObject(obj) && 'body' in obj && 'prefix' in obj;
return isObject(obj) && 'body' in obj;
}
}

export interface Snippet {
readonly isFileTemplate: boolean
readonly scopes: string[]
readonly name: string
readonly prefix: string
Expand Down