diff --git a/src/services/classifier.ts b/src/services/classifier.ts
index e5e68f06296..7e69e55c317 100644
--- a/src/services/classifier.ts
+++ b/src/services/classifier.ts
@@ -176,7 +176,7 @@ module TypeScript.Services {
}
}
- export interface IClassifierHost extends TypeScript.ILogger {
+ export interface IClassifierHost extends TypeScript.Logger {
}
export class ClassificationResult {
diff --git a/src/services/compiler/diagnostics.ts b/src/services/compiler/diagnostics.ts
index 75d7bfd5a78..d759c8bf014 100644
--- a/src/services/compiler/diagnostics.ts
+++ b/src/services/compiler/diagnostics.ts
@@ -16,7 +16,7 @@
///
module TypeScript {
- export interface ILogger {
+ export interface Logger {
information(): boolean;
debug(): boolean;
warning(): boolean;
@@ -25,7 +25,7 @@ module TypeScript {
log(s: string): void;
}
- export class NullLogger implements ILogger {
+ export class NullLogger implements Logger {
public information(): boolean { return false; }
public debug(): boolean { return false; }
public warning(): boolean { return false; }
@@ -35,7 +35,7 @@ module TypeScript {
}
}
- export function timeFunction(logger: ILogger, funcDescription: string, func: () => any): any {
+ export function timeFunction(logger: Logger, funcDescription: string, func: () => any): any {
var start = (new Date()).getTime();
var result = func();
var end = (new Date()).getTime();
diff --git a/src/services/coreServices.ts b/src/services/coreServices.ts
index 2e34f646649..0f725d3d6be 100644
--- a/src/services/coreServices.ts
+++ b/src/services/coreServices.ts
@@ -23,7 +23,7 @@ var debugObjectHost = (this);
module TypeScript.Services {
export interface ICoreServicesHost {
- logger: TypeScript.ILogger;
+ logger: TypeScript.Logger;
}
export class CoreServices {
diff --git a/src/services/formatting/rulesProvider.ts b/src/services/formatting/rulesProvider.ts
index 0b100500f2d..2ff436d123d 100644
--- a/src/services/formatting/rulesProvider.ts
+++ b/src/services/formatting/rulesProvider.ts
@@ -22,7 +22,7 @@ module TypeScript.Services.Formatting {
private activeRules: Rule[];
private rulesMap: RulesMap;
- constructor(private logger: TypeScript.ILogger) {
+ constructor(private logger: TypeScript.Logger) {
this.globalRules = new Rules();
}
diff --git a/src/services/languageService.ts b/src/services/languageService.ts
index de526c9ee6b..8c656a53f84 100644
--- a/src/services/languageService.ts
+++ b/src/services/languageService.ts
@@ -21,7 +21,7 @@ module TypeScript.Services {
//
// Public interface of the host of a language service instance.
//
- export interface ILanguageServiceHost extends TypeScript.ILogger, TypeScript.IReferenceResolverHost {
+ export interface LanguageServiceHost extends TypeScript.Logger, TypeScript.IReferenceResolverHost {
getCompilationSettings(): ts.CompilerOptions;
getScriptFileNames(): string[];
@@ -38,7 +38,7 @@ module TypeScript.Services {
// Public services of a language service instance associated
// with a language service host instance
//
- export interface ILanguageService {
+ export interface LanguageService {
// Note: refresh is a no-op now. It is only around for back compat purposes.
refresh(): void;
@@ -83,7 +83,7 @@ module TypeScript.Services {
dispose(): void;
}
- export function logInternalError(logger: TypeScript.ILogger, err: Error) {
+ export function logInternalError(logger: TypeScript.Logger, err: Error) {
logger.log("*INTERNAL ERROR* - Exception in typescript services: " + err.message);
}
diff --git a/src/services/pullLanguageService.ts b/src/services/pullLanguageService.ts
index dd4243a4ea1..88aeccf81d7 100644
--- a/src/services/pullLanguageService.ts
+++ b/src/services/pullLanguageService.ts
@@ -40,7 +40,7 @@ module TypeScript.Services {
private _filenameToEntry: ts.Map;
private _compilationSettings: ts.CompilerOptions;
- constructor(private host: ILanguageServiceHost) {
+ constructor(private host: LanguageServiceHost) {
// script id => script index
this._filenameToEntry = {};
@@ -123,7 +123,7 @@ module TypeScript.Services {
private _currentFileSyntaxTree: TypeScript.SyntaxTree = null;
private _currentFileScriptSnapshot: TypeScript.IScriptSnapshot = null;
- constructor(private _host: ILanguageServiceHost) {
+ constructor(private _host: LanguageServiceHost) {
this._hostCache = new HostCache(_host);
}
@@ -381,8 +381,8 @@ module TypeScript.Services {
}
}
- export function createLanguageService(host: ILanguageServiceHost, documentRegistry: IDocumentRegistry) :ILanguageService{
- var logger: TypeScript.ILogger = host;
+ export function createLanguageService(host: LanguageServiceHost, documentRegistry: IDocumentRegistry) :LanguageService{
+ var logger: TypeScript.Logger = host;
var _syntaxTreeCache: SyntaxTreeCache = new SyntaxTreeCache(host);
var formattingRulesProvider: Formatting.RulesProvider;
var hostCache: HostCache; // A cache of all the information about the files on the host side.
diff --git a/src/services/shims.ts b/src/services/shims.ts
index 53e44b262e7..ddab3b75fe2 100644
--- a/src/services/shims.ts
+++ b/src/services/shims.ts
@@ -38,7 +38,7 @@ module TypeScript.Services {
//
// Public interface of the host of a language service shim instance.
//
- export interface ILanguageServiceShimHost extends TypeScript.ILogger {
+ export interface ILanguageServiceShimHost extends TypeScript.Logger {
getCompilationSettings(): string;
// Returns a JSON encoded value of the type:
@@ -79,7 +79,7 @@ module TypeScript.Services {
}
export interface ILanguageServiceShim extends IShim {
- languageService: TypeScript.Services.ILanguageService;
+ languageService: TypeScript.Services.LanguageService;
dispose(dummy: any): void;
@@ -283,7 +283,7 @@ module TypeScript.Services {
}
}
- export class LanguageServiceShimHostAdapter implements TypeScript.Services.ILanguageServiceHost {
+ export class LanguageServiceShimHostAdapter implements TypeScript.Services.LanguageServiceHost {
constructor(private shimHost: ILanguageServiceShimHost) {
}
@@ -389,7 +389,7 @@ module TypeScript.Services {
}
}
- export function simpleForwardCall(logger: TypeScript.ILogger, actionDescription: string, action: () =>any): any {
+ export function simpleForwardCall(logger: TypeScript.Logger, actionDescription: string, action: () =>any): any {
logger.log(actionDescription);
var start = Date.now();
var result = action();
@@ -405,7 +405,7 @@ module TypeScript.Services {
return result;
}
- export function forwardJSONCall(logger: TypeScript.ILogger, actionDescription: string, action: () =>any): string {
+ export function forwardJSONCall(logger: TypeScript.Logger, actionDescription: string, action: () =>any): string {
try {
var result = simpleForwardCall(logger, actionDescription, action);
return JSON.stringify({ result: result });
@@ -421,11 +421,11 @@ module TypeScript.Services {
}
export class LanguageServiceShim extends ShimBase implements ILanguageServiceShim {
- private logger: TypeScript.ILogger;
+ private logger: TypeScript.Logger;
constructor(factory: IShimFactory,
private host: ILanguageServiceShimHost,
- public languageService: TypeScript.Services.ILanguageService) {
+ public languageService: TypeScript.Services.LanguageService) {
super(factory);
this.logger = this.host;
}
@@ -802,7 +802,7 @@ module TypeScript.Services {
}
export class CoreServicesShim extends ShimBase {
- public logger: TypeScript.ILogger;
+ public logger: TypeScript.Logger;
public services: TypeScript.Services.CoreServices;
constructor(factory: IShimFactory, public host: TypeScript.Services.ICoreServicesHost) {
diff --git a/src/services/typescriptServices.ts b/src/services/typescriptServices.ts
index 505fd9b6ac5..04617b00725 100644
--- a/src/services/typescriptServices.ts
+++ b/src/services/typescriptServices.ts
@@ -160,7 +160,7 @@ module TypeScript.Services {
private _shims: IShim[] = [];
private documentRegistry: DocumentRegistry = new DocumentRegistry();
- public createPullLanguageService(host: TypeScript.Services.ILanguageServiceHost): TypeScript.Services.ILanguageService {
+ public createPullLanguageService(host: TypeScript.Services.LanguageServiceHost): TypeScript.Services.LanguageService {
try {
return TypeScript.Services.createLanguageService(host, this.documentRegistry);
}