mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-15 02:48:30 -05:00
Merge VS Code 1.31.1 (#4283)
This commit is contained in:
@@ -27,61 +27,65 @@ export interface IRawLanguageExtensionPoint {
|
||||
configuration: string;
|
||||
}
|
||||
|
||||
export const languagesExtPoint: IExtensionPoint<IRawLanguageExtensionPoint[]> = ExtensionsRegistry.registerExtensionPoint<IRawLanguageExtensionPoint[]>('languages', [], {
|
||||
description: nls.localize('vscode.extension.contributes.languages', 'Contributes language declarations.'),
|
||||
type: 'array',
|
||||
items: {
|
||||
type: 'object',
|
||||
defaultSnippets: [{ body: { id: '${1:languageId}', aliases: ['${2:label}'], extensions: ['${3:extension}'], configuration: './language-configuration.json' } }],
|
||||
properties: {
|
||||
id: {
|
||||
description: nls.localize('vscode.extension.contributes.languages.id', 'ID of the language.'),
|
||||
type: 'string'
|
||||
},
|
||||
aliases: {
|
||||
description: nls.localize('vscode.extension.contributes.languages.aliases', 'Name aliases for the language.'),
|
||||
type: 'array',
|
||||
items: {
|
||||
export const languagesExtPoint: IExtensionPoint<IRawLanguageExtensionPoint[]> = ExtensionsRegistry.registerExtensionPoint<IRawLanguageExtensionPoint[]>({
|
||||
isDynamic: true,
|
||||
extensionPoint: 'languages',
|
||||
jsonSchema: {
|
||||
description: nls.localize('vscode.extension.contributes.languages', 'Contributes language declarations.'),
|
||||
type: 'array',
|
||||
items: {
|
||||
type: 'object',
|
||||
defaultSnippets: [{ body: { id: '${1:languageId}', aliases: ['${2:label}'], extensions: ['${3:extension}'], configuration: './language-configuration.json' } }],
|
||||
properties: {
|
||||
id: {
|
||||
description: nls.localize('vscode.extension.contributes.languages.id', 'ID of the language.'),
|
||||
type: 'string'
|
||||
}
|
||||
},
|
||||
extensions: {
|
||||
description: nls.localize('vscode.extension.contributes.languages.extensions', 'File extensions associated to the language.'),
|
||||
default: ['.foo'],
|
||||
type: 'array',
|
||||
items: {
|
||||
},
|
||||
aliases: {
|
||||
description: nls.localize('vscode.extension.contributes.languages.aliases', 'Name aliases for the language.'),
|
||||
type: 'array',
|
||||
items: {
|
||||
type: 'string'
|
||||
}
|
||||
},
|
||||
extensions: {
|
||||
description: nls.localize('vscode.extension.contributes.languages.extensions', 'File extensions associated to the language.'),
|
||||
default: ['.foo'],
|
||||
type: 'array',
|
||||
items: {
|
||||
type: 'string'
|
||||
}
|
||||
},
|
||||
filenames: {
|
||||
description: nls.localize('vscode.extension.contributes.languages.filenames', 'File names associated to the language.'),
|
||||
type: 'array',
|
||||
items: {
|
||||
type: 'string'
|
||||
}
|
||||
},
|
||||
filenamePatterns: {
|
||||
description: nls.localize('vscode.extension.contributes.languages.filenamePatterns', 'File name glob patterns associated to the language.'),
|
||||
type: 'array',
|
||||
items: {
|
||||
type: 'string'
|
||||
}
|
||||
},
|
||||
mimetypes: {
|
||||
description: nls.localize('vscode.extension.contributes.languages.mimetypes', 'Mime types associated to the language.'),
|
||||
type: 'array',
|
||||
items: {
|
||||
type: 'string'
|
||||
}
|
||||
},
|
||||
firstLine: {
|
||||
description: nls.localize('vscode.extension.contributes.languages.firstLine', 'A regular expression matching the first line of a file of the language.'),
|
||||
type: 'string'
|
||||
},
|
||||
configuration: {
|
||||
description: nls.localize('vscode.extension.contributes.languages.configuration', 'A relative path to a file containing configuration options for the language.'),
|
||||
type: 'string',
|
||||
default: './language-configuration.json'
|
||||
}
|
||||
},
|
||||
filenames: {
|
||||
description: nls.localize('vscode.extension.contributes.languages.filenames', 'File names associated to the language.'),
|
||||
type: 'array',
|
||||
items: {
|
||||
type: 'string'
|
||||
}
|
||||
},
|
||||
filenamePatterns: {
|
||||
description: nls.localize('vscode.extension.contributes.languages.filenamePatterns', 'File name glob patterns associated to the language.'),
|
||||
type: 'array',
|
||||
items: {
|
||||
type: 'string'
|
||||
}
|
||||
},
|
||||
mimetypes: {
|
||||
description: nls.localize('vscode.extension.contributes.languages.mimetypes', 'Mime types associated to the language.'),
|
||||
type: 'array',
|
||||
items: {
|
||||
type: 'string'
|
||||
}
|
||||
},
|
||||
firstLine: {
|
||||
description: nls.localize('vscode.extension.contributes.languages.firstLine', 'A regular expression matching the first line of a file of the language.'),
|
||||
type: 'string'
|
||||
},
|
||||
configuration: {
|
||||
description: nls.localize('vscode.extension.contributes.languages.configuration', 'A relative path to a file containing configuration options for the language.'),
|
||||
type: 'string',
|
||||
default: './language-configuration.json'
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -133,7 +137,7 @@ export class WorkbenchModeServiceImpl extends ModeServiceImpl {
|
||||
}
|
||||
}
|
||||
|
||||
ModesRegistry.registerLanguages(allValidLanguages);
|
||||
ModesRegistry.setDynamicLanguages(allValidLanguages);
|
||||
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user