microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-17 01:49:57 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Make configFile on compiler options as non enumerable

Browse Source
This commit is contained in:
Sheetal Nandi
2017-05-26 17:06:15 -07:00
parent 16fd947ac3
commit 7bd9e092ac
13 changed files with 38 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/project.ts
View File

@@ -789,7 +789,7 @@ namespace ts.server {
setCompilerOptions(options?: CompilerOptions) {
// Avoid manipulating the given options directly
const newOptions = options ? clone(options) : this.getCompilerOptions();
const newOptions = options ? cloneCompilerOptions(options) : this.getCompilerOptions();
if (!newOptions) {
return;
}

52
src/server/session.ts
View File

@@ -132,20 +132,6 @@ namespace ts.server {
return `Content-Length: ${1 + len}\r\n\r\n${json}${newLine}`;
}
/**
* Get the compiler options without configFile key
* @param options
*/
function getCompilerOptionsWithoutConfigFile(options: CompilerOptions) {
const result: CompilerOptions = {};
for (const option in options) {
if (option !== "configFile") {
result[option] = options[option];
}
}
return result;
}
/**
* Allows to schedule next step in multistep operation
*/
@@ -1670,39 +1656,19 @@ namespace ts.server {
},
[CommandNames.SynchronizeProjectList]: (request: protocol.SynchronizeProjectListRequest) => {
const result = this.projectService.synchronizeProjectList(request.arguments.knownProjects);
// Remapping of the result is needed if
// - there are project errors
// - options contain configFile - need to remove it from options before serializing
const shouldRemapProjectFilesWithTSDiagnostics = (p: ProjectFilesWithTSDiagnostics) => (p.projectErrors && !!p.projectErrors.length) || (p.info && !!p.info.options.configFile);
if (!some(result, shouldRemapProjectFilesWithTSDiagnostics)) {
if (!result.some(p => p.projectErrors && p.projectErrors.length !== 0)) {
return this.requiredResponse(result);
}
const converted = map(result, p => {
if (shouldRemapProjectFilesWithTSDiagnostics(p)) {
// Map the project errors
const projectErrors = p.projectErrors && p.projectErrors.length ?
this.convertToDiagnosticsWithLinePosition(p.projectErrors, /*scriptInfo*/ undefined) :
p.projectErrors;
// Remove the configFile in the options before serializing
const info = p.info && !!p.info.options.configFile ?
{
projectName: p.info.projectName,
isInferred: p.info.isInferred,
version: p.info.version,
options: getCompilerOptionsWithoutConfigFile(p.info.options),
languageServiceDisabled: p.info.languageServiceDisabled
} : p.info;
return {
info,
changes: p.changes,
files: p.files,
projectErrors
};
if (!p.projectErrors || p.projectErrors.length === 0) {
return p;
}
return p;
return {
info: p.info,
changes: p.changes,
files: p.files,
projectErrors: this.convertToDiagnosticsWithLinePosition(p.projectErrors, /*scriptInfo*/ undefined)
};
});
return this.requiredResponse(converted);
},