提交 c178247f 编写于 作者: J Johannes Rieken

only default project resolver

上级 07caf5ad
...@@ -4,9 +4,7 @@ ...@@ -4,9 +4,7 @@
*--------------------------------------------------------------------------------------------*/ *--------------------------------------------------------------------------------------------*/
'use strict'; 'use strict';
import platform = require('vs/platform/platform');
import typescript = require('vs/languages/typescript/common/typescript'); import typescript = require('vs/languages/typescript/common/typescript');
import {AsyncDescriptor} from 'vs/platform/instantiation/common/descriptors';
import ts = require('vs/languages/typescript/common/lib/typescriptServices'); import ts = require('vs/languages/typescript/common/lib/typescriptServices');
export namespace Defaults { export namespace Defaults {
...@@ -20,24 +18,4 @@ export namespace Defaults { ...@@ -20,24 +18,4 @@ export namespace Defaults {
export function setCompilerOptions(options: ts.CompilerOptions): void { export function setCompilerOptions(options: ts.CompilerOptions): void {
ProjectResolver.setCompilerOptions(options); ProjectResolver.setCompilerOptions(options);
} }
}
// ----- JavaScript extension ---------------------------------------------------------------
export namespace Extensions {
export var Identifier = 'javascript';
platform.Registry.add(Identifier, Extensions);
var projectResolver: AsyncDescriptor<typescript.IProjectResolver2>;
export function setProjectResolver(desc: AsyncDescriptor<typescript.IProjectResolver2>): void {
projectResolver = desc;
}
export function getProjectResolver(): AsyncDescriptor<typescript.IProjectResolver2> {
return projectResolver;
}
} }
...@@ -122,7 +122,7 @@ export class JSMode extends typescriptMode.TypeScriptMode<javascriptWorker.JavaS ...@@ -122,7 +122,7 @@ export class JSMode extends typescriptMode.TypeScriptMode<javascriptWorker.JavaS
// ---- specialize by override // ---- specialize by override
protected _getProjectResolver(): AsyncDescriptor<typescript.IProjectResolver2>|typescript.IProjectResolver2 { protected _getProjectResolver(): AsyncDescriptor<typescript.IProjectResolver2>|typescript.IProjectResolver2 {
return extensions.Extensions.getProjectResolver() || extensions.Defaults.ProjectResolver; return extensions.Defaults.ProjectResolver;
} }
_shouldBeValidated(model: EditorCommon.IModel): boolean { _shouldBeValidated(model: EditorCommon.IModel): boolean {
......
...@@ -5,10 +5,8 @@ ...@@ -5,10 +5,8 @@
'use strict'; 'use strict';
import winjs = require('vs/base/common/winjs.base'); import winjs = require('vs/base/common/winjs.base');
import platform = require('vs/platform/platform');
import URI from 'vs/base/common/uri'; import URI from 'vs/base/common/uri';
import ts = require('vs/languages/typescript/common/lib/typescriptServices'); import ts = require('vs/languages/typescript/common/lib/typescriptServices');
import {AsyncDescriptor} from 'vs/platform/instantiation/common/descriptors';
export enum ChangeKind { export enum ChangeKind {
Changed, Changed,
...@@ -115,22 +113,3 @@ export namespace Defaults { ...@@ -115,22 +113,3 @@ export namespace Defaults {
ProjectResolver.setCompilerOptions(options); ProjectResolver.setCompilerOptions(options);
} }
} }
// ----- TypeScript extension ---------------------------------------------------------------
export namespace Extensions {
export var Identifier = 'typescript';
platform.Registry.add(Identifier, Extensions);
var projectResolver: AsyncDescriptor<IProjectResolver2>;
export function setProjectResolver(desc: AsyncDescriptor<IProjectResolver2>): void {
projectResolver = desc;
}
export function getProjectResolver(): AsyncDescriptor<IProjectResolver2> {
return projectResolver;
}
}
...@@ -307,7 +307,7 @@ export class TypeScriptMode<W extends typescriptWorker.TypeScriptWorker2> extend ...@@ -307,7 +307,7 @@ export class TypeScriptMode<W extends typescriptWorker.TypeScriptWorker2> extend
// ---- project sync // ---- project sync
protected _getProjectResolver(): AsyncDescriptor<typescript.IProjectResolver2>|typescript.IProjectResolver2 { protected _getProjectResolver(): AsyncDescriptor<typescript.IProjectResolver2>|typescript.IProjectResolver2 {
return typescript.Extensions.getProjectResolver() || typescript.Defaults.ProjectResolver; return typescript.Defaults.ProjectResolver;
} }
acceptProjectChanges(changes: { kind: typescript.ChangeKind; resource: URI; files: URI[]; options: ts.CompilerOptions }[]): WinJS.TPromise<{[dirname:string]:URI}> { acceptProjectChanges(changes: { kind: typescript.ChangeKind; resource: URI; files: URI[]; options: ts.CompilerOptions }[]): WinJS.TPromise<{[dirname:string]:URI}> {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册