development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 04:49:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reduce diff

Browse source
This commit is contained in:
Alex Dima 2019-07-29 13:44:39 +02:00
parent 6a158443d7
commit 4eb531b613
5 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
extensions/typescript-basics/package.json
View file

@ -53,7 +53,13 @@
{
"language": "typescript",
"scopeName": "source.ts",
"path": "./syntaxes/TypeScript.tmLanguage.json"
"path": "./syntaxes/TypeScript.tmLanguage.json",
"tokenTypes": {
"entity.name.type.instance.jsdoc": "other",
"entity.name.function.tagged-template": "other",
"meta.import string.quoted": "other",
"variable.other.jsdoc": "other"
}
},
{
"language": "typescriptreact",
@ -124,4 +130,4 @@
}
]
}
}
}

2
src/vs/code/electron-main/window.ts
View file

@ -28,7 +28,7 @@ import { RunOnceScheduler } from 'vs/base/common/async';
import { IFileService } from 'vs/platform/files/common/files';
import pkg from 'vs/platform/product/node/package';
const RUN_TEXTMATE_IN_WORKER = true;
const RUN_TEXTMATE_IN_WORKER = false;
export interface IWindowCreationOptions {
state: IWindowState;

2
src/vs/editor/contrib/tokenization/tokenization.ts
View file

@ -23,7 +23,7 @@ class ForceRetokenizeAction extends EditorAction {
return;
}
const model = editor.getModel();
// model.resetTokenization();
model.resetTokenization();
const sw = new StopWatch(true);
model.forceTokenization(model.getLineCount());
sw.stop();

4
src/vs/workbench/services/textMate/browser/abstractTextMateService.ts
View file

@ -228,9 +228,7 @@ export abstract class AbstractTextMateService extends Disposable implements ITex
onUnexpectedError(e);
return null;
});
if (modeId !== 'typescript') {
this._tokenizersRegistrations.push(TokenizationRegistry.registerPromise(modeId, promise));
}
this._tokenizersRegistrations.push(TokenizationRegistry.registerPromise(modeId, promise));
}
} catch (err) {
onUnexpectedError(err);

2
src/vs/workbench/services/textMate/electron-browser/textMateService.ts
View file

@ -25,7 +25,7 @@ import { TMGrammarFactory } from 'vs/workbench/services/textMate/common/TMGramma
import { IModelContentChangedEvent } from 'vs/editor/common/model/textModelEvents';
import { IStorageService } from 'vs/platform/storage/common/storage';
const RUN_TEXTMATE_IN_WORKER = true;
const RUN_TEXTMATE_IN_WORKER = false;
class ModelWorkerTextMateTokenizer extends Disposable {