Merge pull request microsoft#2450 from Microsoft/tsconfigServer

Add support to TypeScript server for tsconfig.json files.

Author: steveluc

src/compiler/program.ts

@@ -10,6 +10,22 @@ module ts {
  /** The version of the TypeScript compiler release */
  export let version = "1.5.0.0";
 
+ export function findConfigFile(searchPath: string): string {
+ var fileName = "tsconfig.json";
+ while (true) {
+ if (sys.fileExists(fileName)) {
+ return fileName;
+ }
+ var parentPath = getDirectoryPath(searchPath);
+ if (parentPath === searchPath) {
+ break;
+ }
+ searchPath = parentPath;
+ fileName = "../" + fileName;
+ }
+ return undefined;
+ }
+
  export function createCompilerHost(options: CompilerOptions, setParentNodes?: boolean): CompilerHost {
  let currentDirectory: string;
  let existingDirectories: Map<boolean> = {};

src/compiler/tsc.ts

@@ -132,23 +132,6 @@ module ts {
  return typeof JSON === "object" && typeof JSON.parse === "function";
  }
 
- function findConfigFile(): string {
- var searchPath = normalizePath(sys.getCurrentDirectory());
- var fileName = "tsconfig.json";
- while (true) {
- if (sys.fileExists(fileName)) {
- return fileName;
- }
- var parentPath = getDirectoryPath(searchPath);
- if (parentPath === searchPath) {
- break;
- }
- searchPath = parentPath;
- fileName = "../" + fileName;
- }
- return undefined;
- }
-
  export function executeCommandLine(args: string[]): void {
  var commandLine = parseCommandLine(args);
  var configFileName: string; // Configuration file name (if any)
@@ -198,7 +181,8 @@ module ts {
  }
  }
  else if (commandLine.fileNames.length === 0 && isJSONSupported()) {
- configFileName = findConfigFile();
+ var searchPath = normalizePath(sys.getCurrentDirectory());
+ configFileName = findConfigFile(searchPath);
  }
 
  if (commandLine.fileNames.length === 0 && !configFileName) {

src/server/editorServices.ts

@@ -550,11 +550,11 @@ module ts.server {
  }
 
  return completions.entries.reduce((result: protocol.CompletionEntry[], entry: ts.CompletionEntry) => {
- if (completions.isMemberCompletion || entry.name.indexOf(prefix) == 0) {
+ if (completions.isMemberCompletion || (entry.name.toLowerCase().indexOf(prefix.toLowerCase()) == 0)) {
  result.push(entry);
  }
  return result;
- }, []);
+ }, []).sort((a, b) => a.name.localeCompare(b.name));
  }
 
  getCompletionEntryDetails(line: number, offset: number,

src/server/session.ts

@@ -0,0 +1,17 @@
+{
+ "compilerOptions": {
+ "module": "commonjs",
+ "noImplicitAny": true,
+ "removeComments": true,
+ "preserveConstEnums": true,
+ "out": "../../built/local/tsserver.js",
+ "sourceMap": true
+ },
+ "files": [
+ "node.d.ts",
+ "editorServices.ts",
+ "protocol.d.ts",
+ "server.ts",
+ "session.ts"
+ ]
+}

src/server/tsconfig.json

@@ -1475,6 +1475,7 @@ declare module "typescript" {
 declare module "typescript" {
  /** The version of the TypeScript compiler release */
  let version: string;
+ function findConfigFile(searchPath: string): string;
  function createCompilerHost(options: CompilerOptions, setParentNodes?: boolean): CompilerHost;
  function getPreEmitDiagnostics(program: Program): Diagnostic[];
  function flattenDiagnosticMessageText(messageText: string | DiagnosticMessageChain, newLine: string): string;

tests/baselines/reference/APISample_compile.js

@@ -4736,6 +4736,10 @@ declare module "typescript" {
  let version: string;
 >version : string
 
+ function findConfigFile(searchPath: string): string;
+>findConfigFile : (searchPath: string) => string
+>searchPath : string
+
  function createCompilerHost(options: CompilerOptions, setParentNodes?: boolean): CompilerHost;
 >createCompilerHost : (options: CompilerOptions, setParentNodes?: boolean) => CompilerHost
 >options : CompilerOptions

tests/baselines/reference/APISample_compile.types

@@ -1506,6 +1506,7 @@ declare module "typescript" {
 declare module "typescript" {
  /** The version of the TypeScript compiler release */
  let version: string;
+ function findConfigFile(searchPath: string): string;
  function createCompilerHost(options: CompilerOptions, setParentNodes?: boolean): CompilerHost;
  function getPreEmitDiagnostics(program: Program): Diagnostic[];
  function flattenDiagnosticMessageText(messageText: string | DiagnosticMessageChain, newLine: string): string;

tests/baselines/reference/APISample_linter.js

@@ -4882,6 +4882,10 @@ declare module "typescript" {
  let version: string;
 >version : string
 
+ function findConfigFile(searchPath: string): string;
+>findConfigFile : (searchPath: string) => string
+>searchPath : string
+
  function createCompilerHost(options: CompilerOptions, setParentNodes?: boolean): CompilerHost;
 >createCompilerHost : (options: CompilerOptions, setParentNodes?: boolean) => CompilerHost
 >options : CompilerOptions

tests/baselines/reference/APISample_linter.types

@@ -1507,6 +1507,7 @@ declare module "typescript" {
 declare module "typescript" {
  /** The version of the TypeScript compiler release */
  let version: string;
+ function findConfigFile(searchPath: string): string;
  function createCompilerHost(options: CompilerOptions, setParentNodes?: boolean): CompilerHost;
  function getPreEmitDiagnostics(program: Program): Diagnostic[];
  function flattenDiagnosticMessageText(messageText: string | DiagnosticMessageChain, newLine: string): string;