Exclude js files in non-configured projects compile-on-save emitting#12118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Zhengbo Li (zhengbli) merged 2 commits into from
Nov 10, 2016
Merged

Exclude js files in non-configured projects compile-on-save emitting #12118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
658dfe7
Exclude js files in non-configured projects CoS emitting
Nov 9, 2016
c984ec7
remove unnecessary method
Nov 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 8 additions & 15 deletions src/compiler/program.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1690,18 +1690,13 @@ namespace ts {
const emitFilePath = toPath(emitFileName, currentDirectory, getCanonicalFileName);
// Report error if the output overwrites input file
if (filesByName.contains(emitFilePath)) {
if (options.noEmitOverwritenFiles && !options.out && !options.outDir && !options.outFile) {
blockEmittingOfFile(emitFileName);
}
else {
let chain: DiagnosticMessageChain;
if (!options.configFilePath) {
// The program is from either an inferred project or an external project
chain = chainDiagnosticMessages(/*details*/ undefined, Diagnostics.Adding_a_tsconfig_json_file_will_help_organize_projects_that_contain_both_TypeScript_and_JavaScript_files_Learn_more_at_https_Colon_Slash_Slashaka_ms_Slashtsconfig);
}
chain = chainDiagnosticMessages(chain, Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file, emitFileName);
blockEmittingOfFile(emitFileName, createCompilerDiagnosticFromMessageChain(chain));
let chain: DiagnosticMessageChain;
if (!options.configFilePath) {
// The program is from either an inferred project or an external project
chain = chainDiagnosticMessages(/*details*/ undefined, Diagnostics.Adding_a_tsconfig_json_file_will_help_organize_projects_that_contain_both_TypeScript_and_JavaScript_files_Learn_more_at_https_Colon_Slash_Slashaka_ms_Slashtsconfig);
}
chain = chainDiagnosticMessages(chain, Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file, emitFileName);
blockEmittingOfFile(emitFileName, createCompilerDiagnosticFromMessageChain(chain));
}

// Report error if multiple files write into same file
Expand All@@ -1716,11 +1711,9 @@ namespace ts {
}
}

function blockEmittingOfFile(emitFileName: string, diag?: Diagnostic) {
function blockEmittingOfFile(emitFileName: string, diag: Diagnostic) {
hasEmitBlockingDiagnostics.set(toPath(emitFileName, currentDirectory, getCanonicalFileName), true);
if (diag) {
programDiagnostics.add(diag);
}
programDiagnostics.add(diag);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/compiler/types.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3060,7 +3060,7 @@ namespace ts {
moduleResolution?: ModuleResolutionKind;
newLine?: NewLineKind;
noEmit?: boolean;
/*@internal*/noEmitOverwritenFiles?: boolean;
/*@internal*/noEmitForJsFiles?: boolean;
noEmitHelpers?: boolean;
noEmitOnError?: boolean;
noErrorTruncation?: boolean;
Expand Down
58 changes: 31 additions & 27 deletions src/compiler/utilities.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -192,7 +192,7 @@ namespace ts {
export function nodePosToString(node: Node): string {
const file = getSourceFileOfNode(node);
const loc = getLineAndCharacterOfPosition(file, node.pos);
return `${file.fileName}(${loc.line + 1},${loc.character + 1})`;
return `${file.fileName}(${loc.line + 1},${loc.character + 1})`;
}

export function getStartPosOfNode(node: Node): number {
Expand DownExpand Up@@ -439,7 +439,7 @@ namespace ts {
}

export function isBlockScope(node: Node, parentNode: Node) {
switch (node.kind) {
switch (node.kind) {
case SyntaxKind.SourceFile:
case SyntaxKind.CaseBlock:
case SyntaxKind.CatchClause:
Expand DownExpand Up@@ -624,9 +624,9 @@ namespace ts {

export function getJsDocCommentsFromText(node: Node, text: string) {
const commentRanges = (node.kind === SyntaxKind.Parameter ||
node.kind === SyntaxKind.TypeParameter ||
node.kind === SyntaxKind.FunctionExpression ||
node.kind === SyntaxKind.ArrowFunction) ?
node.kind === SyntaxKind.TypeParameter ||
node.kind === SyntaxKind.FunctionExpression ||
node.kind === SyntaxKind.ArrowFunction) ?
concatenate(getTrailingCommentRanges(text, node.pos), getLeadingCommentRanges(text, node.pos)) :
getLeadingCommentRangesOfNodeFromText(node, text);
return filter(commentRanges, isJsDocComment);
Expand DownExpand Up@@ -891,7 +891,7 @@ namespace ts {
export function isObjectLiteralOrClassExpressionMethod(node: Node): node is MethodDeclaration {
return node.kind === SyntaxKind.MethodDeclaration &&
(node.parent.kind === SyntaxKind.ObjectLiteralExpression ||
node.parent.kind === SyntaxKind.ClassExpression);
node.parent.kind === SyntaxKind.ClassExpression);
}

export function isIdentifierTypePredicate(predicate: TypePredicate): predicate is IdentifierTypePredicate {
Expand DownExpand Up@@ -1113,8 +1113,8 @@ namespace ts {
// if the parameter's parent has a body and its grandparent is a class declaration, this is a valid target;
return (<FunctionLikeDeclaration>node.parent).body !== undefined
&& (node.parent.kind === SyntaxKind.Constructor
|| node.parent.kind === SyntaxKind.MethodDeclaration
|| node.parent.kind === SyntaxKind.SetAccessor)
|| node.parent.kind === SyntaxKind.MethodDeclaration
|| node.parent.kind === SyntaxKind.SetAccessor)
&& node.parent.parent.kind === SyntaxKind.ClassDeclaration;
}

Expand DownExpand Up@@ -1461,7 +1461,7 @@ namespace ts {
}, tags => tags);
}

function getJSDocs<T>(node: Node, checkParentVariableStatement: boolean, getDocs: (docs: JSDoc[]) => T[], getTags: (tags: JSDocTag[]) => T[]): T[] {
function getJSDocs<T>(node: Node, checkParentVariableStatement: boolean, getDocs: (docs: JSDoc[]) => T[], getTags: (tags: JSDocTag[]) => T[]): T[] {
// TODO: Get rid of getJsDocComments and friends (note the lowercase 's' in Js)
// TODO: A lot of this work should be cached, maybe. I guess it's only used in services right now...
let result: T[] = undefined;
Expand All@@ -1482,8 +1482,8 @@ namespace ts {

const variableStatementNode =
isInitializerOfVariableDeclarationInStatement ? node.parent.parent.parent :
isVariableOfVariableDeclarationStatement ? node.parent.parent :
undefined;
isVariableOfVariableDeclarationStatement ? node.parent.parent :
undefined;
if (variableStatementNode) {
result = append(result, getJSDocs(variableStatementNode, checkParentVariableStatement, getDocs, getTags));
}
Expand DownExpand Up@@ -1648,7 +1648,7 @@ namespace ts {
if ((<ShorthandPropertyAssignment>parent).name !== node) {
return AssignmentKind.None;
}
// Fall through
// Fall through
case SyntaxKind.PropertyAssignment:
node = parent.parent;
break;
Expand DownExpand Up@@ -2550,14 +2550,18 @@ namespace ts {
if (options.outFile || options.out) {
const moduleKind = getEmitModuleKind(options);
const moduleEmitEnabled = moduleKind === ModuleKind.AMD || moduleKind === ModuleKind.System;
const sourceFiles = host.getSourceFiles();
const sourceFiles = getAllEmittableSourceFiles();
// Can emit only sources that are not declaration file and are either non module code or module with --module or --target es6 specified
return filter(sourceFiles, moduleEmitEnabled ? isNonDeclarationFile : isBundleEmitNonExternalModule);
}
else {
const sourceFiles = targetSourceFile === undefined ? host.getSourceFiles() : [targetSourceFile];
const sourceFiles = targetSourceFile === undefined ? getAllEmittableSourceFiles() : [targetSourceFile];
return filter(sourceFiles, isNonDeclarationFile);
}

function getAllEmittableSourceFiles() {
return options.noEmitForJsFiles ? filter(host.getSourceFiles(), sourceFile => !isSourceFileJavaScript(sourceFile)) : host.getSourceFiles();
}
}

function isNonDeclarationFile(sourceFile: SourceFile) {
Expand DownExpand Up@@ -2589,7 +2593,7 @@ namespace ts {
}
else {
for (const sourceFile of sourceFiles) {
// Don't emit if source file is a declaration file, or was located under node_modules
// Don't emit if source file is a declaration file, or was located under node_modules
if (!isDeclarationFile(sourceFile) && !host.isSourceFileFromExternalLibrary(sourceFile)) {
onSingleFileEmit(host, sourceFile);
}
Expand DownExpand Up@@ -2651,7 +2655,7 @@ namespace ts {
onBundledEmit(host);
}
else {
const sourceFiles = targetSourceFile === undefined ? host.getSourceFiles() : [targetSourceFile];
const sourceFiles = targetSourceFile === undefined ? getSourceFilesToEmit(host) : [targetSourceFile];
for (const sourceFile of sourceFiles) {
// Don't emit if source file is a declaration file, or was located under node_modules
if (!isDeclarationFile(sourceFile) && !host.isSourceFileFromExternalLibrary(sourceFile)) {
Expand DownExpand Up@@ -2689,11 +2693,11 @@ namespace ts {
function onBundledEmit(host: EmitHost) {
// Can emit only sources that are not declaration file and are either non module code or module with
// --module or --target es6 specified. Files included by searching under node_modules are also not emitted.
const bundledSources = filter(host.getSourceFiles(),
const bundledSources = filter(getSourceFilesToEmit(host),
sourceFile => !isDeclarationFile(sourceFile) &&
!host.isSourceFileFromExternalLibrary(sourceFile) &&
(!isExternalModule(sourceFile) ||
!!getEmitModuleKind(options)));
!host.isSourceFileFromExternalLibrary(sourceFile) &&
(!isExternalModule(sourceFile) ||
!!getEmitModuleKind(options)));
if (bundledSources.length) {
const jsFilePath = options.outFile || options.out;
const emitFileNames: EmitFileNames = {
Expand DownExpand Up@@ -2879,7 +2883,7 @@ namespace ts {
writeComment: (text: string, lineMap: number[], writer: EmitTextWriter, commentPos: number, commentEnd: number, newLine: string) => void,
node: TextRange, newLine: string, removeComments: boolean) {
let leadingComments: CommentRange[];
let currentDetachedCommentInfo: {nodePos: number, detachedCommentEndPos: number};
let currentDetachedCommentInfo: {nodePos: number, detachedCommentEndPos: number};
if (removeComments) {
// removeComments is true, only reserve pinned comment at the top of file
// For example:
Expand DownExpand Up@@ -3226,10 +3230,10 @@ namespace ts {

function stringifyValue(value: any): string {
return typeof value === "string" ? `"${escapeString(value)}"`
: typeof value === "number" ? isFinite(value) ? String(value) : "null"
: typeof value === "boolean" ? value ? "true" : "false"
: typeof value === "object" && value ? isArray(value) ? cycleCheck(stringifyArray, value) : cycleCheck(stringifyObject, value)
: /*fallback*/ "null";
: typeof value === "number" ? isFinite(value) ? String(value) : "null"
: typeof value === "boolean" ? value ? "true" : "false"
: typeof value === "object" && value ? isArray(value) ? cycleCheck(stringifyArray, value) : cycleCheck(stringifyObject, value)
: /*fallback*/ "null";
}

function cycleCheck(cb: (value: any) => string, value: any) {
Expand All@@ -3254,7 +3258,7 @@ namespace ts {

function stringifyProperty(memo: string, value: any, key: string) {
return value === undefined || typeof value === "function" || key === "__cycle" ? memo
: (memo ? memo + "," : memo) + `"${escapeString(key)}":${stringifyValue(value)}`;
: (memo ? memo + "," : memo) + `"${escapeString(key)}":${stringifyValue(value)}`;
}

const base64Digits = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
Expand DownExpand Up@@ -3499,7 +3503,7 @@ namespace ts {
* @param token The token.
*/
export function createTokenRange(pos: number, token: SyntaxKind): TextRange {
return createRange(pos, pos + tokenToString(token).length);
return createRange(pos, pos + tokenToString(token).length);
}

export function rangeIsOnSingleLine(range: TextRange, sourceFile: SourceFile) {
Expand Down
40 changes: 40 additions & 0 deletions src/harness/unittests/compileOnSave.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -492,5 +492,45 @@ namespace ts.projectSystem {
assert.isTrue(host.fileExists(expectedEmittedFileName));
assert.equal(host.readFile(expectedEmittedFileName), `"use strict";\r\nfunction Foo() { return 10; }\r\nexports.Foo = Foo;\r\n`);
});

it("shoud not emit js files in external projects", () => {
const file1 = {
path: "/a/b/file1.ts",
content: "consonle.log('file1');"
};
// file2 has errors. The emitting should not be blocked.
const file2 = {
path: "/a/b/file2.js",
content: "console.log'file2');"
};
const file3 = {
path: "/a/b/file3.js",
content: "console.log('file3');"
};
const externalProjectName = "externalproject";
const host = createServerHost([file1, file2, file3, libFile]);
const session = createSession(host);
const projectService = session.getProjectService();

projectService.openExternalProject({
rootFiles: toExternalFiles([file1.path, file2.path]),
options: {
allowJs: true,
outFile: "dist.js",
compileOnSave: true
},
projectFileName: externalProjectName
});

const emitRequest = makeSessionRequest<server.protocol.CompileOnSaveEmitFileRequestArgs>(CommandNames.CompileOnSaveEmitFile, { file: file1.path });
session.executeCommand(emitRequest);

const expectedOutFileName = "/a/b/dist.js";
assert.isTrue(host.fileExists(expectedOutFileName));
const outFileContent = host.readFile(expectedOutFileName);
assert.isTrue(outFileContent.indexOf(file1.content) !== -1);
assert.isTrue(outFileContent.indexOf(file2.content) === -1);
assert.isTrue(outFileContent.indexOf(file3.content) === -1);
});
});
}
4 changes: 2 additions & 2 deletions src/server/project.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -161,8 +161,8 @@ namespace ts.server {
this.compilerOptions.allowNonTsExtensions = true;
}

if (this.projectKind === ProjectKind.Inferred) {
this.compilerOptions.noEmitOverwritenFiles = true;
if (this.projectKind === ProjectKind.Inferred || this.projectKind === ProjectKind.External) {
this.compilerOptions.noEmitForJsFiles = true;
}

if (languageServiceEnabled) {
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Exclude js files in non-configured projects compile-on-save emitting#12118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Zhengbo Li (zhengbli)
merged 2 commits into

from

Nov 10, 2016
 Merged


Exclude js files in non-configured projects compile-on-save emitting
#12118
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
658dfe7

Exclude js files in non-configured projects CoS emitting

Nov 9, 2016
c984ec7

remove unnecessary method

Nov 10, 2016

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


23 changes: 8 additions & 15 deletions
src/compiler/program.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1690,18 +1690,13 @@ namespace ts {
 const emitFilePath = toPath(emitFileName, currentDirectory, getCanonicalFileName);
 // Report error if the output overwrites input file
 if (filesByName.contains(emitFilePath)) {
 if (options.noEmitOverwritenFiles && !options.out && !options.outDir && !options.outFile) {
 blockEmittingOfFile(emitFileName);
 }
 else {
 let chain: DiagnosticMessageChain;
 if (!options.configFilePath) {
 // The program is from either an inferred project or an external project
 chain = chainDiagnosticMessages(/*details*/ undefined, Diagnostics.Adding_a_tsconfig_json_file_will_help_organize_projects_that_contain_both_TypeScript_and_JavaScript_files_Learn_more_at_https_Colon_Slash_Slashaka_ms_Slashtsconfig);
 }
 chain = chainDiagnosticMessages(chain, Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file, emitFileName);
 blockEmittingOfFile(emitFileName, createCompilerDiagnosticFromMessageChain(chain));
 let chain: DiagnosticMessageChain;
 if (!options.configFilePath) {
 // The program is from either an inferred project or an external project
 chain = chainDiagnosticMessages(/*details*/ undefined, Diagnostics.Adding_a_tsconfig_json_file_will_help_organize_projects_that_contain_both_TypeScript_and_JavaScript_files_Learn_more_at_https_Colon_Slash_Slashaka_ms_Slashtsconfig);
 }
 chain = chainDiagnosticMessages(chain, Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file, emitFileName);
 blockEmittingOfFile(emitFileName, createCompilerDiagnosticFromMessageChain(chain));
 }

 // Report error if multiple files write into same file
Expand All@@ -1716,11 +1711,9 @@ namespace ts {
 }
 }

 function blockEmittingOfFile(emitFileName: string, diag?: Diagnostic) {
 function blockEmittingOfFile(emitFileName: string, diag: Diagnostic) {
 hasEmitBlockingDiagnostics.set(toPath(emitFileName, currentDirectory, getCanonicalFileName), true);
 if (diag) {
 programDiagnostics.add(diag);
 }
 programDiagnostics.add(diag);
 }
 }

Expand Down

2 changes: 1 addition & 1 deletion
src/compiler/types.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3060,7 +3060,7 @@ namespace ts {
 moduleResolution?: ModuleResolutionKind;
 newLine?: NewLineKind;
 noEmit?: boolean;
 /*@internal*/noEmitOverwritenFiles?: boolean;
 /*@internal*/noEmitForJsFiles?: boolean;
 noEmitHelpers?: boolean;
 noEmitOnError?: boolean;
 noErrorTruncation?: boolean;
Expand Down

58 changes: 31 additions & 27 deletions
src/compiler/utilities.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -192,7 +192,7 @@ namespace ts {
 export function nodePosToString(node: Node): string {
 const file = getSourceFileOfNode(node);
 const loc = getLineAndCharacterOfPosition(file, node.pos);
 return `${file.fileName}(${loc.line + 1},${loc.character + 1})`;
 return `${file.fileName}(${loc.line + 1},${loc.character + 1})`;
 }

 export function getStartPosOfNode(node: Node): number {
Expand DownExpand Up@@ -439,7 +439,7 @@ namespace ts {
 }

 export function isBlockScope(node: Node, parentNode: Node) {
 switch (node.kind) {
 switch (node.kind) {
 case SyntaxKind.SourceFile:
 case SyntaxKind.CaseBlock:
 case SyntaxKind.CatchClause:
Expand DownExpand Up@@ -624,9 +624,9 @@ namespace ts {

 export function getJsDocCommentsFromText(node: Node, text: string) {
 const commentRanges = (node.kind === SyntaxKind.Parameter ||
node.kind === SyntaxKind.TypeParameter ||
node.kind === SyntaxKind.FunctionExpression ||
node.kind === SyntaxKind.ArrowFunction) ?
 node.kind === SyntaxKind.TypeParameter ||
 node.kind === SyntaxKind.FunctionExpression ||
 node.kind === SyntaxKind.ArrowFunction) ?
 concatenate(getTrailingCommentRanges(text, node.pos), getLeadingCommentRanges(text, node.pos)) :
 getLeadingCommentRangesOfNodeFromText(node, text);
 return filter(commentRanges, isJsDocComment);
Expand DownExpand Up@@ -891,7 +891,7 @@ namespace ts {
 export function isObjectLiteralOrClassExpressionMethod(node: Node): node is MethodDeclaration {
 return node.kind === SyntaxKind.MethodDeclaration &&
 (node.parent.kind === SyntaxKind.ObjectLiteralExpression ||
 node.parent.kind === SyntaxKind.ClassExpression);
node.parent.kind === SyntaxKind.ClassExpression);
 }

 export function isIdentifierTypePredicate(predicate: TypePredicate): predicate is IdentifierTypePredicate {
Expand DownExpand Up@@ -1113,8 +1113,8 @@ namespace ts {
 // if the parameter's parent has a body and its grandparent is a class declaration, this is a valid target;
 return (<FunctionLikeDeclaration>node.parent).body !== undefined
 && (node.parent.kind === SyntaxKind.Constructor
 || node.parent.kind === SyntaxKind.MethodDeclaration
 || node.parent.kind === SyntaxKind.SetAccessor)
|| node.parent.kind === SyntaxKind.MethodDeclaration
|| node.parent.kind === SyntaxKind.SetAccessor)
 && node.parent.parent.kind === SyntaxKind.ClassDeclaration;
 }

Expand DownExpand Up@@ -1461,7 +1461,7 @@ namespace ts {
 }, tags => tags);
 }

 function getJSDocs<T>(node: Node, checkParentVariableStatement: boolean, getDocs: (docs: JSDoc[]) => T[], getTags: (tags: JSDocTag[]) => T[]): T[] {
function getJSDocs<T>(node: Node, checkParentVariableStatement: boolean, getDocs: (docs: JSDoc[]) => T[], getTags: (tags: JSDocTag[]) => T[]): T[] {
 // TODO: Get rid of getJsDocComments and friends (note the lowercase 's' in Js)
 // TODO: A lot of this work should be cached, maybe. I guess it's only used in services right now...
 let result: T[] = undefined;
Expand All@@ -1482,8 +1482,8 @@ namespace ts {

 const variableStatementNode =
 isInitializerOfVariableDeclarationInStatement ? node.parent.parent.parent :
 isVariableOfVariableDeclarationStatement ? node.parent.parent :
 undefined;
isVariableOfVariableDeclarationStatement ? node.parent.parent :
undefined;
 if (variableStatementNode) {
 result = append(result, getJSDocs(variableStatementNode, checkParentVariableStatement, getDocs, getTags));
 }
Expand DownExpand Up@@ -1648,7 +1648,7 @@ namespace ts {
 if ((<ShorthandPropertyAssignment>parent).name !== node) {
 return AssignmentKind.None;
 }
// Fall through
 // Fall through
 case SyntaxKind.PropertyAssignment:
 node = parent.parent;
 break;
Expand DownExpand Up@@ -2550,14 +2550,18 @@ namespace ts {
 if (options.outFile || options.out) {
 const moduleKind = getEmitModuleKind(options);
 const moduleEmitEnabled = moduleKind === ModuleKind.AMD || moduleKind === ModuleKind.System;
 const sourceFiles = host.getSourceFiles();
 const sourceFiles = getAllEmittableSourceFiles();
 // Can emit only sources that are not declaration file and are either non module code or module with --module or --target es6 specified
 return filter(sourceFiles, moduleEmitEnabled ? isNonDeclarationFile : isBundleEmitNonExternalModule);
 }
 else {
 const sourceFiles = targetSourceFile === undefined ? host.getSourceFiles() : [targetSourceFile];
 const sourceFiles = targetSourceFile === undefined ? getAllEmittableSourceFiles() : [targetSourceFile];
 return filter(sourceFiles, isNonDeclarationFile);
 }

 function getAllEmittableSourceFiles() {
 return options.noEmitForJsFiles ? filter(host.getSourceFiles(), sourceFile => !isSourceFileJavaScript(sourceFile)) : host.getSourceFiles();
 }
 }

 function isNonDeclarationFile(sourceFile: SourceFile) {
Expand DownExpand Up@@ -2589,7 +2593,7 @@ namespace ts {
 }
 else {
 for (const sourceFile of sourceFiles) {
// Don't emit if source file is a declaration file, or was located under node_modules
 // Don't emit if source file is a declaration file, or was located under node_modules
 if (!isDeclarationFile(sourceFile) && !host.isSourceFileFromExternalLibrary(sourceFile)) {
 onSingleFileEmit(host, sourceFile);
 }
Expand DownExpand Up@@ -2651,7 +2655,7 @@ namespace ts {
 onBundledEmit(host);
 }
 else {
 const sourceFiles = targetSourceFile === undefined ? host.getSourceFiles() : [targetSourceFile];
 const sourceFiles = targetSourceFile === undefined ? getSourceFilesToEmit(host) : [targetSourceFile];
 for (const sourceFile of sourceFiles) {
 // Don't emit if source file is a declaration file, or was located under node_modules
 if (!isDeclarationFile(sourceFile) && !host.isSourceFileFromExternalLibrary(sourceFile)) {
Expand DownExpand Up@@ -2689,11 +2693,11 @@ namespace ts {
 function onBundledEmit(host: EmitHost) {
 // Can emit only sources that are not declaration file and are either non module code or module with
 // --module or --target es6 specified. Files included by searching under node_modules are also not emitted.
 const bundledSources = filter(host.getSourceFiles(),
 const bundledSources = filter(getSourceFilesToEmit(host),
 sourceFile => !isDeclarationFile(sourceFile) &&
!host.isSourceFileFromExternalLibrary(sourceFile) &&
(!isExternalModule(sourceFile) ||
!!getEmitModuleKind(options)));
 !host.isSourceFileFromExternalLibrary(sourceFile) &&
 (!isExternalModule(sourceFile) ||
 !!getEmitModuleKind(options)));
 if (bundledSources.length) {
 const jsFilePath = options.outFile || options.out;
 const emitFileNames: EmitFileNames = {
Expand DownExpand Up@@ -2879,7 +2883,7 @@ namespace ts {
 writeComment: (text: string, lineMap: number[], writer: EmitTextWriter, commentPos: number, commentEnd: number, newLine: string) => void,
 node: TextRange, newLine: string, removeComments: boolean) {
 let leadingComments: CommentRange[];
 let currentDetachedCommentInfo: {nodePos: number, detachedCommentEndPos: number};
 let currentDetachedCommentInfo: {nodePos: number, detachedCommentEndPos: number};
 if (removeComments) {
 // removeComments is true, only reserve pinned comment at the top of file
 // For example:
Expand DownExpand Up@@ -3226,10 +3230,10 @@ namespace ts {

 function stringifyValue(value: any): string {
 return typeof value === "string" ? `"${escapeString(value)}"`
: typeof value === "number" ? isFinite(value) ? String(value) : "null"
 : typeof value === "boolean" ? value ? "true" : "false"
 : typeof value === "object" && value ? isArray(value) ? cycleCheck(stringifyArray, value) : cycleCheck(stringifyObject, value)
 : /*fallback*/ "null";
 : typeof value === "number" ? isFinite(value) ? String(value) : "null"
: typeof value === "boolean" ? value ? "true" : "false"
: typeof value === "object" && value ? isArray(value) ? cycleCheck(stringifyArray, value) : cycleCheck(stringifyObject, value)
: /*fallback*/ "null";
 }

 function cycleCheck(cb: (value: any) => string, value: any) {
Expand All@@ -3254,7 +3258,7 @@ namespace ts {

 function stringifyProperty(memo: string, value: any, key: string) {
 return value === undefined || typeof value === "function" || key === "__cycle" ? memo
: (memo ? memo + "," : memo) + `"${escapeString(key)}":${stringifyValue(value)}`;
 : (memo ? memo + "," : memo) + `"${escapeString(key)}":${stringifyValue(value)}`;
 }

 const base64Digits = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
Expand DownExpand Up@@ -3499,7 +3503,7 @@ namespace ts {
 * @param token The token.
 */
 export function createTokenRange(pos: number, token: SyntaxKind): TextRange {
 return createRange(pos, pos + tokenToString(token).length);
 return createRange(pos, pos + tokenToString(token).length);
 }

 export function rangeIsOnSingleLine(range: TextRange, sourceFile: SourceFile) {
Expand Down

40 changes: 40 additions & 0 deletions
src/harness/unittests/compileOnSave.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -492,5 +492,45 @@ namespace ts.projectSystem {
 assert.isTrue(host.fileExists(expectedEmittedFileName));
 assert.equal(host.readFile(expectedEmittedFileName), `"use strict";\r\nfunction Foo() { return 10; }\r\nexports.Foo = Foo;\r\n`);
 });

 it("shoud not emit js files in external projects", () => {
 const file1 = {
 path: "/a/b/file1.ts",
 content: "consonle.log('file1');"
 };
 // file2 has errors. The emitting should not be blocked.
 const file2 = {
 path: "/a/b/file2.js",
 content: "console.log'file2');"
 };
 const file3 = {
 path: "/a/b/file3.js",
 content: "console.log('file3');"
 };
 const externalProjectName = "externalproject";
 const host = createServerHost([file1, file2, file3, libFile]);
 const session = createSession(host);
 const projectService = session.getProjectService();

 projectService.openExternalProject({
 rootFiles: toExternalFiles([file1.path, file2.path]),
 options: {
 allowJs: true,
 outFile: "dist.js",
 compileOnSave: true
 },
 projectFileName: externalProjectName
 });

 const emitRequest = makeSessionRequest<server.protocol.CompileOnSaveEmitFileRequestArgs>(CommandNames.CompileOnSaveEmitFile, { file: file1.path });
 session.executeCommand(emitRequest);

 const expectedOutFileName = "/a/b/dist.js";
 assert.isTrue(host.fileExists(expectedOutFileName));
 const outFileContent = host.readFile(expectedOutFileName);
 assert.isTrue(outFileContent.indexOf(file1.content) !== -1);
 assert.isTrue(outFileContent.indexOf(file2.content) === -1);
 assert.isTrue(outFileContent.indexOf(file3.content) === -1);
 });
 });
}

4 changes: 2 additions & 2 deletions
src/server/project.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -161,8 +161,8 @@ namespace ts.server {
 this.compilerOptions.allowNonTsExtensions = true;
 }

 if (this.projectKind === ProjectKind.Inferred) {
 this.compilerOptions.noEmitOverwritenFiles = true;
 if (this.projectKind === ProjectKind.Inferred || this.projectKind === ProjectKind.External) {
 this.compilerOptions.noEmitForJsFiles = true;
 }

 if (languageServiceEnabled) {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Exclude js files in non-configured projects compile-on-save emitting#12118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Zhengbo Li (zhengbli)
merged 2 commits into

from

Nov 10, 2016
 Merged


Exclude js files in non-configured projects compile-on-save emitting
#12118
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
658dfe7

Exclude js files in non-configured projects CoS emitting

Nov 9, 2016
c984ec7

remove unnecessary method

Nov 10, 2016

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


23 changes: 8 additions & 15 deletions
src/compiler/program.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1690,18 +1690,13 @@ namespace ts {
 const emitFilePath = toPath(emitFileName, currentDirectory, getCanonicalFileName);
 // Report error if the output overwrites input file
 if (filesByName.contains(emitFilePath)) {
 if (options.noEmitOverwritenFiles && !options.out && !options.outDir && !options.outFile) {
 blockEmittingOfFile(emitFileName);
 }
 else {
 let chain: DiagnosticMessageChain;
 if (!options.configFilePath) {
 // The program is from either an inferred project or an external project
 chain = chainDiagnosticMessages(/*details*/ undefined, Diagnostics.Adding_a_tsconfig_json_file_will_help_organize_projects_that_contain_both_TypeScript_and_JavaScript_files_Learn_more_at_https_Colon_Slash_Slashaka_ms_Slashtsconfig);
 }
 chain = chainDiagnosticMessages(chain, Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file, emitFileName);
 blockEmittingOfFile(emitFileName, createCompilerDiagnosticFromMessageChain(chain));
 let chain: DiagnosticMessageChain;
 if (!options.configFilePath) {
 // The program is from either an inferred project or an external project
 chain = chainDiagnosticMessages(/*details*/ undefined, Diagnostics.Adding_a_tsconfig_json_file_will_help_organize_projects_that_contain_both_TypeScript_and_JavaScript_files_Learn_more_at_https_Colon_Slash_Slashaka_ms_Slashtsconfig);
 }
 chain = chainDiagnosticMessages(chain, Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file, emitFileName);
 blockEmittingOfFile(emitFileName, createCompilerDiagnosticFromMessageChain(chain));
 }

 // Report error if multiple files write into same file
Expand All@@ -1716,11 +1711,9 @@ namespace ts {
 }
 }

 function blockEmittingOfFile(emitFileName: string, diag?: Diagnostic) {
 function blockEmittingOfFile(emitFileName: string, diag: Diagnostic) {
 hasEmitBlockingDiagnostics.set(toPath(emitFileName, currentDirectory, getCanonicalFileName), true);
 if (diag) {
 programDiagnostics.add(diag);
 }
 programDiagnostics.add(diag);
 }
 }

Expand Down

2 changes: 1 addition & 1 deletion
src/compiler/types.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3060,7 +3060,7 @@ namespace ts {
 moduleResolution?: ModuleResolutionKind;
 newLine?: NewLineKind;
 noEmit?: boolean;
 /*@internal*/noEmitOverwritenFiles?: boolean;
 /*@internal*/noEmitForJsFiles?: boolean;
 noEmitHelpers?: boolean;
 noEmitOnError?: boolean;
 noErrorTruncation?: boolean;
Expand Down

58 changes: 31 additions & 27 deletions
src/compiler/utilities.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -192,7 +192,7 @@ namespace ts {
 export function nodePosToString(node: Node): string {
 const file = getSourceFileOfNode(node);
 const loc = getLineAndCharacterOfPosition(file, node.pos);
 return `${file.fileName}(${loc.line + 1},${loc.character + 1})`;
 return `${file.fileName}(${loc.line + 1},${loc.character + 1})`;
 }

 export function getStartPosOfNode(node: Node): number {
Expand DownExpand Up@@ -439,7 +439,7 @@ namespace ts {
 }

 export function isBlockScope(node: Node, parentNode: Node) {
 switch (node.kind) {
 switch (node.kind) {
 case SyntaxKind.SourceFile:
 case SyntaxKind.CaseBlock:
 case SyntaxKind.CatchClause:
Expand DownExpand Up@@ -624,9 +624,9 @@ namespace ts {

 export function getJsDocCommentsFromText(node: Node, text: string) {
 const commentRanges = (node.kind === SyntaxKind.Parameter ||
node.kind === SyntaxKind.TypeParameter ||
node.kind === SyntaxKind.FunctionExpression ||
node.kind === SyntaxKind.ArrowFunction) ?
 node.kind === SyntaxKind.TypeParameter ||
 node.kind === SyntaxKind.FunctionExpression ||
 node.kind === SyntaxKind.ArrowFunction) ?
 concatenate(getTrailingCommentRanges(text, node.pos), getLeadingCommentRanges(text, node.pos)) :
 getLeadingCommentRangesOfNodeFromText(node, text);
 return filter(commentRanges, isJsDocComment);
Expand DownExpand Up@@ -891,7 +891,7 @@ namespace ts {
 export function isObjectLiteralOrClassExpressionMethod(node: Node): node is MethodDeclaration {
 return node.kind === SyntaxKind.MethodDeclaration &&
 (node.parent.kind === SyntaxKind.ObjectLiteralExpression ||
 node.parent.kind === SyntaxKind.ClassExpression);
node.parent.kind === SyntaxKind.ClassExpression);
 }

 export function isIdentifierTypePredicate(predicate: TypePredicate): predicate is IdentifierTypePredicate {
Expand DownExpand Up@@ -1113,8 +1113,8 @@ namespace ts {
 // if the parameter's parent has a body and its grandparent is a class declaration, this is a valid target;
 return (<FunctionLikeDeclaration>node.parent).body !== undefined
 && (node.parent.kind === SyntaxKind.Constructor
 || node.parent.kind === SyntaxKind.MethodDeclaration
 || node.parent.kind === SyntaxKind.SetAccessor)
|| node.parent.kind === SyntaxKind.MethodDeclaration
|| node.parent.kind === SyntaxKind.SetAccessor)
 && node.parent.parent.kind === SyntaxKind.ClassDeclaration;
 }

Expand DownExpand Up@@ -1461,7 +1461,7 @@ namespace ts {
 }, tags => tags);
 }

 function getJSDocs<T>(node: Node, checkParentVariableStatement: boolean, getDocs: (docs: JSDoc[]) => T[], getTags: (tags: JSDocTag[]) => T[]): T[] {
function getJSDocs<T>(node: Node, checkParentVariableStatement: boolean, getDocs: (docs: JSDoc[]) => T[], getTags: (tags: JSDocTag[]) => T[]): T[] {
 // TODO: Get rid of getJsDocComments and friends (note the lowercase 's' in Js)
 // TODO: A lot of this work should be cached, maybe. I guess it's only used in services right now...
 let result: T[] = undefined;
Expand All@@ -1482,8 +1482,8 @@ namespace ts {

 const variableStatementNode =
 isInitializerOfVariableDeclarationInStatement ? node.parent.parent.parent :
 isVariableOfVariableDeclarationStatement ? node.parent.parent :
 undefined;
isVariableOfVariableDeclarationStatement ? node.parent.parent :
undefined;
 if (variableStatementNode) {
 result = append(result, getJSDocs(variableStatementNode, checkParentVariableStatement, getDocs, getTags));
 }
Expand DownExpand Up@@ -1648,7 +1648,7 @@ namespace ts {
 if ((<ShorthandPropertyAssignment>parent).name !== node) {
 return AssignmentKind.None;
 }
// Fall through
 // Fall through
 case SyntaxKind.PropertyAssignment:
 node = parent.parent;
 break;
Expand DownExpand Up@@ -2550,14 +2550,18 @@ namespace ts {
 if (options.outFile || options.out) {
 const moduleKind = getEmitModuleKind(options);
 const moduleEmitEnabled = moduleKind === ModuleKind.AMD || moduleKind === ModuleKind.System;
 const sourceFiles = host.getSourceFiles();
 const sourceFiles = getAllEmittableSourceFiles();
 // Can emit only sources that are not declaration file and are either non module code or module with --module or --target es6 specified
 return filter(sourceFiles, moduleEmitEnabled ? isNonDeclarationFile : isBundleEmitNonExternalModule);
 }
 else {
 const sourceFiles = targetSourceFile === undefined ? host.getSourceFiles() : [targetSourceFile];
 const sourceFiles = targetSourceFile === undefined ? getAllEmittableSourceFiles() : [targetSourceFile];
 return filter(sourceFiles, isNonDeclarationFile);
 }

 function getAllEmittableSourceFiles() {
 return options.noEmitForJsFiles ? filter(host.getSourceFiles(), sourceFile => !isSourceFileJavaScript(sourceFile)) : host.getSourceFiles();
 }
 }

 function isNonDeclarationFile(sourceFile: SourceFile) {
Expand DownExpand Up@@ -2589,7 +2593,7 @@ namespace ts {
 }
 else {
 for (const sourceFile of sourceFiles) {
// Don't emit if source file is a declaration file, or was located under node_modules
 // Don't emit if source file is a declaration file, or was located under node_modules
 if (!isDeclarationFile(sourceFile) && !host.isSourceFileFromExternalLibrary(sourceFile)) {
 onSingleFileEmit(host, sourceFile);
 }
Expand DownExpand Up@@ -2651,7 +2655,7 @@ namespace ts {
 onBundledEmit(host);
 }
 else {
 const sourceFiles = targetSourceFile === undefined ? host.getSourceFiles() : [targetSourceFile];
 const sourceFiles = targetSourceFile === undefined ? getSourceFilesToEmit(host) : [targetSourceFile];
 for (const sourceFile of sourceFiles) {
 // Don't emit if source file is a declaration file, or was located under node_modules
 if (!isDeclarationFile(sourceFile) && !host.isSourceFileFromExternalLibrary(sourceFile)) {
Expand DownExpand Up@@ -2689,11 +2693,11 @@ namespace ts {
 function onBundledEmit(host: EmitHost) {
 // Can emit only sources that are not declaration file and are either non module code or module with
 // --module or --target es6 specified. Files included by searching under node_modules are also not emitted.
 const bundledSources = filter(host.getSourceFiles(),
 const bundledSources = filter(getSourceFilesToEmit(host),
 sourceFile => !isDeclarationFile(sourceFile) &&
!host.isSourceFileFromExternalLibrary(sourceFile) &&
(!isExternalModule(sourceFile) ||
!!getEmitModuleKind(options)));
 !host.isSourceFileFromExternalLibrary(sourceFile) &&
 (!isExternalModule(sourceFile) ||
 !!getEmitModuleKind(options)));
 if (bundledSources.length) {
 const jsFilePath = options.outFile || options.out;
 const emitFileNames: EmitFileNames = {
Expand DownExpand Up@@ -2879,7 +2883,7 @@ namespace ts {
 writeComment: (text: string, lineMap: number[], writer: EmitTextWriter, commentPos: number, commentEnd: number, newLine: string) => void,
 node: TextRange, newLine: string, removeComments: boolean) {
 let leadingComments: CommentRange[];
 let currentDetachedCommentInfo: {nodePos: number, detachedCommentEndPos: number};
 let currentDetachedCommentInfo: {nodePos: number, detachedCommentEndPos: number};
 if (removeComments) {
 // removeComments is true, only reserve pinned comment at the top of file
 // For example:
Expand DownExpand Up@@ -3226,10 +3230,10 @@ namespace ts {

 function stringifyValue(value: any): string {
 return typeof value === "string" ? `"${escapeString(value)}"`
: typeof value === "number" ? isFinite(value) ? String(value) : "null"
 : typeof value === "boolean" ? value ? "true" : "false"
 : typeof value === "object" && value ? isArray(value) ? cycleCheck(stringifyArray, value) : cycleCheck(stringifyObject, value)
 : /*fallback*/ "null";
 : typeof value === "number" ? isFinite(value) ? String(value) : "null"
: typeof value === "boolean" ? value ? "true" : "false"
: typeof value === "object" && value ? isArray(value) ? cycleCheck(stringifyArray, value) : cycleCheck(stringifyObject, value)
: /*fallback*/ "null";
 }

 function cycleCheck(cb: (value: any) => string, value: any) {
Expand All@@ -3254,7 +3258,7 @@ namespace ts {

 function stringifyProperty(memo: string, value: any, key: string) {
 return value === undefined || typeof value === "function" || key === "__cycle" ? memo
: (memo ? memo + "," : memo) + `"${escapeString(key)}":${stringifyValue(value)}`;
 : (memo ? memo + "," : memo) + `"${escapeString(key)}":${stringifyValue(value)}`;
 }

 const base64Digits = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
Expand DownExpand Up@@ -3499,7 +3503,7 @@ namespace ts {
 * @param token The token.
 */
 export function createTokenRange(pos: number, token: SyntaxKind): TextRange {
 return createRange(pos, pos + tokenToString(token).length);
 return createRange(pos, pos + tokenToString(token).length);
 }

 export function rangeIsOnSingleLine(range: TextRange, sourceFile: SourceFile) {
Expand Down

40 changes: 40 additions & 0 deletions
src/harness/unittests/compileOnSave.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -492,5 +492,45 @@ namespace ts.projectSystem {
 assert.isTrue(host.fileExists(expectedEmittedFileName));
 assert.equal(host.readFile(expectedEmittedFileName), `"use strict";\r\nfunction Foo() { return 10; }\r\nexports.Foo = Foo;\r\n`);
 });

 it("shoud not emit js files in external projects", () => {
 const file1 = {
 path: "/a/b/file1.ts",
 content: "consonle.log('file1');"
 };
 // file2 has errors. The emitting should not be blocked.
 const file2 = {
 path: "/a/b/file2.js",
 content: "console.log'file2');"
 };
 const file3 = {
 path: "/a/b/file3.js",
 content: "console.log('file3');"
 };
 const externalProjectName = "externalproject";
 const host = createServerHost([file1, file2, file3, libFile]);
 const session = createSession(host);
 const projectService = session.getProjectService();

 projectService.openExternalProject({
 rootFiles: toExternalFiles([file1.path, file2.path]),
 options: {
 allowJs: true,
 outFile: "dist.js",
 compileOnSave: true
 },
 projectFileName: externalProjectName
 });

 const emitRequest = makeSessionRequest<server.protocol.CompileOnSaveEmitFileRequestArgs>(CommandNames.CompileOnSaveEmitFile, { file: file1.path });
 session.executeCommand(emitRequest);

 const expectedOutFileName = "/a/b/dist.js";
 assert.isTrue(host.fileExists(expectedOutFileName));
 const outFileContent = host.readFile(expectedOutFileName);
 assert.isTrue(outFileContent.indexOf(file1.content) !== -1);
 assert.isTrue(outFileContent.indexOf(file2.content) === -1);
 assert.isTrue(outFileContent.indexOf(file3.content) === -1);
 });
 });
}

4 changes: 2 additions & 2 deletions
src/server/project.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -161,8 +161,8 @@ namespace ts.server {
 this.compilerOptions.allowNonTsExtensions = true;
 }

 if (this.projectKind === ProjectKind.Inferred) {
 this.compilerOptions.noEmitOverwritenFiles = true;
 if (this.projectKind === ProjectKind.Inferred || this.projectKind === ProjectKind.External) {
 this.compilerOptions.noEmitForJsFiles = true;
 }

 if (languageServiceEnabled) {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Exclude js files in non-configured projects compile-on-save emitting#12118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Zhengbo Li (zhengbli)
merged 2 commits into

from

Nov 10, 2016
 Merged


Exclude js files in non-configured projects compile-on-save emitting
#12118
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
658dfe7

Exclude js files in non-configured projects CoS emitting

Nov 9, 2016
c984ec7

remove unnecessary method

Nov 10, 2016

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


23 changes: 8 additions & 15 deletions
src/compiler/program.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1690,18 +1690,13 @@ namespace ts {
 const emitFilePath = toPath(emitFileName, currentDirectory, getCanonicalFileName);
 // Report error if the output overwrites input file
 if (filesByName.contains(emitFilePath)) {
 if (options.noEmitOverwritenFiles && !options.out && !options.outDir && !options.outFile) {
 blockEmittingOfFile(emitFileName);
 }
 else {
 let chain: DiagnosticMessageChain;
 if (!options.configFilePath) {
 // The program is from either an inferred project or an external project
 chain = chainDiagnosticMessages(/*details*/ undefined, Diagnostics.Adding_a_tsconfig_json_file_will_help_organize_projects_that_contain_both_TypeScript_and_JavaScript_files_Learn_more_at_https_Colon_Slash_Slashaka_ms_Slashtsconfig);
 }
 chain = chainDiagnosticMessages(chain, Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file, emitFileName);
 blockEmittingOfFile(emitFileName, createCompilerDiagnosticFromMessageChain(chain));
 let chain: DiagnosticMessageChain;
 if (!options.configFilePath) {
 // The program is from either an inferred project or an external project
 chain = chainDiagnosticMessages(/*details*/ undefined, Diagnostics.Adding_a_tsconfig_json_file_will_help_organize_projects_that_contain_both_TypeScript_and_JavaScript_files_Learn_more_at_https_Colon_Slash_Slashaka_ms_Slashtsconfig);
 }
 chain = chainDiagnosticMessages(chain, Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file, emitFileName);
 blockEmittingOfFile(emitFileName, createCompilerDiagnosticFromMessageChain(chain));
 }

 // Report error if multiple files write into same file
Expand All@@ -1716,11 +1711,9 @@ namespace ts {
 }
 }

 function blockEmittingOfFile(emitFileName: string, diag?: Diagnostic) {
 function blockEmittingOfFile(emitFileName: string, diag: Diagnostic) {
 hasEmitBlockingDiagnostics.set(toPath(emitFileName, currentDirectory, getCanonicalFileName), true);
 if (diag) {
 programDiagnostics.add(diag);
 }
 programDiagnostics.add(diag);
 }
 }

Expand Down

2 changes: 1 addition & 1 deletion
src/compiler/types.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3060,7 +3060,7 @@ namespace ts {
 moduleResolution?: ModuleResolutionKind;
 newLine?: NewLineKind;
 noEmit?: boolean;
 /*@internal*/noEmitOverwritenFiles?: boolean;
 /*@internal*/noEmitForJsFiles?: boolean;
 noEmitHelpers?: boolean;
 noEmitOnError?: boolean;
 noErrorTruncation?: boolean;
Expand Down

58 changes: 31 additions & 27 deletions
src/compiler/utilities.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -192,7 +192,7 @@ namespace ts {
 export function nodePosToString(node: Node): string {
 const file = getSourceFileOfNode(node);
 const loc = getLineAndCharacterOfPosition(file, node.pos);
 return `${file.fileName}(${loc.line + 1},${loc.character + 1})`;
 return `${file.fileName}(${loc.line + 1},${loc.character + 1})`;
 }

 export function getStartPosOfNode(node: Node): number {
Expand DownExpand Up@@ -439,7 +439,7 @@ namespace ts {
 }

 export function isBlockScope(node: Node, parentNode: Node) {
 switch (node.kind) {
 switch (node.kind) {
 case SyntaxKind.SourceFile:
 case SyntaxKind.CaseBlock:
 case SyntaxKind.CatchClause:
Expand DownExpand Up@@ -624,9 +624,9 @@ namespace ts {

 export function getJsDocCommentsFromText(node: Node, text: string) {
 const commentRanges = (node.kind === SyntaxKind.Parameter ||
node.kind === SyntaxKind.TypeParameter ||
node.kind === SyntaxKind.FunctionExpression ||
node.kind === SyntaxKind.ArrowFunction) ?
 node.kind === SyntaxKind.TypeParameter ||
 node.kind === SyntaxKind.FunctionExpression ||
 node.kind === SyntaxKind.ArrowFunction) ?
 concatenate(getTrailingCommentRanges(text, node.pos), getLeadingCommentRanges(text, node.pos)) :
 getLeadingCommentRangesOfNodeFromText(node, text);
 return filter(commentRanges, isJsDocComment);
Expand DownExpand Up@@ -891,7 +891,7 @@ namespace ts {
 export function isObjectLiteralOrClassExpressionMethod(node: Node): node is MethodDeclaration {
 return node.kind === SyntaxKind.MethodDeclaration &&
 (node.parent.kind === SyntaxKind.ObjectLiteralExpression ||
 node.parent.kind === SyntaxKind.ClassExpression);
node.parent.kind === SyntaxKind.ClassExpression);
 }

 export function isIdentifierTypePredicate(predicate: TypePredicate): predicate is IdentifierTypePredicate {
Expand DownExpand Up@@ -1113,8 +1113,8 @@ namespace ts {
 // if the parameter's parent has a body and its grandparent is a class declaration, this is a valid target;
 return (<FunctionLikeDeclaration>node.parent).body !== undefined
 && (node.parent.kind === SyntaxKind.Constructor
 || node.parent.kind === SyntaxKind.MethodDeclaration
 || node.parent.kind === SyntaxKind.SetAccessor)
|| node.parent.kind === SyntaxKind.MethodDeclaration
|| node.parent.kind === SyntaxKind.SetAccessor)
 && node.parent.parent.kind === SyntaxKind.ClassDeclaration;
 }

Expand DownExpand Up@@ -1461,7 +1461,7 @@ namespace ts {
 }, tags => tags);
 }

 function getJSDocs<T>(node: Node, checkParentVariableStatement: boolean, getDocs: (docs: JSDoc[]) => T[], getTags: (tags: JSDocTag[]) => T[]): T[] {
function getJSDocs<T>(node: Node, checkParentVariableStatement: boolean, getDocs: (docs: JSDoc[]) => T[], getTags: (tags: JSDocTag[]) => T[]): T[] {
 // TODO: Get rid of getJsDocComments and friends (note the lowercase 's' in Js)
 // TODO: A lot of this work should be cached, maybe. I guess it's only used in services right now...
 let result: T[] = undefined;
Expand All@@ -1482,8 +1482,8 @@ namespace ts {

 const variableStatementNode =
 isInitializerOfVariableDeclarationInStatement ? node.parent.parent.parent :
 isVariableOfVariableDeclarationStatement ? node.parent.parent :
 undefined;
isVariableOfVariableDeclarationStatement ? node.parent.parent :
undefined;
 if (variableStatementNode) {
 result = append(result, getJSDocs(variableStatementNode, checkParentVariableStatement, getDocs, getTags));
 }
Expand DownExpand Up@@ -1648,7 +1648,7 @@ namespace ts {
 if ((<ShorthandPropertyAssignment>parent).name !== node) {
 return AssignmentKind.None;
 }
// Fall through
 // Fall through
 case SyntaxKind.PropertyAssignment:
 node = parent.parent;
 break;
Expand DownExpand Up@@ -2550,14 +2550,18 @@ namespace ts {
 if (options.outFile || options.out) {
 const moduleKind = getEmitModuleKind(options);
 const moduleEmitEnabled = moduleKind === ModuleKind.AMD || moduleKind === ModuleKind.System;
 const sourceFiles = host.getSourceFiles();
 const sourceFiles = getAllEmittableSourceFiles();
 // Can emit only sources that are not declaration file and are either non module code or module with --module or --target es6 specified
 return filter(sourceFiles, moduleEmitEnabled ? isNonDeclarationFile : isBundleEmitNonExternalModule);
 }
 else {
 const sourceFiles = targetSourceFile === undefined ? host.getSourceFiles() : [targetSourceFile];
 const sourceFiles = targetSourceFile === undefined ? getAllEmittableSourceFiles() : [targetSourceFile];
 return filter(sourceFiles, isNonDeclarationFile);
 }

 function getAllEmittableSourceFiles() {
 return options.noEmitForJsFiles ? filter(host.getSourceFiles(), sourceFile => !isSourceFileJavaScript(sourceFile)) : host.getSourceFiles();
 }
 }

 function isNonDeclarationFile(sourceFile: SourceFile) {
Expand DownExpand Up@@ -2589,7 +2593,7 @@ namespace ts {
 }
 else {
 for (const sourceFile of sourceFiles) {
// Don't emit if source file is a declaration file, or was located under node_modules
 // Don't emit if source file is a declaration file, or was located under node_modules
 if (!isDeclarationFile(sourceFile) && !host.isSourceFileFromExternalLibrary(sourceFile)) {
 onSingleFileEmit(host, sourceFile);
 }
Expand DownExpand Up@@ -2651,7 +2655,7 @@ namespace ts {
 onBundledEmit(host);
 }
 else {
 const sourceFiles = targetSourceFile === undefined ? host.getSourceFiles() : [targetSourceFile];
 const sourceFiles = targetSourceFile === undefined ? getSourceFilesToEmit(host) : [targetSourceFile];
 for (const sourceFile of sourceFiles) {
 // Don't emit if source file is a declaration file, or was located under node_modules
 if (!isDeclarationFile(sourceFile) && !host.isSourceFileFromExternalLibrary(sourceFile)) {
Expand DownExpand Up@@ -2689,11 +2693,11 @@ namespace ts {
 function onBundledEmit(host: EmitHost) {
 // Can emit only sources that are not declaration file and are either non module code or module with
 // --module or --target es6 specified. Files included by searching under node_modules are also not emitted.
 const bundledSources = filter(host.getSourceFiles(),
 const bundledSources = filter(getSourceFilesToEmit(host),
 sourceFile => !isDeclarationFile(sourceFile) &&
!host.isSourceFileFromExternalLibrary(sourceFile) &&
(!isExternalModule(sourceFile) ||
!!getEmitModuleKind(options)));
 !host.isSourceFileFromExternalLibrary(sourceFile) &&
 (!isExternalModule(sourceFile) ||
 !!getEmitModuleKind(options)));
 if (bundledSources.length) {
 const jsFilePath = options.outFile || options.out;
 const emitFileNames: EmitFileNames = {
Expand DownExpand Up@@ -2879,7 +2883,7 @@ namespace ts {
 writeComment: (text: string, lineMap: number[], writer: EmitTextWriter, commentPos: number, commentEnd: number, newLine: string) => void,
 node: TextRange, newLine: string, removeComments: boolean) {
 let leadingComments: CommentRange[];
 let currentDetachedCommentInfo: {nodePos: number, detachedCommentEndPos: number};
 let currentDetachedCommentInfo: {nodePos: number, detachedCommentEndPos: number};
 if (removeComments) {
 // removeComments is true, only reserve pinned comment at the top of file
 // For example:
Expand DownExpand Up@@ -3226,10 +3230,10 @@ namespace ts {

 function stringifyValue(value: any): string {
 return typeof value === "string" ? `"${escapeString(value)}"`
: typeof value === "number" ? isFinite(value) ? String(value) : "null"
 : typeof value === "boolean" ? value ? "true" : "false"
 : typeof value === "object" && value ? isArray(value) ? cycleCheck(stringifyArray, value) : cycleCheck(stringifyObject, value)
 : /*fallback*/ "null";
 : typeof value === "number" ? isFinite(value) ? String(value) : "null"
: typeof value === "boolean" ? value ? "true" : "false"
: typeof value === "object" && value ? isArray(value) ? cycleCheck(stringifyArray, value) : cycleCheck(stringifyObject, value)
: /*fallback*/ "null";
 }

 function cycleCheck(cb: (value: any) => string, value: any) {
Expand All@@ -3254,7 +3258,7 @@ namespace ts {

 function stringifyProperty(memo: string, value: any, key: string) {
 return value === undefined || typeof value === "function" || key === "__cycle" ? memo
: (memo ? memo + "," : memo) + `"${escapeString(key)}":${stringifyValue(value)}`;
 : (memo ? memo + "," : memo) + `"${escapeString(key)}":${stringifyValue(value)}`;
 }

 const base64Digits = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
Expand DownExpand Up@@ -3499,7 +3503,7 @@ namespace ts {
 * @param token The token.
 */
 export function createTokenRange(pos: number, token: SyntaxKind): TextRange {
 return createRange(pos, pos + tokenToString(token).length);
 return createRange(pos, pos + tokenToString(token).length);
 }

 export function rangeIsOnSingleLine(range: TextRange, sourceFile: SourceFile) {
Expand Down

40 changes: 40 additions & 0 deletions
src/harness/unittests/compileOnSave.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -492,5 +492,45 @@ namespace ts.projectSystem {
 assert.isTrue(host.fileExists(expectedEmittedFileName));
 assert.equal(host.readFile(expectedEmittedFileName), `"use strict";\r\nfunction Foo() { return 10; }\r\nexports.Foo = Foo;\r\n`);
 });

 it("shoud not emit js files in external projects", () => {
 const file1 = {
 path: "/a/b/file1.ts",
 content: "consonle.log('file1');"
 };
 // file2 has errors. The emitting should not be blocked.
 const file2 = {
 path: "/a/b/file2.js",
 content: "console.log'file2');"
 };
 const file3 = {
 path: "/a/b/file3.js",
 content: "console.log('file3');"
 };
 const externalProjectName = "externalproject";
 const host = createServerHost([file1, file2, file3, libFile]);
 const session = createSession(host);
 const projectService = session.getProjectService();

 projectService.openExternalProject({
 rootFiles: toExternalFiles([file1.path, file2.path]),
 options: {
 allowJs: true,
 outFile: "dist.js",
 compileOnSave: true
 },
 projectFileName: externalProjectName
 });

 const emitRequest = makeSessionRequest<server.protocol.CompileOnSaveEmitFileRequestArgs>(CommandNames.CompileOnSaveEmitFile, { file: file1.path });
 session.executeCommand(emitRequest);

 const expectedOutFileName = "/a/b/dist.js";
 assert.isTrue(host.fileExists(expectedOutFileName));
 const outFileContent = host.readFile(expectedOutFileName);
 assert.isTrue(outFileContent.indexOf(file1.content) !== -1);
 assert.isTrue(outFileContent.indexOf(file2.content) === -1);
 assert.isTrue(outFileContent.indexOf(file3.content) === -1);
 });
 });
}

4 changes: 2 additions & 2 deletions
src/server/project.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -161,8 +161,8 @@ namespace ts.server {
 this.compilerOptions.allowNonTsExtensions = true;
 }

 if (this.projectKind === ProjectKind.Inferred) {
 this.compilerOptions.noEmitOverwritenFiles = true;
 if (this.projectKind === ProjectKind.Inferred || this.projectKind === ProjectKind.External) {
 this.compilerOptions.noEmitForJsFiles = true;
 }

 if (languageServiceEnabled) {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Exclude js files in non-configured projects compile-on-save emitting#12118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Zhengbo Li (zhengbli)
merged 2 commits into

from

Nov 10, 2016
 Merged


Exclude js files in non-configured projects compile-on-save emitting
#12118
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
658dfe7

Exclude js files in non-configured projects CoS emitting

Nov 9, 2016
c984ec7

remove unnecessary method

Nov 10, 2016

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


23 changes: 8 additions & 15 deletions
src/compiler/program.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1690,18 +1690,13 @@ namespace ts {
 const emitFilePath = toPath(emitFileName, currentDirectory, getCanonicalFileName);
 // Report error if the output overwrites input file
 if (filesByName.contains(emitFilePath)) {
 if (options.noEmitOverwritenFiles && !options.out && !options.outDir && !options.outFile) {
 blockEmittingOfFile(emitFileName);
 }
 else {
 let chain: DiagnosticMessageChain;
 if (!options.configFilePath) {
 // The program is from either an inferred project or an external project
 chain = chainDiagnosticMessages(/*details*/ undefined, Diagnostics.Adding_a_tsconfig_json_file_will_help_organize_projects_that_contain_both_TypeScript_and_JavaScript_files_Learn_more_at_https_Colon_Slash_Slashaka_ms_Slashtsconfig);
 }
 chain = chainDiagnosticMessages(chain, Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file, emitFileName);
 blockEmittingOfFile(emitFileName, createCompilerDiagnosticFromMessageChain(chain));
 let chain: DiagnosticMessageChain;
 if (!options.configFilePath) {
 // The program is from either an inferred project or an external project
 chain = chainDiagnosticMessages(/*details*/ undefined, Diagnostics.Adding_a_tsconfig_json_file_will_help_organize_projects_that_contain_both_TypeScript_and_JavaScript_files_Learn_more_at_https_Colon_Slash_Slashaka_ms_Slashtsconfig);
 }
 chain = chainDiagnosticMessages(chain, Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file, emitFileName);
 blockEmittingOfFile(emitFileName, createCompilerDiagnosticFromMessageChain(chain));
 }

 // Report error if multiple files write into same file
Expand All@@ -1716,11 +1711,9 @@ namespace ts {
 }
 }

 function blockEmittingOfFile(emitFileName: string, diag?: Diagnostic) {
 function blockEmittingOfFile(emitFileName: string, diag: Diagnostic) {
 hasEmitBlockingDiagnostics.set(toPath(emitFileName, currentDirectory, getCanonicalFileName), true);
 if (diag) {
 programDiagnostics.add(diag);
 }
 programDiagnostics.add(diag);
 }
 }

Expand Down

2 changes: 1 addition & 1 deletion
src/compiler/types.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3060,7 +3060,7 @@ namespace ts {
 moduleResolution?: ModuleResolutionKind;
 newLine?: NewLineKind;
 noEmit?: boolean;
 /*@internal*/noEmitOverwritenFiles?: boolean;
 /*@internal*/noEmitForJsFiles?: boolean;
 noEmitHelpers?: boolean;
 noEmitOnError?: boolean;
 noErrorTruncation?: boolean;
Expand Down

58 changes: 31 additions & 27 deletions
src/compiler/utilities.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -192,7 +192,7 @@ namespace ts {
 export function nodePosToString(node: Node): string {
 const file = getSourceFileOfNode(node);
 const loc = getLineAndCharacterOfPosition(file, node.pos);
 return `${file.fileName}(${loc.line + 1},${loc.character + 1})`;
 return `${file.fileName}(${loc.line + 1},${loc.character + 1})`;
 }

 export function getStartPosOfNode(node: Node): number {
Expand DownExpand Up@@ -439,7 +439,7 @@ namespace ts {
 }

 export function isBlockScope(node: Node, parentNode: Node) {
 switch (node.kind) {
 switch (node.kind) {
 case SyntaxKind.SourceFile:
 case SyntaxKind.CaseBlock:
 case SyntaxKind.CatchClause:
Expand DownExpand Up@@ -624,9 +624,9 @@ namespace ts {

 export function getJsDocCommentsFromText(node: Node, text: string) {
 const commentRanges = (node.kind === SyntaxKind.Parameter ||
node.kind === SyntaxKind.TypeParameter ||
node.kind === SyntaxKind.FunctionExpression ||
node.kind === SyntaxKind.ArrowFunction) ?
 node.kind === SyntaxKind.TypeParameter ||
 node.kind === SyntaxKind.FunctionExpression ||
 node.kind === SyntaxKind.ArrowFunction) ?
 concatenate(getTrailingCommentRanges(text, node.pos), getLeadingCommentRanges(text, node.pos)) :
 getLeadingCommentRangesOfNodeFromText(node, text);
 return filter(commentRanges, isJsDocComment);
Expand DownExpand Up@@ -891,7 +891,7 @@ namespace ts {
 export function isObjectLiteralOrClassExpressionMethod(node: Node): node is MethodDeclaration {
 return node.kind === SyntaxKind.MethodDeclaration &&
 (node.parent.kind === SyntaxKind.ObjectLiteralExpression ||
 node.parent.kind === SyntaxKind.ClassExpression);
node.parent.kind === SyntaxKind.ClassExpression);
 }

 export function isIdentifierTypePredicate(predicate: TypePredicate): predicate is IdentifierTypePredicate {
Expand DownExpand Up@@ -1113,8 +1113,8 @@ namespace ts {
 // if the parameter's parent has a body and its grandparent is a class declaration, this is a valid target;
 return (<FunctionLikeDeclaration>node.parent).body !== undefined
 && (node.parent.kind === SyntaxKind.Constructor
 || node.parent.kind === SyntaxKind.MethodDeclaration
 || node.parent.kind === SyntaxKind.SetAccessor)
|| node.parent.kind === SyntaxKind.MethodDeclaration
|| node.parent.kind === SyntaxKind.SetAccessor)
 && node.parent.parent.kind === SyntaxKind.ClassDeclaration;
 }

Expand DownExpand Up@@ -1461,7 +1461,7 @@ namespace ts {
 }, tags => tags);
 }

 function getJSDocs<T>(node: Node, checkParentVariableStatement: boolean, getDocs: (docs: JSDoc[]) => T[], getTags: (tags: JSDocTag[]) => T[]): T[] {
function getJSDocs<T>(node: Node, checkParentVariableStatement: boolean, getDocs: (docs: JSDoc[]) => T[], getTags: (tags: JSDocTag[]) => T[]): T[] {
 // TODO: Get rid of getJsDocComments and friends (note the lowercase 's' in Js)
 // TODO: A lot of this work should be cached, maybe. I guess it's only used in services right now...
 let result: T[] = undefined;
Expand All@@ -1482,8 +1482,8 @@ namespace ts {

 const variableStatementNode =
 isInitializerOfVariableDeclarationInStatement ? node.parent.parent.parent :
 isVariableOfVariableDeclarationStatement ? node.parent.parent :
 undefined;
isVariableOfVariableDeclarationStatement ? node.parent.parent :
undefined;
 if (variableStatementNode) {
 result = append(result, getJSDocs(variableStatementNode, checkParentVariableStatement, getDocs, getTags));
 }
Expand DownExpand Up@@ -1648,7 +1648,7 @@ namespace ts {
 if ((<ShorthandPropertyAssignment>parent).name !== node) {
 return AssignmentKind.None;
 }
// Fall through
 // Fall through
 case SyntaxKind.PropertyAssignment:
 node = parent.parent;
 break;
Expand DownExpand Up@@ -2550,14 +2550,18 @@ namespace ts {
 if (options.outFile || options.out) {
 const moduleKind = getEmitModuleKind(options);
 const moduleEmitEnabled = moduleKind === ModuleKind.AMD || moduleKind === ModuleKind.System;
 const sourceFiles = host.getSourceFiles();
 const sourceFiles = getAllEmittableSourceFiles();
 // Can emit only sources that are not declaration file and are either non module code or module with --module or --target es6 specified
 return filter(sourceFiles, moduleEmitEnabled ? isNonDeclarationFile : isBundleEmitNonExternalModule);
 }
 else {
 const sourceFiles = targetSourceFile === undefined ? host.getSourceFiles() : [targetSourceFile];
 const sourceFiles = targetSourceFile === undefined ? getAllEmittableSourceFiles() : [targetSourceFile];
 return filter(sourceFiles, isNonDeclarationFile);
 }

 function getAllEmittableSourceFiles() {
 return options.noEmitForJsFiles ? filter(host.getSourceFiles(), sourceFile => !isSourceFileJavaScript(sourceFile)) : host.getSourceFiles();
 }
 }

 function isNonDeclarationFile(sourceFile: SourceFile) {
Expand DownExpand Up@@ -2589,7 +2593,7 @@ namespace ts {
 }
 else {
 for (const sourceFile of sourceFiles) {
// Don't emit if source file is a declaration file, or was located under node_modules
 // Don't emit if source file is a declaration file, or was located under node_modules
 if (!isDeclarationFile(sourceFile) && !host.isSourceFileFromExternalLibrary(sourceFile)) {
 onSingleFileEmit(host, sourceFile);
 }
Expand DownExpand Up@@ -2651,7 +2655,7 @@ namespace ts {
 onBundledEmit(host);
 }
 else {
 const sourceFiles = targetSourceFile === undefined ? host.getSourceFiles() : [targetSourceFile];
 const sourceFiles = targetSourceFile === undefined ? getSourceFilesToEmit(host) : [targetSourceFile];
 for (const sourceFile of sourceFiles) {
 // Don't emit if source file is a declaration file, or was located under node_modules
 if (!isDeclarationFile(sourceFile) && !host.isSourceFileFromExternalLibrary(sourceFile)) {
Expand DownExpand Up@@ -2689,11 +2693,11 @@ namespace ts {
 function onBundledEmit(host: EmitHost) {
 // Can emit only sources that are not declaration file and are either non module code or module with
 // --module or --target es6 specified. Files included by searching under node_modules are also not emitted.
 const bundledSources = filter(host.getSourceFiles(),
 const bundledSources = filter(getSourceFilesToEmit(host),
 sourceFile => !isDeclarationFile(sourceFile) &&
!host.isSourceFileFromExternalLibrary(sourceFile) &&
(!isExternalModule(sourceFile) ||
!!getEmitModuleKind(options)));
 !host.isSourceFileFromExternalLibrary(sourceFile) &&
 (!isExternalModule(sourceFile) ||
 !!getEmitModuleKind(options)));
 if (bundledSources.length) {
 const jsFilePath = options.outFile || options.out;
 const emitFileNames: EmitFileNames = {
Expand DownExpand Up@@ -2879,7 +2883,7 @@ namespace ts {
 writeComment: (text: string, lineMap: number[], writer: EmitTextWriter, commentPos: number, commentEnd: number, newLine: string) => void,
 node: TextRange, newLine: string, removeComments: boolean) {
 let leadingComments: CommentRange[];
 let currentDetachedCommentInfo: {nodePos: number, detachedCommentEndPos: number};
 let currentDetachedCommentInfo: {nodePos: number, detachedCommentEndPos: number};
 if (removeComments) {
 // removeComments is true, only reserve pinned comment at the top of file
 // For example:
Expand DownExpand Up@@ -3226,10 +3230,10 @@ namespace ts {

 function stringifyValue(value: any): string {
 return typeof value === "string" ? `"${escapeString(value)}"`
: typeof value === "number" ? isFinite(value) ? String(value) : "null"
 : typeof value === "boolean" ? value ? "true" : "false"
 : typeof value === "object" && value ? isArray(value) ? cycleCheck(stringifyArray, value) : cycleCheck(stringifyObject, value)
 : /*fallback*/ "null";
 : typeof value === "number" ? isFinite(value) ? String(value) : "null"
: typeof value === "boolean" ? value ? "true" : "false"
: typeof value === "object" && value ? isArray(value) ? cycleCheck(stringifyArray, value) : cycleCheck(stringifyObject, value)
: /*fallback*/ "null";
 }

 function cycleCheck(cb: (value: any) => string, value: any) {
Expand All@@ -3254,7 +3258,7 @@ namespace ts {

 function stringifyProperty(memo: string, value: any, key: string) {
 return value === undefined || typeof value === "function" || key === "__cycle" ? memo
: (memo ? memo + "," : memo) + `"${escapeString(key)}":${stringifyValue(value)}`;
 : (memo ? memo + "," : memo) + `"${escapeString(key)}":${stringifyValue(value)}`;
 }

 const base64Digits = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
Expand DownExpand Up@@ -3499,7 +3503,7 @@ namespace ts {
 * @param token The token.
 */
 export function createTokenRange(pos: number, token: SyntaxKind): TextRange {
 return createRange(pos, pos + tokenToString(token).length);
 return createRange(pos, pos + tokenToString(token).length);
 }

 export function rangeIsOnSingleLine(range: TextRange, sourceFile: SourceFile) {
Expand Down

40 changes: 40 additions & 0 deletions
src/harness/unittests/compileOnSave.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -492,5 +492,45 @@ namespace ts.projectSystem {
 assert.isTrue(host.fileExists(expectedEmittedFileName));
 assert.equal(host.readFile(expectedEmittedFileName), `"use strict";\r\nfunction Foo() { return 10; }\r\nexports.Foo = Foo;\r\n`);
 });

 it("shoud not emit js files in external projects", () => {
 const file1 = {
 path: "/a/b/file1.ts",
 content: "consonle.log('file1');"
 };
 // file2 has errors. The emitting should not be blocked.
 const file2 = {
 path: "/a/b/file2.js",
 content: "console.log'file2');"
 };
 const file3 = {
 path: "/a/b/file3.js",
 content: "console.log('file3');"
 };
 const externalProjectName = "externalproject";
 const host = createServerHost([file1, file2, file3, libFile]);
 const session = createSession(host);
 const projectService = session.getProjectService();

 projectService.openExternalProject({
 rootFiles: toExternalFiles([file1.path, file2.path]),
 options: {
 allowJs: true,
 outFile: "dist.js",
 compileOnSave: true
 },
 projectFileName: externalProjectName
 });

 const emitRequest = makeSessionRequest<server.protocol.CompileOnSaveEmitFileRequestArgs>(CommandNames.CompileOnSaveEmitFile, { file: file1.path });
 session.executeCommand(emitRequest);

 const expectedOutFileName = "/a/b/dist.js";
 assert.isTrue(host.fileExists(expectedOutFileName));
 const outFileContent = host.readFile(expectedOutFileName);
 assert.isTrue(outFileContent.indexOf(file1.content) !== -1);
 assert.isTrue(outFileContent.indexOf(file2.content) === -1);
 assert.isTrue(outFileContent.indexOf(file3.content) === -1);
 });
 });
}

4 changes: 2 additions & 2 deletions
src/server/project.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -161,8 +161,8 @@ namespace ts.server {
 this.compilerOptions.allowNonTsExtensions = true;
 }

 if (this.projectKind === ProjectKind.Inferred) {
 this.compilerOptions.noEmitOverwritenFiles = true;
 if (this.projectKind === ProjectKind.Inferred || this.projectKind === ProjectKind.External) {
 this.compilerOptions.noEmitForJsFiles = true;
 }

 if (languageServiceEnabled) {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Exclude js files in non-configured projects compile-on-save emitting#12118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Zhengbo Li (zhengbli)
merged 2 commits into

from

Nov 10, 2016
 Merged


Exclude js files in non-configured projects compile-on-save emitting
#12118
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
658dfe7

Exclude js files in non-configured projects CoS emitting

Nov 9, 2016
c984ec7

remove unnecessary method

Nov 10, 2016

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


23 changes: 8 additions & 15 deletions
src/compiler/program.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1690,18 +1690,13 @@ namespace ts {
 const emitFilePath = toPath(emitFileName, currentDirectory, getCanonicalFileName);
 // Report error if the output overwrites input file
 if (filesByName.contains(emitFilePath)) {
 if (options.noEmitOverwritenFiles && !options.out && !options.outDir && !options.outFile) {
 blockEmittingOfFile(emitFileName);
 }
 else {
 let chain: DiagnosticMessageChain;
 if (!options.configFilePath) {
 // The program is from either an inferred project or an external project
 chain = chainDiagnosticMessages(/*details*/ undefined, Diagnostics.Adding_a_tsconfig_json_file_will_help_organize_projects_that_contain_both_TypeScript_and_JavaScript_files_Learn_more_at_https_Colon_Slash_Slashaka_ms_Slashtsconfig);
 }
 chain = chainDiagnosticMessages(chain, Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file, emitFileName);
 blockEmittingOfFile(emitFileName, createCompilerDiagnosticFromMessageChain(chain));
 let chain: DiagnosticMessageChain;
 if (!options.configFilePath) {
 // The program is from either an inferred project or an external project
 chain = chainDiagnosticMessages(/*details*/ undefined, Diagnostics.Adding_a_tsconfig_json_file_will_help_organize_projects_that_contain_both_TypeScript_and_JavaScript_files_Learn_more_at_https_Colon_Slash_Slashaka_ms_Slashtsconfig);
 }
 chain = chainDiagnosticMessages(chain, Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file, emitFileName);
 blockEmittingOfFile(emitFileName, createCompilerDiagnosticFromMessageChain(chain));
 }

 // Report error if multiple files write into same file
Expand All@@ -1716,11 +1711,9 @@ namespace ts {
 }
 }

 function blockEmittingOfFile(emitFileName: string, diag?: Diagnostic) {
 function blockEmittingOfFile(emitFileName: string, diag: Diagnostic) {
 hasEmitBlockingDiagnostics.set(toPath(emitFileName, currentDirectory, getCanonicalFileName), true);
 if (diag) {
 programDiagnostics.add(diag);
 }
 programDiagnostics.add(diag);
 }
 }

Expand Down

2 changes: 1 addition & 1 deletion
src/compiler/types.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3060,7 +3060,7 @@ namespace ts {
 moduleResolution?: ModuleResolutionKind;
 newLine?: NewLineKind;
 noEmit?: boolean;
 /*@internal*/noEmitOverwritenFiles?: boolean;
 /*@internal*/noEmitForJsFiles?: boolean;
 noEmitHelpers?: boolean;
 noEmitOnError?: boolean;
 noErrorTruncation?: boolean;
Expand Down

58 changes: 31 additions & 27 deletions
src/compiler/utilities.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -192,7 +192,7 @@ namespace ts {
 export function nodePosToString(node: Node): string {
 const file = getSourceFileOfNode(node);
 const loc = getLineAndCharacterOfPosition(file, node.pos);
 return `${file.fileName}(${loc.line + 1},${loc.character + 1})`;
 return `${file.fileName}(${loc.line + 1},${loc.character + 1})`;
 }

 export function getStartPosOfNode(node: Node): number {
Expand DownExpand Up@@ -439,7 +439,7 @@ namespace ts {
 }

 export function isBlockScope(node: Node, parentNode: Node) {
 switch (node.kind) {
 switch (node.kind) {
 case SyntaxKind.SourceFile:
 case SyntaxKind.CaseBlock:
 case SyntaxKind.CatchClause:
Expand DownExpand Up@@ -624,9 +624,9 @@ namespace ts {

 export function getJsDocCommentsFromText(node: Node, text: string) {
 const commentRanges = (node.kind === SyntaxKind.Parameter ||
node.kind === SyntaxKind.TypeParameter ||
node.kind === SyntaxKind.FunctionExpression ||
node.kind === SyntaxKind.ArrowFunction) ?
 node.kind === SyntaxKind.TypeParameter ||
 node.kind === SyntaxKind.FunctionExpression ||
 node.kind === SyntaxKind.ArrowFunction) ?
 concatenate(getTrailingCommentRanges(text, node.pos), getLeadingCommentRanges(text, node.pos)) :
 getLeadingCommentRangesOfNodeFromText(node, text);
 return filter(commentRanges, isJsDocComment);
Expand DownExpand Up@@ -891,7 +891,7 @@ namespace ts {
 export function isObjectLiteralOrClassExpressionMethod(node: Node): node is MethodDeclaration {
 return node.kind === SyntaxKind.MethodDeclaration &&
 (node.parent.kind === SyntaxKind.ObjectLiteralExpression ||
 node.parent.kind === SyntaxKind.ClassExpression);
node.parent.kind === SyntaxKind.ClassExpression);
 }

 export function isIdentifierTypePredicate(predicate: TypePredicate): predicate is IdentifierTypePredicate {
Expand DownExpand Up@@ -1113,8 +1113,8 @@ namespace ts {
 // if the parameter's parent has a body and its grandparent is a class declaration, this is a valid target;
 return (<FunctionLikeDeclaration>node.parent).body !== undefined
 && (node.parent.kind === SyntaxKind.Constructor
 || node.parent.kind === SyntaxKind.MethodDeclaration
 || node.parent.kind === SyntaxKind.SetAccessor)
|| node.parent.kind === SyntaxKind.MethodDeclaration
|| node.parent.kind === SyntaxKind.SetAccessor)
 && node.parent.parent.kind === SyntaxKind.ClassDeclaration;
 }

Expand DownExpand Up@@ -1461,7 +1461,7 @@ namespace ts {
 }, tags => tags);
 }

 function getJSDocs<T>(node: Node, checkParentVariableStatement: boolean, getDocs: (docs: JSDoc[]) => T[], getTags: (tags: JSDocTag[]) => T[]): T[] {
function getJSDocs<T>(node: Node, checkParentVariableStatement: boolean, getDocs: (docs: JSDoc[]) => T[], getTags: (tags: JSDocTag[]) => T[]): T[] {
 // TODO: Get rid of getJsDocComments and friends (note the lowercase 's' in Js)
 // TODO: A lot of this work should be cached, maybe. I guess it's only used in services right now...
 let result: T[] = undefined;
Expand All@@ -1482,8 +1482,8 @@ namespace ts {

 const variableStatementNode =
 isInitializerOfVariableDeclarationInStatement ? node.parent.parent.parent :
 isVariableOfVariableDeclarationStatement ? node.parent.parent :
 undefined;
isVariableOfVariableDeclarationStatement ? node.parent.parent :
undefined;
 if (variableStatementNode) {
 result = append(result, getJSDocs(variableStatementNode, checkParentVariableStatement, getDocs, getTags));
 }
Expand DownExpand Up@@ -1648,7 +1648,7 @@ namespace ts {
 if ((<ShorthandPropertyAssignment>parent).name !== node) {
 return AssignmentKind.None;
 }
// Fall through
 // Fall through
 case SyntaxKind.PropertyAssignment:
 node = parent.parent;
 break;
Expand DownExpand Up@@ -2550,14 +2550,18 @@ namespace ts {
 if (options.outFile || options.out) {
 const moduleKind = getEmitModuleKind(options);
 const moduleEmitEnabled = moduleKind === ModuleKind.AMD || moduleKind === ModuleKind.System;
 const sourceFiles = host.getSourceFiles();
 const sourceFiles = getAllEmittableSourceFiles();
 // Can emit only sources that are not declaration file and are either non module code or module with --module or --target es6 specified
 return filter(sourceFiles, moduleEmitEnabled ? isNonDeclarationFile : isBundleEmitNonExternalModule);
 }
 else {
 const sourceFiles = targetSourceFile === undefined ? host.getSourceFiles() : [targetSourceFile];
 const sourceFiles = targetSourceFile === undefined ? getAllEmittableSourceFiles() : [targetSourceFile];
 return filter(sourceFiles, isNonDeclarationFile);
 }

 function getAllEmittableSourceFiles() {
 return options.noEmitForJsFiles ? filter(host.getSourceFiles(), sourceFile => !isSourceFileJavaScript(sourceFile)) : host.getSourceFiles();
 }
 }

 function isNonDeclarationFile(sourceFile: SourceFile) {
Expand DownExpand Up@@ -2589,7 +2593,7 @@ namespace ts {
 }
 else {
 for (const sourceFile of sourceFiles) {
// Don't emit if source file is a declaration file, or was located under node_modules
 // Don't emit if source file is a declaration file, or was located under node_modules
 if (!isDeclarationFile(sourceFile) && !host.isSourceFileFromExternalLibrary(sourceFile)) {
 onSingleFileEmit(host, sourceFile);
 }
Expand DownExpand Up@@ -2651,7 +2655,7 @@ namespace ts {
 onBundledEmit(host);
 }
 else {
 const sourceFiles = targetSourceFile === undefined ? host.getSourceFiles() : [targetSourceFile];
 const sourceFiles = targetSourceFile === undefined ? getSourceFilesToEmit(host) : [targetSourceFile];
 for (const sourceFile of sourceFiles) {
 // Don't emit if source file is a declaration file, or was located under node_modules
 if (!isDeclarationFile(sourceFile) && !host.isSourceFileFromExternalLibrary(sourceFile)) {
Expand DownExpand Up@@ -2689,11 +2693,11 @@ namespace ts {
 function onBundledEmit(host: EmitHost) {
 // Can emit only sources that are not declaration file and are either non module code or module with
 // --module or --target es6 specified. Files included by searching under node_modules are also not emitted.
 const bundledSources = filter(host.getSourceFiles(),
 const bundledSources = filter(getSourceFilesToEmit(host),
 sourceFile => !isDeclarationFile(sourceFile) &&
!host.isSourceFileFromExternalLibrary(sourceFile) &&
(!isExternalModule(sourceFile) ||
!!getEmitModuleKind(options)));
 !host.isSourceFileFromExternalLibrary(sourceFile) &&
 (!isExternalModule(sourceFile) ||
 !!getEmitModuleKind(options)));
 if (bundledSources.length) {
 const jsFilePath = options.outFile || options.out;
 const emitFileNames: EmitFileNames = {
Expand DownExpand Up@@ -2879,7 +2883,7 @@ namespace ts {
 writeComment: (text: string, lineMap: number[], writer: EmitTextWriter, commentPos: number, commentEnd: number, newLine: string) => void,
 node: TextRange, newLine: string, removeComments: boolean) {
 let leadingComments: CommentRange[];
 let currentDetachedCommentInfo: {nodePos: number, detachedCommentEndPos: number};
 let currentDetachedCommentInfo: {nodePos: number, detachedCommentEndPos: number};
 if (removeComments) {
 // removeComments is true, only reserve pinned comment at the top of file
 // For example:
Expand DownExpand Up@@ -3226,10 +3230,10 @@ namespace ts {

 function stringifyValue(value: any): string {
 return typeof value === "string" ? `"${escapeString(value)}"`
: typeof value === "number" ? isFinite(value) ? String(value) : "null"
 : typeof value === "boolean" ? value ? "true" : "false"
 : typeof value === "object" && value ? isArray(value) ? cycleCheck(stringifyArray, value) : cycleCheck(stringifyObject, value)
 : /*fallback*/ "null";
 : typeof value === "number" ? isFinite(value) ? String(value) : "null"
: typeof value === "boolean" ? value ? "true" : "false"
: typeof value === "object" && value ? isArray(value) ? cycleCheck(stringifyArray, value) : cycleCheck(stringifyObject, value)
: /*fallback*/ "null";
 }

 function cycleCheck(cb: (value: any) => string, value: any) {
Expand All@@ -3254,7 +3258,7 @@ namespace ts {

 function stringifyProperty(memo: string, value: any, key: string) {
 return value === undefined || typeof value === "function" || key === "__cycle" ? memo
: (memo ? memo + "," : memo) + `"${escapeString(key)}":${stringifyValue(value)}`;
 : (memo ? memo + "," : memo) + `"${escapeString(key)}":${stringifyValue(value)}`;
 }

 const base64Digits = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
Expand DownExpand Up@@ -3499,7 +3503,7 @@ namespace ts {
 * @param token The token.
 */
 export function createTokenRange(pos: number, token: SyntaxKind): TextRange {
 return createRange(pos, pos + tokenToString(token).length);
 return createRange(pos, pos + tokenToString(token).length);
 }

 export function rangeIsOnSingleLine(range: TextRange, sourceFile: SourceFile) {
Expand Down

40 changes: 40 additions & 0 deletions
src/harness/unittests/compileOnSave.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -492,5 +492,45 @@ namespace ts.projectSystem {
 assert.isTrue(host.fileExists(expectedEmittedFileName));
 assert.equal(host.readFile(expectedEmittedFileName), `"use strict";\r\nfunction Foo() { return 10; }\r\nexports.Foo = Foo;\r\n`);
 });

 it("shoud not emit js files in external projects", () => {
 const file1 = {
 path: "/a/b/file1.ts",
 content: "consonle.log('file1');"
 };
 // file2 has errors. The emitting should not be blocked.
 const file2 = {
 path: "/a/b/file2.js",
 content: "console.log'file2');"
 };
 const file3 = {
 path: "/a/b/file3.js",
 content: "console.log('file3');"
 };
 const externalProjectName = "externalproject";
 const host = createServerHost([file1, file2, file3, libFile]);
 const session = createSession(host);
 const projectService = session.getProjectService();

 projectService.openExternalProject({
 rootFiles: toExternalFiles([file1.path, file2.path]),
 options: {
 allowJs: true,
 outFile: "dist.js",
 compileOnSave: true
 },
 projectFileName: externalProjectName
 });

 const emitRequest = makeSessionRequest<server.protocol.CompileOnSaveEmitFileRequestArgs>(CommandNames.CompileOnSaveEmitFile, { file: file1.path });
 session.executeCommand(emitRequest);

 const expectedOutFileName = "/a/b/dist.js";
 assert.isTrue(host.fileExists(expectedOutFileName));
 const outFileContent = host.readFile(expectedOutFileName);
 assert.isTrue(outFileContent.indexOf(file1.content) !== -1);
 assert.isTrue(outFileContent.indexOf(file2.content) === -1);
 assert.isTrue(outFileContent.indexOf(file3.content) === -1);
 });
 });
}

4 changes: 2 additions & 2 deletions
src/server/project.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -161,8 +161,8 @@ namespace ts.server {
 this.compilerOptions.allowNonTsExtensions = true;
 }

 if (this.projectKind === ProjectKind.Inferred) {
 this.compilerOptions.noEmitOverwritenFiles = true;
 if (this.projectKind === ProjectKind.Inferred || this.projectKind === ProjectKind.External) {
 this.compilerOptions.noEmitForJsFiles = true;
 }

 if (languageServiceEnabled) {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Exclude js files in non-configured projects compile-on-save emitting#12118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Zhengbo Li (zhengbli)
merged 2 commits into

from

Nov 10, 2016
 Merged


Exclude js files in non-configured projects compile-on-save emitting
#12118
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
658dfe7

Exclude js files in non-configured projects CoS emitting

Nov 9, 2016
c984ec7

remove unnecessary method

Nov 10, 2016

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


23 changes: 8 additions & 15 deletions
src/compiler/program.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1690,18 +1690,13 @@ namespace ts {
 const emitFilePath = toPath(emitFileName, currentDirectory, getCanonicalFileName);
 // Report error if the output overwrites input file
 if (filesByName.contains(emitFilePath)) {
 if (options.noEmitOverwritenFiles && !options.out && !options.outDir && !options.outFile) {
 blockEmittingOfFile(emitFileName);
 }
 else {
 let chain: DiagnosticMessageChain;
 if (!options.configFilePath) {
 // The program is from either an inferred project or an external project
 chain = chainDiagnosticMessages(/*details*/ undefined, Diagnostics.Adding_a_tsconfig_json_file_will_help_organize_projects_that_contain_both_TypeScript_and_JavaScript_files_Learn_more_at_https_Colon_Slash_Slashaka_ms_Slashtsconfig);
 }
 chain = chainDiagnosticMessages(chain, Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file, emitFileName);
 blockEmittingOfFile(emitFileName, createCompilerDiagnosticFromMessageChain(chain));
 let chain: DiagnosticMessageChain;
 if (!options.configFilePath) {
 // The program is from either an inferred project or an external project
 chain = chainDiagnosticMessages(/*details*/ undefined, Diagnostics.Adding_a_tsconfig_json_file_will_help_organize_projects_that_contain_both_TypeScript_and_JavaScript_files_Learn_more_at_https_Colon_Slash_Slashaka_ms_Slashtsconfig);
 }
 chain = chainDiagnosticMessages(chain, Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file, emitFileName);
 blockEmittingOfFile(emitFileName, createCompilerDiagnosticFromMessageChain(chain));
 }

 // Report error if multiple files write into same file
Expand All@@ -1716,11 +1711,9 @@ namespace ts {
 }
 }

 function blockEmittingOfFile(emitFileName: string, diag?: Diagnostic) {
 function blockEmittingOfFile(emitFileName: string, diag: Diagnostic) {
 hasEmitBlockingDiagnostics.set(toPath(emitFileName, currentDirectory, getCanonicalFileName), true);
 if (diag) {
 programDiagnostics.add(diag);
 }
 programDiagnostics.add(diag);
 }
 }

Expand Down

2 changes: 1 addition & 1 deletion
src/compiler/types.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3060,7 +3060,7 @@ namespace ts {
 moduleResolution?: ModuleResolutionKind;
 newLine?: NewLineKind;
 noEmit?: boolean;
 /*@internal*/noEmitOverwritenFiles?: boolean;
 /*@internal*/noEmitForJsFiles?: boolean;
 noEmitHelpers?: boolean;
 noEmitOnError?: boolean;
 noErrorTruncation?: boolean;
Expand Down

58 changes: 31 additions & 27 deletions
src/compiler/utilities.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -192,7 +192,7 @@ namespace ts {
 export function nodePosToString(node: Node): string {
 const file = getSourceFileOfNode(node);
 const loc = getLineAndCharacterOfPosition(file, node.pos);
 return `${file.fileName}(${loc.line + 1},${loc.character + 1})`;
 return `${file.fileName}(${loc.line + 1},${loc.character + 1})`;
 }

 export function getStartPosOfNode(node: Node): number {
Expand DownExpand Up@@ -439,7 +439,7 @@ namespace ts {
 }

 export function isBlockScope(node: Node, parentNode: Node) {
 switch (node.kind) {
 switch (node.kind) {
 case SyntaxKind.SourceFile:
 case SyntaxKind.CaseBlock:
 case SyntaxKind.CatchClause:
Expand DownExpand Up@@ -624,9 +624,9 @@ namespace ts {

 export function getJsDocCommentsFromText(node: Node, text: string) {
 const commentRanges = (node.kind === SyntaxKind.Parameter ||
node.kind === SyntaxKind.TypeParameter ||
node.kind === SyntaxKind.FunctionExpression ||
node.kind === SyntaxKind.ArrowFunction) ?
 node.kind === SyntaxKind.TypeParameter ||
 node.kind === SyntaxKind.FunctionExpression ||
 node.kind === SyntaxKind.ArrowFunction) ?
 concatenate(getTrailingCommentRanges(text, node.pos), getLeadingCommentRanges(text, node.pos)) :
 getLeadingCommentRangesOfNodeFromText(node, text);
 return filter(commentRanges, isJsDocComment);
Expand DownExpand Up@@ -891,7 +891,7 @@ namespace ts {
 export function isObjectLiteralOrClassExpressionMethod(node: Node): node is MethodDeclaration {
 return node.kind === SyntaxKind.MethodDeclaration &&
 (node.parent.kind === SyntaxKind.ObjectLiteralExpression ||
 node.parent.kind === SyntaxKind.ClassExpression);
node.parent.kind === SyntaxKind.ClassExpression);
 }

 export function isIdentifierTypePredicate(predicate: TypePredicate): predicate is IdentifierTypePredicate {
Expand DownExpand Up@@ -1113,8 +1113,8 @@ namespace ts {
 // if the parameter's parent has a body and its grandparent is a class declaration, this is a valid target;
 return (<FunctionLikeDeclaration>node.parent).body !== undefined
 && (node.parent.kind === SyntaxKind.Constructor
 || node.parent.kind === SyntaxKind.MethodDeclaration
 || node.parent.kind === SyntaxKind.SetAccessor)
|| node.parent.kind === SyntaxKind.MethodDeclaration
|| node.parent.kind === SyntaxKind.SetAccessor)
 && node.parent.parent.kind === SyntaxKind.ClassDeclaration;
 }

Expand DownExpand Up@@ -1461,7 +1461,7 @@ namespace ts {
 }, tags => tags);
 }

 function getJSDocs<T>(node: Node, checkParentVariableStatement: boolean, getDocs: (docs: JSDoc[]) => T[], getTags: (tags: JSDocTag[]) => T[]): T[] {
function getJSDocs<T>(node: Node, checkParentVariableStatement: boolean, getDocs: (docs: JSDoc[]) => T[], getTags: (tags: JSDocTag[]) => T[]): T[] {
 // TODO: Get rid of getJsDocComments and friends (note the lowercase 's' in Js)
 // TODO: A lot of this work should be cached, maybe. I guess it's only used in services right now...
 let result: T[] = undefined;
Expand All@@ -1482,8 +1482,8 @@ namespace ts {

 const variableStatementNode =
 isInitializerOfVariableDeclarationInStatement ? node.parent.parent.parent :
 isVariableOfVariableDeclarationStatement ? node.parent.parent :
 undefined;
isVariableOfVariableDeclarationStatement ? node.parent.parent :
undefined;
 if (variableStatementNode) {
 result = append(result, getJSDocs(variableStatementNode, checkParentVariableStatement, getDocs, getTags));
 }
Expand DownExpand Up@@ -1648,7 +1648,7 @@ namespace ts {
 if ((<ShorthandPropertyAssignment>parent).name !== node) {
 return AssignmentKind.None;
 }
// Fall through
 // Fall through
 case SyntaxKind.PropertyAssignment:
 node = parent.parent;
 break;
Expand DownExpand Up@@ -2550,14 +2550,18 @@ namespace ts {
 if (options.outFile || options.out) {
 const moduleKind = getEmitModuleKind(options);
 const moduleEmitEnabled = moduleKind === ModuleKind.AMD || moduleKind === ModuleKind.System;
 const sourceFiles = host.getSourceFiles();
 const sourceFiles = getAllEmittableSourceFiles();
 // Can emit only sources that are not declaration file and are either non module code or module with --module or --target es6 specified
 return filter(sourceFiles, moduleEmitEnabled ? isNonDeclarationFile : isBundleEmitNonExternalModule);
 }
 else {
 const sourceFiles = targetSourceFile === undefined ? host.getSourceFiles() : [targetSourceFile];
 const sourceFiles = targetSourceFile === undefined ? getAllEmittableSourceFiles() : [targetSourceFile];
 return filter(sourceFiles, isNonDeclarationFile);
 }

 function getAllEmittableSourceFiles() {
 return options.noEmitForJsFiles ? filter(host.getSourceFiles(), sourceFile => !isSourceFileJavaScript(sourceFile)) : host.getSourceFiles();
 }
 }

 function isNonDeclarationFile(sourceFile: SourceFile) {
Expand DownExpand Up@@ -2589,7 +2593,7 @@ namespace ts {
 }
 else {
 for (const sourceFile of sourceFiles) {
// Don't emit if source file is a declaration file, or was located under node_modules
 // Don't emit if source file is a declaration file, or was located under node_modules
 if (!isDeclarationFile(sourceFile) && !host.isSourceFileFromExternalLibrary(sourceFile)) {
 onSingleFileEmit(host, sourceFile);
 }
Expand DownExpand Up@@ -2651,7 +2655,7 @@ namespace ts {
 onBundledEmit(host);
 }
 else {
 const sourceFiles = targetSourceFile === undefined ? host.getSourceFiles() : [targetSourceFile];
 const sourceFiles = targetSourceFile === undefined ? getSourceFilesToEmit(host) : [targetSourceFile];
 for (const sourceFile of sourceFiles) {
 // Don't emit if source file is a declaration file, or was located under node_modules
 if (!isDeclarationFile(sourceFile) && !host.isSourceFileFromExternalLibrary(sourceFile)) {
Expand DownExpand Up@@ -2689,11 +2693,11 @@ namespace ts {
 function onBundledEmit(host: EmitHost) {
 // Can emit only sources that are not declaration file and are either non module code or module with
 // --module or --target es6 specified. Files included by searching under node_modules are also not emitted.
 const bundledSources = filter(host.getSourceFiles(),
 const bundledSources = filter(getSourceFilesToEmit(host),
 sourceFile => !isDeclarationFile(sourceFile) &&
!host.isSourceFileFromExternalLibrary(sourceFile) &&
(!isExternalModule(sourceFile) ||
!!getEmitModuleKind(options)));
 !host.isSourceFileFromExternalLibrary(sourceFile) &&
 (!isExternalModule(sourceFile) ||
 !!getEmitModuleKind(options)));
 if (bundledSources.length) {
 const jsFilePath = options.outFile || options.out;
 const emitFileNames: EmitFileNames = {
Expand DownExpand Up@@ -2879,7 +2883,7 @@ namespace ts {
 writeComment: (text: string, lineMap: number[], writer: EmitTextWriter, commentPos: number, commentEnd: number, newLine: string) => void,
 node: TextRange, newLine: string, removeComments: boolean) {
 let leadingComments: CommentRange[];
 let currentDetachedCommentInfo: {nodePos: number, detachedCommentEndPos: number};
 let currentDetachedCommentInfo: {nodePos: number, detachedCommentEndPos: number};
 if (removeComments) {
 // removeComments is true, only reserve pinned comment at the top of file
 // For example:
Expand DownExpand Up@@ -3226,10 +3230,10 @@ namespace ts {

 function stringifyValue(value: any): string {
 return typeof value === "string" ? `"${escapeString(value)}"`
: typeof value === "number" ? isFinite(value) ? String(value) : "null"
 : typeof value === "boolean" ? value ? "true" : "false"
 : typeof value === "object" && value ? isArray(value) ? cycleCheck(stringifyArray, value) : cycleCheck(stringifyObject, value)
 : /*fallback*/ "null";
 : typeof value === "number" ? isFinite(value) ? String(value) : "null"
: typeof value === "boolean" ? value ? "true" : "false"
: typeof value === "object" && value ? isArray(value) ? cycleCheck(stringifyArray, value) : cycleCheck(stringifyObject, value)
: /*fallback*/ "null";
 }

 function cycleCheck(cb: (value: any) => string, value: any) {
Expand All@@ -3254,7 +3258,7 @@ namespace ts {

 function stringifyProperty(memo: string, value: any, key: string) {
 return value === undefined || typeof value === "function" || key === "__cycle" ? memo
: (memo ? memo + "," : memo) + `"${escapeString(key)}":${stringifyValue(value)}`;
 : (memo ? memo + "," : memo) + `"${escapeString(key)}":${stringifyValue(value)}`;
 }

 const base64Digits = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
Expand DownExpand Up@@ -3499,7 +3503,7 @@ namespace ts {
 * @param token The token.
 */
 export function createTokenRange(pos: number, token: SyntaxKind): TextRange {
 return createRange(pos, pos + tokenToString(token).length);
 return createRange(pos, pos + tokenToString(token).length);
 }

 export function rangeIsOnSingleLine(range: TextRange, sourceFile: SourceFile) {
Expand Down

40 changes: 40 additions & 0 deletions
src/harness/unittests/compileOnSave.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -492,5 +492,45 @@ namespace ts.projectSystem {
 assert.isTrue(host.fileExists(expectedEmittedFileName));
 assert.equal(host.readFile(expectedEmittedFileName), `"use strict";\r\nfunction Foo() { return 10; }\r\nexports.Foo = Foo;\r\n`);
 });

 it("shoud not emit js files in external projects", () => {
 const file1 = {
 path: "/a/b/file1.ts",
 content: "consonle.log('file1');"
 };
 // file2 has errors. The emitting should not be blocked.
 const file2 = {
 path: "/a/b/file2.js",
 content: "console.log'file2');"
 };
 const file3 = {
 path: "/a/b/file3.js",
 content: "console.log('file3');"
 };
 const externalProjectName = "externalproject";
 const host = createServerHost([file1, file2, file3, libFile]);
 const session = createSession(host);
 const projectService = session.getProjectService();

 projectService.openExternalProject({
 rootFiles: toExternalFiles([file1.path, file2.path]),
 options: {
 allowJs: true,
 outFile: "dist.js",
 compileOnSave: true
 },
 projectFileName: externalProjectName
 });

 const emitRequest = makeSessionRequest<server.protocol.CompileOnSaveEmitFileRequestArgs>(CommandNames.CompileOnSaveEmitFile, { file: file1.path });
 session.executeCommand(emitRequest);

 const expectedOutFileName = "/a/b/dist.js";
 assert.isTrue(host.fileExists(expectedOutFileName));
 const outFileContent = host.readFile(expectedOutFileName);
 assert.isTrue(outFileContent.indexOf(file1.content) !== -1);
 assert.isTrue(outFileContent.indexOf(file2.content) === -1);
 assert.isTrue(outFileContent.indexOf(file3.content) === -1);
 });
 });
}

4 changes: 2 additions & 2 deletions
src/server/project.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -161,8 +161,8 @@ namespace ts.server {
 this.compilerOptions.allowNonTsExtensions = true;
 }

 if (this.projectKind === ProjectKind.Inferred) {
 this.compilerOptions.noEmitOverwritenFiles = true;
 if (this.projectKind === ProjectKind.Inferred || this.projectKind === ProjectKind.External) {
 this.compilerOptions.noEmitForJsFiles = true;
 }

 if (languageServiceEnabled) {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Exclude js files in non-configured projects compile-on-save emitting#12118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Zhengbo Li (zhengbli)
merged 2 commits into

from

Nov 10, 2016
 Merged


Exclude js files in non-configured projects compile-on-save emitting
#12118
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
658dfe7

Exclude js files in non-configured projects CoS emitting

Nov 9, 2016
c984ec7

remove unnecessary method

Nov 10, 2016

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


23 changes: 8 additions & 15 deletions
src/compiler/program.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1690,18 +1690,13 @@ namespace ts {
 const emitFilePath = toPath(emitFileName, currentDirectory, getCanonicalFileName);
 // Report error if the output overwrites input file
 if (filesByName.contains(emitFilePath)) {
 if (options.noEmitOverwritenFiles && !options.out && !options.outDir && !options.outFile) {
 blockEmittingOfFile(emitFileName);
 }
 else {
 let chain: DiagnosticMessageChain;
 if (!options.configFilePath) {
 // The program is from either an inferred project or an external project
 chain = chainDiagnosticMessages(/*details*/ undefined, Diagnostics.Adding_a_tsconfig_json_file_will_help_organize_projects_that_contain_both_TypeScript_and_JavaScript_files_Learn_more_at_https_Colon_Slash_Slashaka_ms_Slashtsconfig);
 }
 chain = chainDiagnosticMessages(chain, Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file, emitFileName);
 blockEmittingOfFile(emitFileName, createCompilerDiagnosticFromMessageChain(chain));
 let chain: DiagnosticMessageChain;
 if (!options.configFilePath) {
 // The program is from either an inferred project or an external project
 chain = chainDiagnosticMessages(/*details*/ undefined, Diagnostics.Adding_a_tsconfig_json_file_will_help_organize_projects_that_contain_both_TypeScript_and_JavaScript_files_Learn_more_at_https_Colon_Slash_Slashaka_ms_Slashtsconfig);
 }
 chain = chainDiagnosticMessages(chain, Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file, emitFileName);
 blockEmittingOfFile(emitFileName, createCompilerDiagnosticFromMessageChain(chain));
 }

 // Report error if multiple files write into same file
Expand All@@ -1716,11 +1711,9 @@ namespace ts {
 }
 }

 function blockEmittingOfFile(emitFileName: string, diag?: Diagnostic) {
 function blockEmittingOfFile(emitFileName: string, diag: Diagnostic) {
 hasEmitBlockingDiagnostics.set(toPath(emitFileName, currentDirectory, getCanonicalFileName), true);
 if (diag) {
 programDiagnostics.add(diag);
 }
 programDiagnostics.add(diag);
 }
 }

Expand Down

2 changes: 1 addition & 1 deletion
src/compiler/types.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3060,7 +3060,7 @@ namespace ts {
 moduleResolution?: ModuleResolutionKind;
 newLine?: NewLineKind;
 noEmit?: boolean;
 /*@internal*/noEmitOverwritenFiles?: boolean;
 /*@internal*/noEmitForJsFiles?: boolean;
 noEmitHelpers?: boolean;
 noEmitOnError?: boolean;
 noErrorTruncation?: boolean;
Expand Down

58 changes: 31 additions & 27 deletions
src/compiler/utilities.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -192,7 +192,7 @@ namespace ts {
 export function nodePosToString(node: Node): string {
 const file = getSourceFileOfNode(node);
 const loc = getLineAndCharacterOfPosition(file, node.pos);
 return `${file.fileName}(${loc.line + 1},${loc.character + 1})`;
 return `${file.fileName}(${loc.line + 1},${loc.character + 1})`;
 }

 export function getStartPosOfNode(node: Node): number {
Expand DownExpand Up@@ -439,7 +439,7 @@ namespace ts {
 }

 export function isBlockScope(node: Node, parentNode: Node) {
 switch (node.kind) {
 switch (node.kind) {
 case SyntaxKind.SourceFile:
 case SyntaxKind.CaseBlock:
 case SyntaxKind.CatchClause:
Expand DownExpand Up@@ -624,9 +624,9 @@ namespace ts {

 export function getJsDocCommentsFromText(node: Node, text: string) {
 const commentRanges = (node.kind === SyntaxKind.Parameter ||
node.kind === SyntaxKind.TypeParameter ||
node.kind === SyntaxKind.FunctionExpression ||
node.kind === SyntaxKind.ArrowFunction) ?
 node.kind === SyntaxKind.TypeParameter ||
 node.kind === SyntaxKind.FunctionExpression ||
 node.kind === SyntaxKind.ArrowFunction) ?
 concatenate(getTrailingCommentRanges(text, node.pos), getLeadingCommentRanges(text, node.pos)) :
 getLeadingCommentRangesOfNodeFromText(node, text);
 return filter(commentRanges, isJsDocComment);
Expand DownExpand Up@@ -891,7 +891,7 @@ namespace ts {
 export function isObjectLiteralOrClassExpressionMethod(node: Node): node is MethodDeclaration {
 return node.kind === SyntaxKind.MethodDeclaration &&
 (node.parent.kind === SyntaxKind.ObjectLiteralExpression ||
 node.parent.kind === SyntaxKind.ClassExpression);
node.parent.kind === SyntaxKind.ClassExpression);
 }

 export function isIdentifierTypePredicate(predicate: TypePredicate): predicate is IdentifierTypePredicate {
Expand DownExpand Up@@ -1113,8 +1113,8 @@ namespace ts {
 // if the parameter's parent has a body and its grandparent is a class declaration, this is a valid target;
 return (<FunctionLikeDeclaration>node.parent).body !== undefined
 && (node.parent.kind === SyntaxKind.Constructor
 || node.parent.kind === SyntaxKind.MethodDeclaration
 || node.parent.kind === SyntaxKind.SetAccessor)
|| node.parent.kind === SyntaxKind.MethodDeclaration
|| node.parent.kind === SyntaxKind.SetAccessor)
 && node.parent.parent.kind === SyntaxKind.ClassDeclaration;
 }

Expand DownExpand Up@@ -1461,7 +1461,7 @@ namespace ts {
 }, tags => tags);
 }

 function getJSDocs<T>(node: Node, checkParentVariableStatement: boolean, getDocs: (docs: JSDoc[]) => T[], getTags: (tags: JSDocTag[]) => T[]): T[] {
function getJSDocs<T>(node: Node, checkParentVariableStatement: boolean, getDocs: (docs: JSDoc[]) => T[], getTags: (tags: JSDocTag[]) => T[]): T[] {
 // TODO: Get rid of getJsDocComments and friends (note the lowercase 's' in Js)
 // TODO: A lot of this work should be cached, maybe. I guess it's only used in services right now...
 let result: T[] = undefined;
Expand All@@ -1482,8 +1482,8 @@ namespace ts {

 const variableStatementNode =
 isInitializerOfVariableDeclarationInStatement ? node.parent.parent.parent :
 isVariableOfVariableDeclarationStatement ? node.parent.parent :
 undefined;
isVariableOfVariableDeclarationStatement ? node.parent.parent :
undefined;
 if (variableStatementNode) {
 result = append(result, getJSDocs(variableStatementNode, checkParentVariableStatement, getDocs, getTags));
 }
Expand DownExpand Up@@ -1648,7 +1648,7 @@ namespace ts {
 if ((<ShorthandPropertyAssignment>parent).name !== node) {
 return AssignmentKind.None;
 }
// Fall through
 // Fall through
 case SyntaxKind.PropertyAssignment:
 node = parent.parent;
 break;
Expand DownExpand Up@@ -2550,14 +2550,18 @@ namespace ts {
 if (options.outFile || options.out) {
 const moduleKind = getEmitModuleKind(options);
 const moduleEmitEnabled = moduleKind === ModuleKind.AMD || moduleKind === ModuleKind.System;
 const sourceFiles = host.getSourceFiles();
 const sourceFiles = getAllEmittableSourceFiles();
 // Can emit only sources that are not declaration file and are either non module code or module with --module or --target es6 specified
 return filter(sourceFiles, moduleEmitEnabled ? isNonDeclarationFile : isBundleEmitNonExternalModule);
 }
 else {
 const sourceFiles = targetSourceFile === undefined ? host.getSourceFiles() : [targetSourceFile];
 const sourceFiles = targetSourceFile === undefined ? getAllEmittableSourceFiles() : [targetSourceFile];
 return filter(sourceFiles, isNonDeclarationFile);
 }

 function getAllEmittableSourceFiles() {
 return options.noEmitForJsFiles ? filter(host.getSourceFiles(), sourceFile => !isSourceFileJavaScript(sourceFile)) : host.getSourceFiles();
 }
 }

 function isNonDeclarationFile(sourceFile: SourceFile) {
Expand DownExpand Up@@ -2589,7 +2593,7 @@ namespace ts {
 }
 else {
 for (const sourceFile of sourceFiles) {
// Don't emit if source file is a declaration file, or was located under node_modules
 // Don't emit if source file is a declaration file, or was located under node_modules
 if (!isDeclarationFile(sourceFile) && !host.isSourceFileFromExternalLibrary(sourceFile)) {
 onSingleFileEmit(host, sourceFile);
 }
Expand DownExpand Up@@ -2651,7 +2655,7 @@ namespace ts {
 onBundledEmit(host);
 }
 else {
 const sourceFiles = targetSourceFile === undefined ? host.getSourceFiles() : [targetSourceFile];
 const sourceFiles = targetSourceFile === undefined ? getSourceFilesToEmit(host) : [targetSourceFile];
 for (const sourceFile of sourceFiles) {
 // Don't emit if source file is a declaration file, or was located under node_modules
 if (!isDeclarationFile(sourceFile) && !host.isSourceFileFromExternalLibrary(sourceFile)) {
Expand DownExpand Up@@ -2689,11 +2693,11 @@ namespace ts {
 function onBundledEmit(host: EmitHost) {
 // Can emit only sources that are not declaration file and are either non module code or module with
 // --module or --target es6 specified. Files included by searching under node_modules are also not emitted.
 const bundledSources = filter(host.getSourceFiles(),
 const bundledSources = filter(getSourceFilesToEmit(host),
 sourceFile => !isDeclarationFile(sourceFile) &&
!host.isSourceFileFromExternalLibrary(sourceFile) &&
(!isExternalModule(sourceFile) ||
!!getEmitModuleKind(options)));
 !host.isSourceFileFromExternalLibrary(sourceFile) &&
 (!isExternalModule(sourceFile) ||
 !!getEmitModuleKind(options)));
 if (bundledSources.length) {
 const jsFilePath = options.outFile || options.out;
 const emitFileNames: EmitFileNames = {
Expand DownExpand Up@@ -2879,7 +2883,7 @@ namespace ts {
 writeComment: (text: string, lineMap: number[], writer: EmitTextWriter, commentPos: number, commentEnd: number, newLine: string) => void,
 node: TextRange, newLine: string, removeComments: boolean) {
 let leadingComments: CommentRange[];
 let currentDetachedCommentInfo: {nodePos: number, detachedCommentEndPos: number};
 let currentDetachedCommentInfo: {nodePos: number, detachedCommentEndPos: number};
 if (removeComments) {
 // removeComments is true, only reserve pinned comment at the top of file
 // For example:
Expand DownExpand Up@@ -3226,10 +3230,10 @@ namespace ts {

 function stringifyValue(value: any): string {
 return typeof value === "string" ? `"${escapeString(value)}"`
: typeof value === "number" ? isFinite(value) ? String(value) : "null"
 : typeof value === "boolean" ? value ? "true" : "false"
 : typeof value === "object" && value ? isArray(value) ? cycleCheck(stringifyArray, value) : cycleCheck(stringifyObject, value)
 : /*fallback*/ "null";
 : typeof value === "number" ? isFinite(value) ? String(value) : "null"
: typeof value === "boolean" ? value ? "true" : "false"
: typeof value === "object" && value ? isArray(value) ? cycleCheck(stringifyArray, value) : cycleCheck(stringifyObject, value)
: /*fallback*/ "null";
 }

 function cycleCheck(cb: (value: any) => string, value: any) {
Expand All@@ -3254,7 +3258,7 @@ namespace ts {

 function stringifyProperty(memo: string, value: any, key: string) {
 return value === undefined || typeof value === "function" || key === "__cycle" ? memo
: (memo ? memo + "," : memo) + `"${escapeString(key)}":${stringifyValue(value)}`;
 : (memo ? memo + "," : memo) + `"${escapeString(key)}":${stringifyValue(value)}`;
 }

 const base64Digits = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
Expand DownExpand Up@@ -3499,7 +3503,7 @@ namespace ts {
 * @param token The token.
 */
 export function createTokenRange(pos: number, token: SyntaxKind): TextRange {
 return createRange(pos, pos + tokenToString(token).length);
 return createRange(pos, pos + tokenToString(token).length);
 }

 export function rangeIsOnSingleLine(range: TextRange, sourceFile: SourceFile) {
Expand Down

40 changes: 40 additions & 0 deletions
src/harness/unittests/compileOnSave.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -492,5 +492,45 @@ namespace ts.projectSystem {
 assert.isTrue(host.fileExists(expectedEmittedFileName));
 assert.equal(host.readFile(expectedEmittedFileName), `"use strict";\r\nfunction Foo() { return 10; }\r\nexports.Foo = Foo;\r\n`);
 });

 it("shoud not emit js files in external projects", () => {
 const file1 = {
 path: "/a/b/file1.ts",
 content: "consonle.log('file1');"
 };
 // file2 has errors. The emitting should not be blocked.
 const file2 = {
 path: "/a/b/file2.js",
 content: "console.log'file2');"
 };
 const file3 = {
 path: "/a/b/file3.js",
 content: "console.log('file3');"
 };
 const externalProjectName = "externalproject";
 const host = createServerHost([file1, file2, file3, libFile]);
 const session = createSession(host);
 const projectService = session.getProjectService();

 projectService.openExternalProject({
 rootFiles: toExternalFiles([file1.path, file2.path]),
 options: {
 allowJs: true,
 outFile: "dist.js",
 compileOnSave: true
 },
 projectFileName: externalProjectName
 });

 const emitRequest = makeSessionRequest<server.protocol.CompileOnSaveEmitFileRequestArgs>(CommandNames.CompileOnSaveEmitFile, { file: file1.path });
 session.executeCommand(emitRequest);

 const expectedOutFileName = "/a/b/dist.js";
 assert.isTrue(host.fileExists(expectedOutFileName));
 const outFileContent = host.readFile(expectedOutFileName);
 assert.isTrue(outFileContent.indexOf(file1.content) !== -1);
 assert.isTrue(outFileContent.indexOf(file2.content) === -1);
 assert.isTrue(outFileContent.indexOf(file3.content) === -1);
 });
 });
}

4 changes: 2 additions & 2 deletions
src/server/project.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -161,8 +161,8 @@ namespace ts.server {
 this.compilerOptions.allowNonTsExtensions = true;
 }

 if (this.projectKind === ProjectKind.Inferred) {
 this.compilerOptions.noEmitOverwritenFiles = true;
 if (this.projectKind === ProjectKind.Inferred || this.projectKind === ProjectKind.External) {
 this.compilerOptions.noEmitForJsFiles = true;
 }

 if (languageServiceEnabled) {
Expand Down