SystemSh0cker/monaco-editor
1
0
Fork 0
mirror of https://github.com/microsoft/monaco-editor.git synced 2025-12-22 18:32:56 +01:00
Code Issues Projects Releases Packages Activity

Adopt latest monaco-editor-core

Browse source
This commit is contained in:
Alex Dima 2016-06-16 12:28:21 +02:00
parent 73295879a4
commit 7bd4d2543f
6 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -24,7 +24,7 @@
"gulp-uglify": "^1.5.3", "gulp-uglify": "^1.5.3",
"merge-stream": "^1.0.0", "merge-stream": "^1.0.0",
"mocha": "^2.5.3", "mocha": "^2.5.3",
"monaco-editor-core": "^0.3.1", "monaco-editor-core": "^0.4.0",
"object-assign": "^4.1.0", "object-assign": "^4.1.0",
"rimraf": "^2.5.2", "rimraf": "^2.5.2",
"typescript": "1.8.10", "typescript": "1.8.10",

6
src/languageFeatures.ts
View file

@ -464,7 +464,7 @@ outlineTypeTable[Kind.localFunction] = monaco.languages.SymbolKind.Function;
// --- formatting ---- // --- formatting ----
export abstract class FormatHelper extends Adapter { export abstract class FormatHelper extends Adapter {
protected static _convertOptions(options: monaco.languages.IFormattingOptions): ts.FormatCodeOptions { protected static _convertOptions(options: monaco.languages.FormattingOptions): ts.FormatCodeOptions {
return { return {
ConvertTabsToSpaces: options.insertSpaces, ConvertTabsToSpaces: options.insertSpaces,
TabSize: options.tabSize, TabSize: options.tabSize,
@ -494,7 +494,7 @@ export abstract class FormatHelper extends Adapter {
export class FormatAdapter extends FormatHelper implements monaco.languages.DocumentRangeFormattingEditProvider { export class FormatAdapter extends FormatHelper implements monaco.languages.DocumentRangeFormattingEditProvider {
provideDocumentRangeFormattingEdits(model: monaco.editor.IReadOnlyModel, range: Range, options: monaco.languages.IFormattingOptions, token: CancellationToken): Thenable<monaco.editor.ISingleEditOperation[]> { provideDocumentRangeFormattingEdits(model: monaco.editor.IReadOnlyModel, range: Range, options: monaco.languages.FormattingOptions, token: CancellationToken): Thenable<monaco.editor.ISingleEditOperation[]> {
const resource = model.uri; const resource = model.uri;
return wireCancellationToken(token, this._worker(resource).then(worker => { return wireCancellationToken(token, this._worker(resource).then(worker => {
@ -516,7 +516,7 @@ export class FormatOnTypeAdapter extends FormatHelper implements monaco.language
return [';', '}', '\n']; return [';', '}', '\n'];
} }
provideOnTypeFormattingEdits(model: monaco.editor.IReadOnlyModel, position: Position, ch: string, options: monaco.languages.IFormattingOptions, token: CancellationToken): Thenable<monaco.editor.ISingleEditOperation[]> { provideOnTypeFormattingEdits(model: monaco.editor.IReadOnlyModel, position: Position, ch: string, options: monaco.languages.FormattingOptions, token: CancellationToken): Thenable<monaco.editor.ISingleEditOperation[]> {
const resource = model.uri; const resource = model.uri;
return wireCancellationToken(token, this._worker(resource).then(worker => { return wireCancellationToken(token, this._worker(resource).then(worker => {

2
src/mode.ts
View file

@ -55,7 +55,7 @@ function setupMode(defaults:LanguageServiceDefaultsImpl, modeId:string, language
disposables.push(monaco.languages.setTokensProvider(modeId, createTokenizationSupport(language))); disposables.push(monaco.languages.setTokensProvider(modeId, createTokenizationSupport(language)));
} }
const richEditConfiguration:monaco.languages.IRichLanguageConfiguration = { const richEditConfiguration:monaco.languages.LanguageConfiguration = {
wordPattern: /(-?\d*\.\d\w*)|([^\`\~\!\@\#\%\^\&\*\(\)\-\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\?\s]+)/g, wordPattern: /(-?\d*\.\d\w*)|([^\`\~\!\@\#\%\^\&\*\(\)\-\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\?\s]+)/g,
comments: { comments: {

2
src/monaco.contribution.ts
View file

@ -122,6 +122,7 @@ const javascriptDefaults = new LanguageServiceDefaultsImpl(
{ noSemanticValidation: true, noSyntaxValidation: false }); { noSemanticValidation: true, noSyntaxValidation: false });
// Export API
function createAPI(): typeof monaco.languages.typescript { function createAPI(): typeof monaco.languages.typescript {
return { return {
ModuleKind: ModuleKind, ModuleKind: ModuleKind,
@ -133,6 +134,7 @@ function createAPI(): typeof monaco.languages.typescript {
javascriptDefaults: javascriptDefaults javascriptDefaults: javascriptDefaults
} }
} }
monaco.languages.typescript = createAPI();
// --- Registration to monaco editor --- // --- Registration to monaco editor ---

4
src/worker.ts
View file

@ -44,12 +44,12 @@ export class TypeScriptWorker implements ts.LanguageServiceHost {
} }
getScriptFileNames(): string[] { getScriptFileNames(): string[] {
let models = monaco.worker.mirrorModels.map(model => model.uri.toString()); let models = monaco.worker.getMirrorModels().map(model => model.uri.toString());
return models.concat(Object.keys(this._extraLibs)); return models.concat(Object.keys(this._extraLibs));
} }
private _getModel(fileName:string): monaco.worker.IMirrorModel { private _getModel(fileName:string): monaco.worker.IMirrorModel {
let models = monaco.worker.mirrorModels; let models = monaco.worker.getMirrorModels();
for (let i = 0; i < models.length; i++) { for (let i = 0; i < models.length; i++) {
if (models[i].uri.toString() === fileName) { if (models[i].uri.toString() === fileName) {
return models[i]; return models[i];

1
tsconfig.json
View file

@ -16,7 +16,6 @@
"src/monaco.contribution.ts", "src/monaco.contribution.ts",
"src/monaco.d.ts", "src/monaco.d.ts",
"src/tokenization.ts", "src/tokenization.ts",
"src/typescript.ts",
"src/worker.ts", "src/worker.ts",
"src/workerManager.ts", "src/workerManager.ts",
"test/assert.d.ts", "test/assert.d.ts",