Skip to content

Commit 9fcd7dc

Browse files
alexdimaalexdima
committed
Move languagesExtPoint up to /workbench/
1 parent 0765972 commit 9fcd7dc

4 files changed

Lines changed: 65 additions & 67 deletions

File tree

‎src/vs/editor/common/services/modeServiceImpl.ts‎

Lines changed: 1 addition & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -4,75 +4,13 @@
44
*--------------------------------------------------------------------------------------------*/
55
'use strict';
66

7-
import * as nls from 'vs/nls';
87
import { onUnexpectedError } from 'vs/base/common/errors';
98
import Event, { Emitter } from 'vs/base/common/event';
109
import { TPromise } from 'vs/base/common/winjs.base';
11-
import { IExtensionPoint, ExtensionsRegistry } from 'vs/platform/extensions/common/extensionsRegistry';
1210
import { IMode, LanguageId, LanguageIdentifier } from 'vs/editor/common/modes';
1311
import { FrankensteinMode } from 'vs/editor/common/modes/abstractMode';
1412
import { LanguagesRegistry } from 'vs/editor/common/services/languagesRegistry';
15-
import { ILanguageExtensionPoint, IModeLookupResult, IModeService } from 'vs/editor/common/services/modeService';
16-
17-
export const languagesExtPoint: IExtensionPoint<ILanguageExtensionPoint[]> = ExtensionsRegistry.registerExtensionPoint<ILanguageExtensionPoint[]>('languages', [], {
18-
description: nls.localize('vscode.extension.contributes.languages', 'Contributes language declarations.'),
19-
type: 'array',
20-
items: {
21-
type: 'object',
22-
defaultSnippets: [{ body: { id: '${1:languageId}', aliases: ['${2:label}'], extensions: ['${3:extension}'], configuration: './language-configuration.json' } }],
23-
properties: {
24-
id: {
25-
description: nls.localize('vscode.extension.contributes.languages.id', 'ID of the language.'),
26-
type: 'string'
27-
},
28-
aliases: {
29-
description: nls.localize('vscode.extension.contributes.languages.aliases', 'Name aliases for the language.'),
30-
type: 'array',
31-
items: {
32-
type: 'string'
33-
}
34-
},
35-
extensions: {
36-
description: nls.localize('vscode.extension.contributes.languages.extensions', 'File extensions associated to the language.'),
37-
default: ['.foo'],
38-
type: 'array',
39-
items: {
40-
type: 'string'
41-
}
42-
},
43-
filenames: {
44-
description: nls.localize('vscode.extension.contributes.languages.filenames', 'File names associated to the language.'),
45-
type: 'array',
46-
items: {
47-
type: 'string'
48-
}
49-
},
50-
filenamePatterns: {
51-
description: nls.localize('vscode.extension.contributes.languages.filenamePatterns', 'File name glob patterns associated to the language.'),
52-
type: 'array',
53-
items: {
54-
type: 'string'
55-
}
56-
},
57-
mimetypes: {
58-
description: nls.localize('vscode.extension.contributes.languages.mimetypes', 'Mime types associated to the language.'),
59-
type: 'array',
60-
items: {
61-
type: 'string'
62-
}
63-
},
64-
firstLine: {
65-
description: nls.localize('vscode.extension.contributes.languages.firstLine', 'A regular expression matching the first line of a file of the language.'),
66-
type: 'string'
67-
},
68-
configuration: {
69-
description: nls.localize('vscode.extension.contributes.languages.configuration', 'A relative path to a file containing configuration options for the language.'),
70-
type: 'string',
71-
default: './language-configuration.json'
72-
}
73-
}
74-
}
75-
});
13+
import { IModeLookupResult, IModeService } from 'vs/editor/common/services/modeService';
7614

