Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Added RANDOM, RANDOM_HEX snippet variables #82529

Merged
merged 1 commit into from Oct 16, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/vs/editor/contrib/snippet/snippetSession.ts
Expand Up @@ -18,7 +18,7 @@ import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService
import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
import { optional } from 'vs/platform/instantiation/common/instantiation';
import { Choice, Placeholder, SnippetParser, Text, TextmateSnippet, Marker } from './snippetParser';
import { ClipboardBasedVariableResolver, CompositeSnippetVariableResolver, ModelBasedVariableResolver, SelectionBasedVariableResolver, TimeBasedVariableResolver, CommentBasedVariableResolver, WorkspaceBasedVariableResolver } from './snippetVariables';
import { ClipboardBasedVariableResolver, CompositeSnippetVariableResolver, ModelBasedVariableResolver, SelectionBasedVariableResolver, TimeBasedVariableResolver, CommentBasedVariableResolver, WorkspaceBasedVariableResolver, RandomBasedVariableResolver } from './snippetVariables';
import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
import * as colors from 'vs/platform/theme/common/colorRegistry';
import { withNullAsUndefined } from 'vs/base/common/types';
Expand Down Expand Up @@ -450,6 +450,7 @@ export class SnippetSession {
new CommentBasedVariableResolver(model),
new TimeBasedVariableResolver,
new WorkspaceBasedVariableResolver(workspaceService),
new RandomBasedVariableResolver,
]));

const offset = model.getOffsetAt(start) + delta;
Expand Down
17 changes: 17 additions & 0 deletions src/vs/editor/contrib/snippet/snippetVariables.ts
Expand Up @@ -46,6 +46,8 @@ export const KnownSnippetVariableNames: { [key: string]: true } = Object.freeze(
'LINE_COMMENT': true,
'WORKSPACE_NAME': true,
'WORKSPACE_FOLDER': true,
'RANDOM': true,
'RANDOM_HEX': true,
});

export class CompositeSnippetVariableResolver implements VariableResolver {
Expand Down Expand Up @@ -316,3 +318,18 @@ export class WorkspaceBasedVariableResolver implements VariableResolver {
return (folderpath ? normalizeDriveLetter(folderpath) : '/');
}
}

export class RandomBasedVariableResolver implements VariableResolver {
resolve(variable: Variable): string | undefined {
const { name } = variable;

if (name === 'RANDOM') {
return Math.random().toString().slice(-6);
}
else if (name === 'RANDOM_HEX') {
return Math.random().toString(16).slice(-6);
}

return undefined;
}
}