ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-15 02:48:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 5d18ad4c5902e3bddbc9f78da82dfc2ac349e908 (#9683)

Browse Source
This commit is contained in:
Anthony Dresser
2020-03-20 01:17:27 -07:00
committed by GitHub
parent 1520441b84
commit dd8fb9433b
89 changed files with 3095 additions and 445 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/vs/editor/common/config/editorOptions.ts
View File

@@ -2841,6 +2841,14 @@ export interface ISuggestOptions {
* Show typeParameter-suggestions.
*/
showTypeParameters?: boolean;
/**
* Show issue-suggestions.
*/
showIssues?: boolean;
/**
* Show user-suggestions.
*/
showUsers?: boolean;
/**
* Show snippet-suggestions.
*/
@@ -2895,6 +2903,8 @@ class EditorSuggest extends BaseEditorOption<EditorOption.suggest, InternalSugge
showFolders: true,
showTypeParameters: true,
showSnippets: true,
showUsers: true,
showIssues: true,
statusBar: {
visible: false
}
@@ -3083,6 +3093,16 @@ class EditorSuggest extends BaseEditorOption<EditorOption.suggest, InternalSugge
default: true,
markdownDescription: nls.localize('editor.suggest.showSnippets', "When enabled IntelliSense shows `snippet`-suggestions.")
},
'editor.suggest.showUsers': {
type: 'boolean',
default: true,
markdownDescription: nls.localize('editor.suggest.showUsers', "When enabled IntelliSense shows `user`-suggestions.")
},
'editor.suggest.showIssues': {
type: 'boolean',
default: true,
markdownDescription: nls.localize('editor.suggest.showIssues', "When enabled IntelliSense shows `issues`-suggestions.")
},
'editor.suggest.statusBar.visible': {
type: 'boolean',
default: false,
@@ -3131,6 +3151,8 @@ class EditorSuggest extends BaseEditorOption<EditorOption.suggest, InternalSugge
showFolders: EditorBooleanOption.boolean(input.showFolders, this.defaultValue.showFolders),
showTypeParameters: EditorBooleanOption.boolean(input.showTypeParameters, this.defaultValue.showTypeParameters),
showSnippets: EditorBooleanOption.boolean(input.showSnippets, this.defaultValue.showSnippets),
showUsers: EditorBooleanOption.boolean(input.showUsers, this.defaultValue.showUsers),
showIssues: EditorBooleanOption.boolean(input.showIssues, this.defaultValue.showIssues),
statusBar: {
visible: EditorBooleanOption.boolean(input.statusBar?.visible, !!this.defaultValue.statusBar.visible)
}

59
src/vs/editor/common/modes.ts
View File

@@ -319,6 +319,8 @@ export const enum CompletionItemKind {
Customcolor,
Folder,
TypeParameter,
User,
Issue,
Snippet, // <- highest value (used for compare!)
}
@@ -327,32 +329,34 @@ export const enum CompletionItemKind {
*/
export const completionKindToCssClass = (function () {
let data = Object.create(null);
data[CompletionItemKind.Method] = 'method';
data[CompletionItemKind.Function] = 'function';
data[CompletionItemKind.Constructor] = 'constructor';
data[CompletionItemKind.Field] = 'field';
data[CompletionItemKind.Variable] = 'variable';
data[CompletionItemKind.Class] = 'class';
data[CompletionItemKind.Struct] = 'struct';
data[CompletionItemKind.Interface] = 'interface';
data[CompletionItemKind.Module] = 'module';
data[CompletionItemKind.Property] = 'property';
data[CompletionItemKind.Event] = 'event';
data[CompletionItemKind.Operator] = 'operator';
data[CompletionItemKind.Unit] = 'unit';
data[CompletionItemKind.Value] = 'value';
data[CompletionItemKind.Constant] = 'constant';
data[CompletionItemKind.Enum] = 'enum';
data[CompletionItemKind.EnumMember] = 'enum-member';
data[CompletionItemKind.Keyword] = 'keyword';
data[CompletionItemKind.Snippet] = 'snippet';
data[CompletionItemKind.Text] = 'text';
data[CompletionItemKind.Color] = 'color';
data[CompletionItemKind.File] = 'file';
data[CompletionItemKind.Reference] = 'reference';
data[CompletionItemKind.Customcolor] = 'customcolor';
data[CompletionItemKind.Folder] = 'folder';
data[CompletionItemKind.TypeParameter] = 'type-parameter';
data[CompletionItemKind.Method] = 'symbol-method';
data[CompletionItemKind.Function] = 'symbol-function';
data[CompletionItemKind.Constructor] = 'symbol-constructor';
data[CompletionItemKind.Field] = 'symbol-field';
data[CompletionItemKind.Variable] = 'symbol-variable';
data[CompletionItemKind.Class] = 'symbol-class';
data[CompletionItemKind.Struct] = 'symbol-struct';
data[CompletionItemKind.Interface] = 'symbol-interface';
data[CompletionItemKind.Module] = 'symbol-module';
data[CompletionItemKind.Property] = 'symbol-property';
data[CompletionItemKind.Event] = 'symbol-event';
data[CompletionItemKind.Operator] = 'symbol-operator';
data[CompletionItemKind.Unit] = 'symbol-unit';
data[CompletionItemKind.Value] = 'symbol-value';
data[CompletionItemKind.Constant] = 'symbol-constant';
data[CompletionItemKind.Enum] = 'symbol-enum';
data[CompletionItemKind.EnumMember] = 'symbol-enum-member';
data[CompletionItemKind.Keyword] = 'symbol-keyword';
data[CompletionItemKind.Snippet] = 'symbol-snippet';
data[CompletionItemKind.Text] = 'symbol-text';
data[CompletionItemKind.Color] = 'symbol-color';
data[CompletionItemKind.File] = 'symbol-file';
data[CompletionItemKind.Reference] = 'symbol-reference';
data[CompletionItemKind.Customcolor] = 'symbol-customcolor';
data[CompletionItemKind.Folder] = 'symbol-folder';
data[CompletionItemKind.TypeParameter] = 'symbol-type-parameter';
data[CompletionItemKind.User] = 'account';
data[CompletionItemKind.Issue] = 'issues';
return function (kind: CompletionItemKind) {
return data[kind] || 'property';
@@ -395,7 +399,8 @@ export let completionKindFromString: {
data['folder'] = CompletionItemKind.Folder;
data['type-parameter'] = CompletionItemKind.TypeParameter;
data['typeParameter'] = CompletionItemKind.TypeParameter;
data['account'] = CompletionItemKind.User;
data['issue'] = CompletionItemKind.Issue;
return function (value: string, strict?: true) {
let res = data[value];
if (typeof res === 'undefined' && !strict) {

4
src/vs/editor/common/standalone/standaloneEnums.ts
View File

@@ -53,7 +53,9 @@ export enum CompletionItemKind {
Customcolor = 22,
Folder = 23,
TypeParameter = 24,
Snippet = 25
User = 25,
Issue = 26,
Snippet = 27
}
export enum CompletionItemTag {