7715
export class ModeServiceImpl implements IModeService {
7816
public _serviceBrand: any;

‎src/vs/workbench/parts/codeEditor/electron-browser/textMate/TMGrammars.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
import * as nls from 'vs/nls';
88
import { IExtensionPoint, ExtensionsRegistry } from 'vs/platform/extensions/common/extensionsRegistry';
9-
import { languagesExtPoint } from 'vs/editor/common/services/modeServiceImpl';
9+
import { languagesExtPoint } from "vs/workbench/services/mode/common/workbenchModeService";
1010

1111
export interface IEmbeddedLanguagesMap {
1212
[scopeName: string]: string;

‎src/vs/workbench/parts/snippets/electron-browser/TMSnippets.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { readFile } from 'vs/base/node/pfs';
1313
import { ExtensionMessageCollector, ExtensionsRegistry } from 'vs/platform/extensions/common/extensionsRegistry';
1414
import { ISnippetsService, ISnippet } from 'vs/workbench/parts/snippets/electron-browser/snippetsService';
1515
import { IModeService } from 'vs/editor/common/services/modeService';
16-
import { languagesExtPoint } from 'vs/editor/common/services/modeServiceImpl';
16+
import { languagesExtPoint } from "vs/workbench/services/mode/common/workbenchModeService";
1717
import { LanguageIdentifier } from 'vs/editor/common/modes';
1818
import { SnippetParser, Marker, Placeholder, Variable, Text, walk } from 'vs/editor/contrib/snippet/browser/snippetParser';
1919
import { EditorSnippetVariableResolver } from 'vs/editor/contrib/snippet/browser/snippetVariables';

‎src/vs/workbench/services/mode/common/workbenchModeService.ts‎

Lines changed: 62 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,71 @@ import { TPromise } from 'vs/base/common/winjs.base';
1111
import mime = require('vs/base/common/mime');
1212
import { IFilesConfiguration } from 'vs/platform/files/common/files';
1313
import { IExtensionService } from 'vs/platform/extensions/common/extensions';
14-
import { IExtensionPointUser, ExtensionMessageCollector } from 'vs/platform/extensions/common/extensionsRegistry';
14+
import { IExtensionPointUser, ExtensionMessageCollector, IExtensionPoint, ExtensionsRegistry } from 'vs/platform/extensions/common/extensionsRegistry';
1515
import { ModesRegistry } from 'vs/editor/common/modes/modesRegistry';
1616
import { ILanguageExtensionPoint, IValidLanguageExtensionPoint } from 'vs/editor/common/services/modeService';
1717
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
18-
import { languagesExtPoint, ModeServiceImpl } from 'vs/editor/common/services/modeServiceImpl';
18+
import { ModeServiceImpl } from 'vs/editor/common/services/modeServiceImpl';
19+
20+
export const languagesExtPoint: IExtensionPoint<ILanguageExtensionPoint[]> = ExtensionsRegistry.registerExtensionPoint<ILanguageExtensionPoint[]>('languages', [], {
21+
description: nls.localize('vscode.extension.contributes.languages', 'Contributes language declarations.'),
22+
type: 'array',
23+
items: {
24+
type: 'object',
25+
defaultSnippets: [{ body: { id: '${1:languageId}', aliases: ['${2:label}'], extensions: ['${3:extension}'], configuration: './language-configuration.json' } }],
26+
properties: {
27+
id: {
28+
description: nls.localize('vscode.extension.contributes.languages.id', 'ID of the language.'),
29+
type: 'string'
30+
},
31+
aliases: {
32+
description: nls.localize('vscode.extension.contributes.languages.aliases', 'Name aliases for the language.'),
33+
type: 'array',
34+
items: {
35+
type: 'string'
36+
}
37+
},
38+
extensions: {
39+
description: nls.localize('vscode.extension.contributes.languages.extensions', 'File extensions associated to the language.'),
40+
default: ['.foo'],
41+
type: 'array',
42+
items: {
43+
type: 'string'
44+
}
45+
},
46+
filenames: {
47+
description: nls.localize('vscode.extension.contributes.languages.filenames', 'File names associated to the language.'),
48+
type: 'array',
49+
items: {
50+
type: 'string'
51+
}
52+
},
53+
filenamePatterns: {
54+
description: nls.localize('vscode.extension.contributes.languages.filenamePatterns', 'File name glob patterns associated to the language.'),
55+
type: 'array',
56+
items: {
57+
type: 'string'
58+
}
59+
},
60+
mimetypes: {
61+
description: nls.localize('vscode.extension.contributes.languages.mimetypes', 'Mime types associated to the language.'),
62+
type: 'array',
63+
items: {
64+
type: 'string'
65+
}
66+
},
67+
firstLine: {
68+
description: nls.localize('vscode.extension.contributes.languages.firstLine', 'A regular expression matching the first line of a file of the language.'),
69+
type: 'string'
70+
},
71+
configuration: {
72+
description: nls.localize('vscode.extension.contributes.languages.configuration', 'A relative path to a file containing configuration options for the language.'),
73+
type: 'string',
74+
default: './language-configuration.json'
75+
}
76+
}
77+
}
78+
});
1979

2080
export class WorkbenchModeServiceImpl extends ModeServiceImpl {
2181
private _configurationService: IConfigurationService;

0 commit comments

Comments
 (0)