Port #12027, #11980 and #11932 to master#12037

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 1 commit into from
Nov 4, 2016
Merged

Port #12027, #11980 and #11932 to master #12037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 deletions src/compiler/core.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1127,6 +1127,18 @@ namespace ts {
};
}

export function createCompilerDiagnosticFromMessageChain(chain: DiagnosticMessageChain): Diagnostic {
return {
file: undefined,
start: undefined,
length: undefined,

code: chain.code,
category: chain.category,
messageText: chain.next ? chain : chain.messageText
};
}

export function chainDiagnosticMessages(details: DiagnosticMessageChain, message: DiagnosticMessage, ...args: any[]): DiagnosticMessageChain;
export function chainDiagnosticMessages(details: DiagnosticMessageChain, message: DiagnosticMessage): DiagnosticMessageChain {
let text = getLocaleSpecificMessage(message);
Expand Down
4 changes: 4 additions & 0 deletions src/compiler/diagnosticMessages.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3158,5 +3158,9 @@
"Implement inherited abstract class": {
"category": "Message",
"code": 90007
},
"Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig": {
"category": "Error",
"code": 90009
}
}
25 changes: 19 additions & 6 deletions src/compiler/program.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -239,11 +239,11 @@ namespace ts {
const { line, character } = getLineAndCharacterOfPosition(diagnostic.file, diagnostic.start);
const fileName = diagnostic.file.fileName;
const relativeFileName = convertToRelativePath(fileName, host.getCurrentDirectory(), fileName => host.getCanonicalFileName(fileName));
output += `${relativeFileName}(${line + 1},${character + 1}): `;
output += `${relativeFileName}(${line + 1},${character + 1}): `;
}

const category = DiagnosticCategory[diagnostic.category].toLowerCase();
output += `${category} TS${diagnostic.code}: ${flattenDiagnosticMessageText(diagnostic.messageText, host.getNewLine())}${host.getNewLine()}`;
output += `${category} TS${diagnostic.code}: ${flattenDiagnosticMessageText(diagnostic.messageText, host.getNewLine())}${host.getNewLine()}`;
}
return output;
}
Expand DownExpand Up@@ -1685,13 +1685,24 @@ namespace ts {
const emitFilePath = toPath(emitFileName, currentDirectory, getCanonicalFileName);
// Report error if the output overwrites input file
if (filesByName.contains(emitFilePath)) {
createEmitBlockingDiagnostics(emitFileName, Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file);
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));
}
}

// Report error if multiple files write into same file
if (emitFilesSeen.contains(emitFilePath)) {
// Already seen the same emit file - report error
createEmitBlockingDiagnostics(emitFileName, Diagnostics.Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files);
blockEmittingOfFile(emitFileName, createCompilerDiagnostic(Diagnostics.Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files, emitFileName));
}
else {
emitFilesSeen.set(emitFilePath, true);
Expand All@@ -1700,9 +1711,11 @@ namespace ts {
}
}

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

Expand Down
1 change: 1 addition & 0 deletions src/compiler/types.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3058,6 +3058,7 @@ namespace ts {
moduleResolution?: ModuleResolutionKind;
newLine?: NewLineKind;
noEmit?: boolean;
/*@internal*/noEmitOverwritenFiles?: boolean;
noEmitHelpers?: boolean;
noEmitOnError?: boolean;
noErrorTruncation?: boolean;
Expand Down
13 changes: 12 additions & 1 deletion src/harness/fourslash.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1253,7 +1253,18 @@ namespace FourSlash {
resultString += "Diagnostics:" + Harness.IO.newLine();
const diagnostics = ts.getPreEmitDiagnostics(this.languageService.getProgram());
for (const diagnostic of diagnostics) {
resultString += " " + diagnostic.messageText + Harness.IO.newLine();
if (typeof diagnostic.messageText !== "string") {
let chainedMessage = <ts.DiagnosticMessageChain>diagnostic.messageText;
let indentation = " ";
while (chainedMessage) {
resultString += indentation + chainedMessage.messageText + Harness.IO.newLine();
chainedMessage = chainedMessage.next;
indentation = indentation + " ";
}
}
else {
resultString += " " + diagnostic.messageText + Harness.IO.newLine();
}
}
}

Expand Down
24 changes: 24 additions & 0 deletions src/harness/unittests/tsserverProjectSystem.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2505,4 +2505,28 @@ namespace ts.projectSystem {
checkProjectActualFiles(projectService.inferredProjects[0], [f.path]);
});
});

describe("No overwrite emit error", () => {
it("for inferred project", () => {
const f1 = {
path: "/a/b/f1.js",
content: "function test1() { }"
};
const host = createServerHost([f1, libFile]);
const session = createSession(host);
openFilesForSession([f1], session);

const projectService = session.getProjectService();
checkNumberOfProjects(projectService, { inferredProjects: 1 });
const projectName = projectService.inferredProjects[0].getProjectName();

const diags = session.executeCommand(<server.protocol.CompilerOptionsDiagnosticsRequest>{
type: "request",
command: server.CommandNames.CompilerOptionsDiagnosticsFull,
seq: 2,
arguments: { projectFileName: projectName }
}).response;
assert.isTrue(diags.length === 0);
});
});
}
4 changes: 4 additions & 0 deletions src/server/project.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -161,6 +161,10 @@ namespace ts.server {
this.compilerOptions.allowNonTsExtensions = true;
}

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

if (languageServiceEnabled) {
this.enableLanguageService();
}
Expand Down
3 changes: 2 additions & 1 deletion tests/baselines/reference/compileOnSaveWorksWhenEmitBlockingErrorOnOtherFile.baseline
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
EmitSkipped: true
Diagnostics:
Cannot write file '/tests/cases/fourslash/b.js' because it would overwrite input file.
Cannot write file '/tests/cases/fourslash/b.js' because it would overwrite input file.
Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig

EmitSkipped: false
FileName : /tests/cases/fourslash/a.js
Expand Down
2 changes: 2 additions & 0 deletions tests/baselines/reference/declarationFileOverwriteError.errors.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.d.ts' because it would overwrite input file.
Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.d.ts' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.d.ts (0 errors) ====

declare class c {
Expand Down
2 changes: 2 additions & 0 deletions tests/baselines/reference/declarationFileOverwriteErrorWithOut.errors.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
error TS5055: Cannot write file 'tests/cases/compiler/out.d.ts' because it would overwrite input file.
Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig


!!! error TS5055: Cannot write file 'tests/cases/compiler/out.d.ts' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/out.d.ts (0 errors) ====

declare class c {
Expand Down
2 changes: 2 additions & 0 deletions tests/baselines/reference/exportDefaultInJsFile01.errors.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
error TS5055: Cannot write file 'tests/cases/conformance/salsa/myFile01.js' because it would overwrite input file.
Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig


!!! error TS5055: Cannot write file 'tests/cases/conformance/salsa/myFile01.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/conformance/salsa/myFile01.js (0 errors) ====

export default "hello";
2 changes: 2 additions & 0 deletions tests/baselines/reference/exportDefaultInJsFile02.errors.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
error TS5055: Cannot write file 'tests/cases/conformance/salsa/myFile02.js' because it would overwrite input file.
Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig


!!! error TS5055: Cannot write file 'tests/cases/conformance/salsa/myFile02.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/conformance/salsa/myFile02.js (0 errors) ====

export default "hello";
2 changes: 2 additions & 0 deletions tests/baselines/reference/jsFileCompilationAmbientVarDeclarationSyntax.errors.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,1): error TS8009: 'declare' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
declare var v;
~~~~~~~
Expand Down
2 changes: 2 additions & 0 deletions tests/baselines/reference/jsFileCompilationEmitBlockedCorrectly.errors.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
error TS5056: Cannot write file 'tests/cases/compiler/a.js' because it would be overwritten by multiple input files.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
!!! error TS5056: Cannot write file 'tests/cases/compiler/a.js' because it would be overwritten by multiple input files.
==== tests/cases/compiler/a.ts (0 errors) ====
class c {
Expand Down
2 changes: 2 additions & 0 deletions tests/baselines/reference/jsFileCompilationEnumSyntax.errors.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,6): error TS8015: 'enum declarations' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
enum E { }
~
Expand Down
2 changes: 2 additions & 0 deletions ...nes/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.errors.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
error TS5055: Cannot write file 'tests/cases/compiler/c.js' because it would overwrite input file.
Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig


!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
!!! error TS5055: Cannot write file 'tests/cases/compiler/c.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.ts (0 errors) ====
class c {
}
Expand Down
2 changes: 2 additions & 0 deletions tests/baselines/reference/jsFileCompilationExportAssignmentSyntax.errors.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,1): error TS8003: 'export=' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
export = b;
~~~~~~~~~~~
Expand Down
2 changes: 2 additions & 0 deletions tests/baselines/reference/jsFileCompilationHeritageClauseSyntaxOfClass.errors.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,9): error TS8005: 'implements clauses' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
class C implements D { }
~~~~~~~~~~~~
Expand Down
2 changes: 2 additions & 0 deletions tests/baselines/reference/jsFileCompilationImportEqualsSyntax.errors.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,1): error TS8002: 'import ... =' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
import a = b;
~~~~~~~~~~~~~
Expand Down
2 changes: 2 additions & 0 deletions tests/baselines/reference/jsFileCompilationInterfaceSyntax.errors.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,11): error TS8006: 'interface declarations' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
interface I { }
~
Expand Down
2 changes: 2 additions & 0 deletions tests/baselines/reference/jsFileCompilationModuleSyntax.errors.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,8): error TS8007: 'module declarations' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
module M { }
~
Expand Down
2 changes: 2 additions & 0 deletions ...erence/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.errors.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
error TS5055: Cannot write file 'tests/cases/compiler/c.js' because it would overwrite input file.
Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig


!!! error TS5055: Cannot write file 'tests/cases/compiler/c.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.ts (0 errors) ====
class c {
}
Expand Down
2 changes: 2 additions & 0 deletions tests/baselines/reference/jsFileCompilationOptionalParameter.errors.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,13): error TS8009: '?' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
function F(p?) { }
~
Expand Down
2 changes: 2 additions & 0 deletions tests/baselines/reference/jsFileCompilationPublicMethodSyntaxOfClass.errors.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(2,5): error TS8009: 'public' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
class C {
public foo() {
Expand Down
Loading
, '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
Port #12027, #11980 and #11932 to master#12037

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 1 commit into

from

Nov 4, 2016
 Merged


Port #12027, #11980 and #11932 to master
#12037
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


12 changes: 12 additions & 0 deletions
src/compiler/core.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1127,6 +1127,18 @@ namespace ts {
 };
 }

 export function createCompilerDiagnosticFromMessageChain(chain: DiagnosticMessageChain): Diagnostic {
 return {
 file: undefined,
 start: undefined,
 length: undefined,

 code: chain.code,
 category: chain.category,
 messageText: chain.next ? chain : chain.messageText
 };
 }

 export function chainDiagnosticMessages(details: DiagnosticMessageChain, message: DiagnosticMessage, ...args: any[]): DiagnosticMessageChain;
 export function chainDiagnosticMessages(details: DiagnosticMessageChain, message: DiagnosticMessage): DiagnosticMessageChain {
 let text = getLocaleSpecificMessage(message);
Expand Down

4 changes: 4 additions & 0 deletions
src/compiler/diagnosticMessages.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3158,5 +3158,9 @@
 "Implement inherited abstract class": {
 "category": "Message",
 "code": 90007
 },
 "Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig": {
 "category": "Error",
 "code": 90009
 }
}

25 changes: 19 additions & 6 deletions
src/compiler/program.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -239,11 +239,11 @@ namespace ts {
 const { line, character } = getLineAndCharacterOfPosition(diagnostic.file, diagnostic.start);
 const fileName = diagnostic.file.fileName;
 const relativeFileName = convertToRelativePath(fileName, host.getCurrentDirectory(), fileName => host.getCanonicalFileName(fileName));
 output += `${relativeFileName}(${line + 1},${character + 1}): `;
 output += `${relativeFileName}(${line + 1},${character + 1}): `;
 }

 const category = DiagnosticCategory[diagnostic.category].toLowerCase();
 output += `${category} TS${diagnostic.code}: ${flattenDiagnosticMessageText(diagnostic.messageText, host.getNewLine())}${host.getNewLine()}`;
 output += `${category} TS${diagnostic.code}: ${flattenDiagnosticMessageText(diagnostic.messageText, host.getNewLine())}${host.getNewLine()}`;
 }
 return output;
 }
Expand DownExpand Up@@ -1685,13 +1685,24 @@ namespace ts {
 const emitFilePath = toPath(emitFileName, currentDirectory, getCanonicalFileName);
 // Report error if the output overwrites input file
 if (filesByName.contains(emitFilePath)) {
 createEmitBlockingDiagnostics(emitFileName, Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file);
 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));
 }
 }

 // Report error if multiple files write into same file
 if (emitFilesSeen.contains(emitFilePath)) {
 // Already seen the same emit file - report error
createEmitBlockingDiagnostics(emitFileName, Diagnostics.Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files);
blockEmittingOfFile(emitFileName, createCompilerDiagnostic(Diagnostics.Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files, emitFileName));
 }
 else {
 emitFilesSeen.set(emitFilePath, true);
Expand All@@ -1700,9 +1711,11 @@ namespace ts {
 }
 }

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

Expand Down

1 change: 1 addition & 0 deletions
src/compiler/types.ts

View file


Open in desktop

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

13 changes: 12 additions & 1 deletion
src/harness/fourslash.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1253,7 +1253,18 @@ namespace FourSlash {
 resultString += "Diagnostics:" + Harness.IO.newLine();
 const diagnostics = ts.getPreEmitDiagnostics(this.languageService.getProgram());
 for (const diagnostic of diagnostics) {
 resultString += " " + diagnostic.messageText + Harness.IO.newLine();
 if (typeof diagnostic.messageText !== "string") {
 let chainedMessage = <ts.DiagnosticMessageChain>diagnostic.messageText;
 let indentation = " ";
 while (chainedMessage) {
 resultString += indentation + chainedMessage.messageText + Harness.IO.newLine();
 chainedMessage = chainedMessage.next;
 indentation = indentation + " ";
 }
 }
 else {
 resultString += " " + diagnostic.messageText + Harness.IO.newLine();
 }
 }
 }

Expand Down

24 changes: 24 additions & 0 deletions
src/harness/unittests/tsserverProjectSystem.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2505,4 +2505,28 @@ namespace ts.projectSystem {
 checkProjectActualFiles(projectService.inferredProjects[0], [f.path]);
 });
 });

 describe("No overwrite emit error", () => {
 it("for inferred project", () => {
 const f1 = {
 path: "/a/b/f1.js",
 content: "function test1() { }"
 };
 const host = createServerHost([f1, libFile]);
 const session = createSession(host);
 openFilesForSession([f1], session);

 const projectService = session.getProjectService();
 checkNumberOfProjects(projectService, { inferredProjects: 1 });
 const projectName = projectService.inferredProjects[0].getProjectName();

 const diags = session.executeCommand(<server.protocol.CompilerOptionsDiagnosticsRequest>{
 type: "request",
 command: server.CommandNames.CompilerOptionsDiagnosticsFull,
 seq: 2,
 arguments: { projectFileName: projectName }
 }).response;
 assert.isTrue(diags.length === 0);
 });
 });
}

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

View file


Open in desktop

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

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

 if (languageServiceEnabled) {
 this.enableLanguageService();
 }
Expand Down

3 changes: 2 additions & 1 deletion
tests/baselines/reference/compileOnSaveWorksWhenEmitBlockingErrorOnOtherFile.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
EmitSkipped: true
Diagnostics:
 Cannot write file '/tests/cases/fourslash/b.js' because it would overwrite input file.
 Cannot write file '/tests/cases/fourslash/b.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig

EmitSkipped: false
FileName : /tests/cases/fourslash/a.js
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/declarationFileOverwriteError.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.d.ts' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.d.ts' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.d.ts (0 errors) ====

 declare class c {
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/declarationFileOverwriteErrorWithOut.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
error TS5055: Cannot write file 'tests/cases/compiler/out.d.ts' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig


!!! error TS5055: Cannot write file 'tests/cases/compiler/out.d.ts' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/out.d.ts (0 errors) ====

 declare class c {
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/exportDefaultInJsFile01.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
error TS5055: Cannot write file 'tests/cases/conformance/salsa/myFile01.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig


!!! error TS5055: Cannot write file 'tests/cases/conformance/salsa/myFile01.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/conformance/salsa/myFile01.js (0 errors) ====

 export default "hello";

2 changes: 2 additions & 0 deletions
tests/baselines/reference/exportDefaultInJsFile02.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
error TS5055: Cannot write file 'tests/cases/conformance/salsa/myFile02.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig


!!! error TS5055: Cannot write file 'tests/cases/conformance/salsa/myFile02.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/conformance/salsa/myFile02.js (0 errors) ====

 export default "hello";

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationAmbientVarDeclarationSyntax.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,1): error TS8009: 'declare' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 declare var v;
 ~~~~~~~
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationEmitBlockedCorrectly.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
error TS5056: Cannot write file 'tests/cases/compiler/a.js' because it would be overwritten by multiple input files.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
!!! error TS5056: Cannot write file 'tests/cases/compiler/a.js' because it would be overwritten by multiple input files.
==== tests/cases/compiler/a.ts (0 errors) ====
 class c {
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationEnumSyntax.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,6): error TS8015: 'enum declarations' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 enum E { }
 ~
Expand Down

2 changes: 2 additions & 0 deletions
...nes/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
error TS5055: Cannot write file 'tests/cases/compiler/c.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig


!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
!!! error TS5055: Cannot write file 'tests/cases/compiler/c.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.ts (0 errors) ====
 class c {
 }
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationExportAssignmentSyntax.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,1): error TS8003: 'export=' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 export = b;
 ~~~~~~~~~~~
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationHeritageClauseSyntaxOfClass.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,9): error TS8005: 'implements clauses' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 class C implements D { }
 ~~~~~~~~~~~~
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationImportEqualsSyntax.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,1): error TS8002: 'import ... =' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 import a = b;
 ~~~~~~~~~~~~~
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationInterfaceSyntax.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,11): error TS8006: 'interface declarations' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 interface I { }
 ~
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationModuleSyntax.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,8): error TS8007: 'module declarations' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 module M { }
 ~
Expand Down

2 changes: 2 additions & 0 deletions
...erence/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
error TS5055: Cannot write file 'tests/cases/compiler/c.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig


!!! error TS5055: Cannot write file 'tests/cases/compiler/c.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.ts (0 errors) ====
 class c {
 }
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationOptionalParameter.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,13): error TS8009: '?' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 function F(p?) { }
 ~
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationPublicMethodSyntaxOfClass.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(2,5): error TS8009: 'public' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 class C {
 public foo() {
Expand Down
Loading

, '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
Port #12027, #11980 and #11932 to master#12037

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 1 commit into

from

Nov 4, 2016
 Merged


Port #12027, #11980 and #11932 to master
#12037
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


12 changes: 12 additions & 0 deletions
src/compiler/core.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1127,6 +1127,18 @@ namespace ts {
 };
 }

 export function createCompilerDiagnosticFromMessageChain(chain: DiagnosticMessageChain): Diagnostic {
 return {
 file: undefined,
 start: undefined,
 length: undefined,

 code: chain.code,
 category: chain.category,
 messageText: chain.next ? chain : chain.messageText
 };
 }

 export function chainDiagnosticMessages(details: DiagnosticMessageChain, message: DiagnosticMessage, ...args: any[]): DiagnosticMessageChain;
 export function chainDiagnosticMessages(details: DiagnosticMessageChain, message: DiagnosticMessage): DiagnosticMessageChain {
 let text = getLocaleSpecificMessage(message);
Expand Down

4 changes: 4 additions & 0 deletions
src/compiler/diagnosticMessages.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3158,5 +3158,9 @@
 "Implement inherited abstract class": {
 "category": "Message",
 "code": 90007
 },
 "Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig": {
 "category": "Error",
 "code": 90009
 }
}

25 changes: 19 additions & 6 deletions
src/compiler/program.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -239,11 +239,11 @@ namespace ts {
 const { line, character } = getLineAndCharacterOfPosition(diagnostic.file, diagnostic.start);
 const fileName = diagnostic.file.fileName;
 const relativeFileName = convertToRelativePath(fileName, host.getCurrentDirectory(), fileName => host.getCanonicalFileName(fileName));
 output += `${relativeFileName}(${line + 1},${character + 1}): `;
 output += `${relativeFileName}(${line + 1},${character + 1}): `;
 }

 const category = DiagnosticCategory[diagnostic.category].toLowerCase();
 output += `${category} TS${diagnostic.code}: ${flattenDiagnosticMessageText(diagnostic.messageText, host.getNewLine())}${host.getNewLine()}`;
 output += `${category} TS${diagnostic.code}: ${flattenDiagnosticMessageText(diagnostic.messageText, host.getNewLine())}${host.getNewLine()}`;
 }
 return output;
 }
Expand DownExpand Up@@ -1685,13 +1685,24 @@ namespace ts {
 const emitFilePath = toPath(emitFileName, currentDirectory, getCanonicalFileName);
 // Report error if the output overwrites input file
 if (filesByName.contains(emitFilePath)) {
 createEmitBlockingDiagnostics(emitFileName, Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file);
 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));
 }
 }

 // Report error if multiple files write into same file
 if (emitFilesSeen.contains(emitFilePath)) {
 // Already seen the same emit file - report error
createEmitBlockingDiagnostics(emitFileName, Diagnostics.Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files);
blockEmittingOfFile(emitFileName, createCompilerDiagnostic(Diagnostics.Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files, emitFileName));
 }
 else {
 emitFilesSeen.set(emitFilePath, true);
Expand All@@ -1700,9 +1711,11 @@ namespace ts {
 }
 }

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

Expand Down

1 change: 1 addition & 0 deletions
src/compiler/types.ts

View file


Open in desktop

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

13 changes: 12 additions & 1 deletion
src/harness/fourslash.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1253,7 +1253,18 @@ namespace FourSlash {
 resultString += "Diagnostics:" + Harness.IO.newLine();
 const diagnostics = ts.getPreEmitDiagnostics(this.languageService.getProgram());
 for (const diagnostic of diagnostics) {
 resultString += " " + diagnostic.messageText + Harness.IO.newLine();
 if (typeof diagnostic.messageText !== "string") {
 let chainedMessage = <ts.DiagnosticMessageChain>diagnostic.messageText;
 let indentation = " ";
 while (chainedMessage) {
 resultString += indentation + chainedMessage.messageText + Harness.IO.newLine();
 chainedMessage = chainedMessage.next;
 indentation = indentation + " ";
 }
 }
 else {
 resultString += " " + diagnostic.messageText + Harness.IO.newLine();
 }
 }
 }

Expand Down

24 changes: 24 additions & 0 deletions
src/harness/unittests/tsserverProjectSystem.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2505,4 +2505,28 @@ namespace ts.projectSystem {
 checkProjectActualFiles(projectService.inferredProjects[0], [f.path]);
 });
 });

 describe("No overwrite emit error", () => {
 it("for inferred project", () => {
 const f1 = {
 path: "/a/b/f1.js",
 content: "function test1() { }"
 };
 const host = createServerHost([f1, libFile]);
 const session = createSession(host);
 openFilesForSession([f1], session);

 const projectService = session.getProjectService();
 checkNumberOfProjects(projectService, { inferredProjects: 1 });
 const projectName = projectService.inferredProjects[0].getProjectName();

 const diags = session.executeCommand(<server.protocol.CompilerOptionsDiagnosticsRequest>{
 type: "request",
 command: server.CommandNames.CompilerOptionsDiagnosticsFull,
 seq: 2,
 arguments: { projectFileName: projectName }
 }).response;
 assert.isTrue(diags.length === 0);
 });
 });
}

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

View file


Open in desktop

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

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

 if (languageServiceEnabled) {
 this.enableLanguageService();
 }
Expand Down

3 changes: 2 additions & 1 deletion
tests/baselines/reference/compileOnSaveWorksWhenEmitBlockingErrorOnOtherFile.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
EmitSkipped: true
Diagnostics:
 Cannot write file '/tests/cases/fourslash/b.js' because it would overwrite input file.
 Cannot write file '/tests/cases/fourslash/b.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig

EmitSkipped: false
FileName : /tests/cases/fourslash/a.js
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/declarationFileOverwriteError.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.d.ts' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.d.ts' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.d.ts (0 errors) ====

 declare class c {
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/declarationFileOverwriteErrorWithOut.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
error TS5055: Cannot write file 'tests/cases/compiler/out.d.ts' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig


!!! error TS5055: Cannot write file 'tests/cases/compiler/out.d.ts' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/out.d.ts (0 errors) ====

 declare class c {
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/exportDefaultInJsFile01.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
error TS5055: Cannot write file 'tests/cases/conformance/salsa/myFile01.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig


!!! error TS5055: Cannot write file 'tests/cases/conformance/salsa/myFile01.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/conformance/salsa/myFile01.js (0 errors) ====

 export default "hello";

2 changes: 2 additions & 0 deletions
tests/baselines/reference/exportDefaultInJsFile02.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
error TS5055: Cannot write file 'tests/cases/conformance/salsa/myFile02.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig


!!! error TS5055: Cannot write file 'tests/cases/conformance/salsa/myFile02.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/conformance/salsa/myFile02.js (0 errors) ====

 export default "hello";

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationAmbientVarDeclarationSyntax.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,1): error TS8009: 'declare' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 declare var v;
 ~~~~~~~
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationEmitBlockedCorrectly.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
error TS5056: Cannot write file 'tests/cases/compiler/a.js' because it would be overwritten by multiple input files.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
!!! error TS5056: Cannot write file 'tests/cases/compiler/a.js' because it would be overwritten by multiple input files.
==== tests/cases/compiler/a.ts (0 errors) ====
 class c {
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationEnumSyntax.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,6): error TS8015: 'enum declarations' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 enum E { }
 ~
Expand Down

2 changes: 2 additions & 0 deletions
...nes/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
error TS5055: Cannot write file 'tests/cases/compiler/c.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig


!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
!!! error TS5055: Cannot write file 'tests/cases/compiler/c.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.ts (0 errors) ====
 class c {
 }
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationExportAssignmentSyntax.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,1): error TS8003: 'export=' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 export = b;
 ~~~~~~~~~~~
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationHeritageClauseSyntaxOfClass.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,9): error TS8005: 'implements clauses' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 class C implements D { }
 ~~~~~~~~~~~~
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationImportEqualsSyntax.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,1): error TS8002: 'import ... =' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 import a = b;
 ~~~~~~~~~~~~~
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationInterfaceSyntax.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,11): error TS8006: 'interface declarations' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 interface I { }
 ~
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationModuleSyntax.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,8): error TS8007: 'module declarations' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 module M { }
 ~
Expand Down

2 changes: 2 additions & 0 deletions
...erence/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
error TS5055: Cannot write file 'tests/cases/compiler/c.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig


!!! error TS5055: Cannot write file 'tests/cases/compiler/c.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.ts (0 errors) ====
 class c {
 }
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationOptionalParameter.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,13): error TS8009: '?' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 function F(p?) { }
 ~
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationPublicMethodSyntaxOfClass.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(2,5): error TS8009: 'public' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 class C {
 public foo() {
Expand Down
Loading

, '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
Port #12027, #11980 and #11932 to master#12037

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 1 commit into

from

Nov 4, 2016
 Merged


Port #12027, #11980 and #11932 to master
#12037
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


12 changes: 12 additions & 0 deletions
src/compiler/core.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1127,6 +1127,18 @@ namespace ts {
 };
 }

 export function createCompilerDiagnosticFromMessageChain(chain: DiagnosticMessageChain): Diagnostic {
 return {
 file: undefined,
 start: undefined,
 length: undefined,

 code: chain.code,
 category: chain.category,
 messageText: chain.next ? chain : chain.messageText
 };
 }

 export function chainDiagnosticMessages(details: DiagnosticMessageChain, message: DiagnosticMessage, ...args: any[]): DiagnosticMessageChain;
 export function chainDiagnosticMessages(details: DiagnosticMessageChain, message: DiagnosticMessage): DiagnosticMessageChain {
 let text = getLocaleSpecificMessage(message);
Expand Down

4 changes: 4 additions & 0 deletions
src/compiler/diagnosticMessages.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3158,5 +3158,9 @@
 "Implement inherited abstract class": {
 "category": "Message",
 "code": 90007
 },
 "Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig": {
 "category": "Error",
 "code": 90009
 }
}

25 changes: 19 additions & 6 deletions
src/compiler/program.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -239,11 +239,11 @@ namespace ts {
 const { line, character } = getLineAndCharacterOfPosition(diagnostic.file, diagnostic.start);
 const fileName = diagnostic.file.fileName;
 const relativeFileName = convertToRelativePath(fileName, host.getCurrentDirectory(), fileName => host.getCanonicalFileName(fileName));
 output += `${relativeFileName}(${line + 1},${character + 1}): `;
 output += `${relativeFileName}(${line + 1},${character + 1}): `;
 }

 const category = DiagnosticCategory[diagnostic.category].toLowerCase();
 output += `${category} TS${diagnostic.code}: ${flattenDiagnosticMessageText(diagnostic.messageText, host.getNewLine())}${host.getNewLine()}`;
 output += `${category} TS${diagnostic.code}: ${flattenDiagnosticMessageText(diagnostic.messageText, host.getNewLine())}${host.getNewLine()}`;
 }
 return output;
 }
Expand DownExpand Up@@ -1685,13 +1685,24 @@ namespace ts {
 const emitFilePath = toPath(emitFileName, currentDirectory, getCanonicalFileName);
 // Report error if the output overwrites input file
 if (filesByName.contains(emitFilePath)) {
 createEmitBlockingDiagnostics(emitFileName, Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file);
 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));
 }
 }

 // Report error if multiple files write into same file
 if (emitFilesSeen.contains(emitFilePath)) {
 // Already seen the same emit file - report error
createEmitBlockingDiagnostics(emitFileName, Diagnostics.Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files);
blockEmittingOfFile(emitFileName, createCompilerDiagnostic(Diagnostics.Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files, emitFileName));
 }
 else {
 emitFilesSeen.set(emitFilePath, true);
Expand All@@ -1700,9 +1711,11 @@ namespace ts {
 }
 }

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

Expand Down

1 change: 1 addition & 0 deletions
src/compiler/types.ts

View file


Open in desktop

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

13 changes: 12 additions & 1 deletion
src/harness/fourslash.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1253,7 +1253,18 @@ namespace FourSlash {
 resultString += "Diagnostics:" + Harness.IO.newLine();
 const diagnostics = ts.getPreEmitDiagnostics(this.languageService.getProgram());
 for (const diagnostic of diagnostics) {
 resultString += " " + diagnostic.messageText + Harness.IO.newLine();
 if (typeof diagnostic.messageText !== "string") {
 let chainedMessage = <ts.DiagnosticMessageChain>diagnostic.messageText;
 let indentation = " ";
 while (chainedMessage) {
 resultString += indentation + chainedMessage.messageText + Harness.IO.newLine();
 chainedMessage = chainedMessage.next;
 indentation = indentation + " ";
 }
 }
 else {
 resultString += " " + diagnostic.messageText + Harness.IO.newLine();
 }
 }
 }

Expand Down

24 changes: 24 additions & 0 deletions
src/harness/unittests/tsserverProjectSystem.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2505,4 +2505,28 @@ namespace ts.projectSystem {
 checkProjectActualFiles(projectService.inferredProjects[0], [f.path]);
 });
 });

 describe("No overwrite emit error", () => {
 it("for inferred project", () => {
 const f1 = {
 path: "/a/b/f1.js",
 content: "function test1() { }"
 };
 const host = createServerHost([f1, libFile]);
 const session = createSession(host);
 openFilesForSession([f1], session);

 const projectService = session.getProjectService();
 checkNumberOfProjects(projectService, { inferredProjects: 1 });
 const projectName = projectService.inferredProjects[0].getProjectName();

 const diags = session.executeCommand(<server.protocol.CompilerOptionsDiagnosticsRequest>{
 type: "request",
 command: server.CommandNames.CompilerOptionsDiagnosticsFull,
 seq: 2,
 arguments: { projectFileName: projectName }
 }).response;
 assert.isTrue(diags.length === 0);
 });
 });
}

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

View file


Open in desktop

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

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

 if (languageServiceEnabled) {
 this.enableLanguageService();
 }
Expand Down

3 changes: 2 additions & 1 deletion
tests/baselines/reference/compileOnSaveWorksWhenEmitBlockingErrorOnOtherFile.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
EmitSkipped: true
Diagnostics:
 Cannot write file '/tests/cases/fourslash/b.js' because it would overwrite input file.
 Cannot write file '/tests/cases/fourslash/b.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig

EmitSkipped: false
FileName : /tests/cases/fourslash/a.js
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/declarationFileOverwriteError.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.d.ts' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.d.ts' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.d.ts (0 errors) ====

 declare class c {
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/declarationFileOverwriteErrorWithOut.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
error TS5055: Cannot write file 'tests/cases/compiler/out.d.ts' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig


!!! error TS5055: Cannot write file 'tests/cases/compiler/out.d.ts' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/out.d.ts (0 errors) ====

 declare class c {
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/exportDefaultInJsFile01.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
error TS5055: Cannot write file 'tests/cases/conformance/salsa/myFile01.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig


!!! error TS5055: Cannot write file 'tests/cases/conformance/salsa/myFile01.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/conformance/salsa/myFile01.js (0 errors) ====

 export default "hello";

2 changes: 2 additions & 0 deletions
tests/baselines/reference/exportDefaultInJsFile02.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
error TS5055: Cannot write file 'tests/cases/conformance/salsa/myFile02.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig


!!! error TS5055: Cannot write file 'tests/cases/conformance/salsa/myFile02.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/conformance/salsa/myFile02.js (0 errors) ====

 export default "hello";

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationAmbientVarDeclarationSyntax.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,1): error TS8009: 'declare' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 declare var v;
 ~~~~~~~
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationEmitBlockedCorrectly.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
error TS5056: Cannot write file 'tests/cases/compiler/a.js' because it would be overwritten by multiple input files.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
!!! error TS5056: Cannot write file 'tests/cases/compiler/a.js' because it would be overwritten by multiple input files.
==== tests/cases/compiler/a.ts (0 errors) ====
 class c {
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationEnumSyntax.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,6): error TS8015: 'enum declarations' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 enum E { }
 ~
Expand Down

2 changes: 2 additions & 0 deletions
...nes/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
error TS5055: Cannot write file 'tests/cases/compiler/c.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig


!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
!!! error TS5055: Cannot write file 'tests/cases/compiler/c.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.ts (0 errors) ====
 class c {
 }
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationExportAssignmentSyntax.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,1): error TS8003: 'export=' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 export = b;
 ~~~~~~~~~~~
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationHeritageClauseSyntaxOfClass.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,9): error TS8005: 'implements clauses' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 class C implements D { }
 ~~~~~~~~~~~~
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationImportEqualsSyntax.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,1): error TS8002: 'import ... =' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 import a = b;
 ~~~~~~~~~~~~~
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationInterfaceSyntax.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,11): error TS8006: 'interface declarations' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 interface I { }
 ~
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationModuleSyntax.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,8): error TS8007: 'module declarations' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 module M { }
 ~
Expand Down

2 changes: 2 additions & 0 deletions
...erence/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
error TS5055: Cannot write file 'tests/cases/compiler/c.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig


!!! error TS5055: Cannot write file 'tests/cases/compiler/c.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.ts (0 errors) ====
 class c {
 }
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationOptionalParameter.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,13): error TS8009: '?' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 function F(p?) { }
 ~
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationPublicMethodSyntaxOfClass.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(2,5): error TS8009: 'public' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 class C {
 public foo() {
Expand Down
Loading

, '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
Port #12027, #11980 and #11932 to master#12037

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 1 commit into

from

Nov 4, 2016
 Merged


Port #12027, #11980 and #11932 to master
#12037
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


12 changes: 12 additions & 0 deletions
src/compiler/core.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1127,6 +1127,18 @@ namespace ts {
 };
 }

 export function createCompilerDiagnosticFromMessageChain(chain: DiagnosticMessageChain): Diagnostic {
 return {
 file: undefined,
 start: undefined,
 length: undefined,

 code: chain.code,
 category: chain.category,
 messageText: chain.next ? chain : chain.messageText
 };
 }

 export function chainDiagnosticMessages(details: DiagnosticMessageChain, message: DiagnosticMessage, ...args: any[]): DiagnosticMessageChain;
 export function chainDiagnosticMessages(details: DiagnosticMessageChain, message: DiagnosticMessage): DiagnosticMessageChain {
 let text = getLocaleSpecificMessage(message);
Expand Down

4 changes: 4 additions & 0 deletions
src/compiler/diagnosticMessages.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3158,5 +3158,9 @@
 "Implement inherited abstract class": {
 "category": "Message",
 "code": 90007
 },
 "Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig": {
 "category": "Error",
 "code": 90009
 }
}

25 changes: 19 additions & 6 deletions
src/compiler/program.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -239,11 +239,11 @@ namespace ts {
 const { line, character } = getLineAndCharacterOfPosition(diagnostic.file, diagnostic.start);
 const fileName = diagnostic.file.fileName;
 const relativeFileName = convertToRelativePath(fileName, host.getCurrentDirectory(), fileName => host.getCanonicalFileName(fileName));
 output += `${relativeFileName}(${line + 1},${character + 1}): `;
 output += `${relativeFileName}(${line + 1},${character + 1}): `;
 }

 const category = DiagnosticCategory[diagnostic.category].toLowerCase();
 output += `${category} TS${diagnostic.code}: ${flattenDiagnosticMessageText(diagnostic.messageText, host.getNewLine())}${host.getNewLine()}`;
 output += `${category} TS${diagnostic.code}: ${flattenDiagnosticMessageText(diagnostic.messageText, host.getNewLine())}${host.getNewLine()}`;
 }
 return output;
 }
Expand DownExpand Up@@ -1685,13 +1685,24 @@ namespace ts {
 const emitFilePath = toPath(emitFileName, currentDirectory, getCanonicalFileName);
 // Report error if the output overwrites input file
 if (filesByName.contains(emitFilePath)) {
 createEmitBlockingDiagnostics(emitFileName, Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file);
 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));
 }
 }

 // Report error if multiple files write into same file
 if (emitFilesSeen.contains(emitFilePath)) {
 // Already seen the same emit file - report error
createEmitBlockingDiagnostics(emitFileName, Diagnostics.Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files);
blockEmittingOfFile(emitFileName, createCompilerDiagnostic(Diagnostics.Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files, emitFileName));
 }
 else {
 emitFilesSeen.set(emitFilePath, true);
Expand All@@ -1700,9 +1711,11 @@ namespace ts {
 }
 }

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

Expand Down

1 change: 1 addition & 0 deletions
src/compiler/types.ts

View file


Open in desktop

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

13 changes: 12 additions & 1 deletion
src/harness/fourslash.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1253,7 +1253,18 @@ namespace FourSlash {
 resultString += "Diagnostics:" + Harness.IO.newLine();
 const diagnostics = ts.getPreEmitDiagnostics(this.languageService.getProgram());
 for (const diagnostic of diagnostics) {
 resultString += " " + diagnostic.messageText + Harness.IO.newLine();
 if (typeof diagnostic.messageText !== "string") {
 let chainedMessage = <ts.DiagnosticMessageChain>diagnostic.messageText;
 let indentation = " ";
 while (chainedMessage) {
 resultString += indentation + chainedMessage.messageText + Harness.IO.newLine();
 chainedMessage = chainedMessage.next;
 indentation = indentation + " ";
 }
 }
 else {
 resultString += " " + diagnostic.messageText + Harness.IO.newLine();
 }
 }
 }

Expand Down

24 changes: 24 additions & 0 deletions
src/harness/unittests/tsserverProjectSystem.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2505,4 +2505,28 @@ namespace ts.projectSystem {
 checkProjectActualFiles(projectService.inferredProjects[0], [f.path]);
 });
 });

 describe("No overwrite emit error", () => {
 it("for inferred project", () => {
 const f1 = {
 path: "/a/b/f1.js",
 content: "function test1() { }"
 };
 const host = createServerHost([f1, libFile]);
 const session = createSession(host);
 openFilesForSession([f1], session);

 const projectService = session.getProjectService();
 checkNumberOfProjects(projectService, { inferredProjects: 1 });
 const projectName = projectService.inferredProjects[0].getProjectName();

 const diags = session.executeCommand(<server.protocol.CompilerOptionsDiagnosticsRequest>{
 type: "request",
 command: server.CommandNames.CompilerOptionsDiagnosticsFull,
 seq: 2,
 arguments: { projectFileName: projectName }
 }).response;
 assert.isTrue(diags.length === 0);
 });
 });
}

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

View file


Open in desktop

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

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

 if (languageServiceEnabled) {
 this.enableLanguageService();
 }
Expand Down

3 changes: 2 additions & 1 deletion
tests/baselines/reference/compileOnSaveWorksWhenEmitBlockingErrorOnOtherFile.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
EmitSkipped: true
Diagnostics:
 Cannot write file '/tests/cases/fourslash/b.js' because it would overwrite input file.
 Cannot write file '/tests/cases/fourslash/b.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig

EmitSkipped: false
FileName : /tests/cases/fourslash/a.js
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/declarationFileOverwriteError.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.d.ts' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.d.ts' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.d.ts (0 errors) ====

 declare class c {
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/declarationFileOverwriteErrorWithOut.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
error TS5055: Cannot write file 'tests/cases/compiler/out.d.ts' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig


!!! error TS5055: Cannot write file 'tests/cases/compiler/out.d.ts' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/out.d.ts (0 errors) ====

 declare class c {
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/exportDefaultInJsFile01.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
error TS5055: Cannot write file 'tests/cases/conformance/salsa/myFile01.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig


!!! error TS5055: Cannot write file 'tests/cases/conformance/salsa/myFile01.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/conformance/salsa/myFile01.js (0 errors) ====

 export default "hello";

2 changes: 2 additions & 0 deletions
tests/baselines/reference/exportDefaultInJsFile02.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
error TS5055: Cannot write file 'tests/cases/conformance/salsa/myFile02.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig


!!! error TS5055: Cannot write file 'tests/cases/conformance/salsa/myFile02.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/conformance/salsa/myFile02.js (0 errors) ====

 export default "hello";

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationAmbientVarDeclarationSyntax.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,1): error TS8009: 'declare' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 declare var v;
 ~~~~~~~
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationEmitBlockedCorrectly.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
error TS5056: Cannot write file 'tests/cases/compiler/a.js' because it would be overwritten by multiple input files.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
!!! error TS5056: Cannot write file 'tests/cases/compiler/a.js' because it would be overwritten by multiple input files.
==== tests/cases/compiler/a.ts (0 errors) ====
 class c {
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationEnumSyntax.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,6): error TS8015: 'enum declarations' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 enum E { }
 ~
Expand Down

2 changes: 2 additions & 0 deletions
...nes/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
error TS5055: Cannot write file 'tests/cases/compiler/c.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig


!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
!!! error TS5055: Cannot write file 'tests/cases/compiler/c.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.ts (0 errors) ====
 class c {
 }
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationExportAssignmentSyntax.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,1): error TS8003: 'export=' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 export = b;
 ~~~~~~~~~~~
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationHeritageClauseSyntaxOfClass.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,9): error TS8005: 'implements clauses' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 class C implements D { }
 ~~~~~~~~~~~~
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationImportEqualsSyntax.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,1): error TS8002: 'import ... =' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 import a = b;
 ~~~~~~~~~~~~~
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationInterfaceSyntax.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,11): error TS8006: 'interface declarations' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 interface I { }
 ~
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationModuleSyntax.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,8): error TS8007: 'module declarations' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 module M { }
 ~
Expand Down

2 changes: 2 additions & 0 deletions
...erence/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
error TS5055: Cannot write file 'tests/cases/compiler/c.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig


!!! error TS5055: Cannot write file 'tests/cases/compiler/c.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.ts (0 errors) ====
 class c {
 }
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationOptionalParameter.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,13): error TS8009: '?' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 function F(p?) { }
 ~
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationPublicMethodSyntaxOfClass.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(2,5): error TS8009: 'public' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 class C {
 public foo() {
Expand Down
Loading

, '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
Port #12027, #11980 and #11932 to master#12037

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 1 commit into

from

Nov 4, 2016
 Merged


Port #12027, #11980 and #11932 to master
#12037
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


12 changes: 12 additions & 0 deletions
src/compiler/core.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1127,6 +1127,18 @@ namespace ts {
 };
 }

 export function createCompilerDiagnosticFromMessageChain(chain: DiagnosticMessageChain): Diagnostic {
 return {
 file: undefined,
 start: undefined,
 length: undefined,

 code: chain.code,
 category: chain.category,
 messageText: chain.next ? chain : chain.messageText
 };
 }

 export function chainDiagnosticMessages(details: DiagnosticMessageChain, message: DiagnosticMessage, ...args: any[]): DiagnosticMessageChain;
 export function chainDiagnosticMessages(details: DiagnosticMessageChain, message: DiagnosticMessage): DiagnosticMessageChain {
 let text = getLocaleSpecificMessage(message);
Expand Down

4 changes: 4 additions & 0 deletions
src/compiler/diagnosticMessages.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3158,5 +3158,9 @@
 "Implement inherited abstract class": {
 "category": "Message",
 "code": 90007
 },
 "Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig": {
 "category": "Error",
 "code": 90009
 }
}

25 changes: 19 additions & 6 deletions
src/compiler/program.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -239,11 +239,11 @@ namespace ts {
 const { line, character } = getLineAndCharacterOfPosition(diagnostic.file, diagnostic.start);
 const fileName = diagnostic.file.fileName;
 const relativeFileName = convertToRelativePath(fileName, host.getCurrentDirectory(), fileName => host.getCanonicalFileName(fileName));
 output += `${relativeFileName}(${line + 1},${character + 1}): `;
 output += `${relativeFileName}(${line + 1},${character + 1}): `;
 }

 const category = DiagnosticCategory[diagnostic.category].toLowerCase();
 output += `${category} TS${diagnostic.code}: ${flattenDiagnosticMessageText(diagnostic.messageText, host.getNewLine())}${host.getNewLine()}`;
 output += `${category} TS${diagnostic.code}: ${flattenDiagnosticMessageText(diagnostic.messageText, host.getNewLine())}${host.getNewLine()}`;
 }
 return output;
 }
Expand DownExpand Up@@ -1685,13 +1685,24 @@ namespace ts {
 const emitFilePath = toPath(emitFileName, currentDirectory, getCanonicalFileName);
 // Report error if the output overwrites input file
 if (filesByName.contains(emitFilePath)) {
 createEmitBlockingDiagnostics(emitFileName, Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file);
 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));
 }
 }

 // Report error if multiple files write into same file
 if (emitFilesSeen.contains(emitFilePath)) {
 // Already seen the same emit file - report error
createEmitBlockingDiagnostics(emitFileName, Diagnostics.Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files);
blockEmittingOfFile(emitFileName, createCompilerDiagnostic(Diagnostics.Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files, emitFileName));
 }
 else {
 emitFilesSeen.set(emitFilePath, true);
Expand All@@ -1700,9 +1711,11 @@ namespace ts {
 }
 }

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

Expand Down

1 change: 1 addition & 0 deletions
src/compiler/types.ts

View file


Open in desktop

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

13 changes: 12 additions & 1 deletion
src/harness/fourslash.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1253,7 +1253,18 @@ namespace FourSlash {
 resultString += "Diagnostics:" + Harness.IO.newLine();
 const diagnostics = ts.getPreEmitDiagnostics(this.languageService.getProgram());
 for (const diagnostic of diagnostics) {
 resultString += " " + diagnostic.messageText + Harness.IO.newLine();
 if (typeof diagnostic.messageText !== "string") {
 let chainedMessage = <ts.DiagnosticMessageChain>diagnostic.messageText;
 let indentation = " ";
 while (chainedMessage) {
 resultString += indentation + chainedMessage.messageText + Harness.IO.newLine();
 chainedMessage = chainedMessage.next;
 indentation = indentation + " ";
 }
 }
 else {
 resultString += " " + diagnostic.messageText + Harness.IO.newLine();
 }
 }
 }

Expand Down

24 changes: 24 additions & 0 deletions
src/harness/unittests/tsserverProjectSystem.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2505,4 +2505,28 @@ namespace ts.projectSystem {
 checkProjectActualFiles(projectService.inferredProjects[0], [f.path]);
 });
 });

 describe("No overwrite emit error", () => {
 it("for inferred project", () => {
 const f1 = {
 path: "/a/b/f1.js",
 content: "function test1() { }"
 };
 const host = createServerHost([f1, libFile]);
 const session = createSession(host);
 openFilesForSession([f1], session);

 const projectService = session.getProjectService();
 checkNumberOfProjects(projectService, { inferredProjects: 1 });
 const projectName = projectService.inferredProjects[0].getProjectName();

 const diags = session.executeCommand(<server.protocol.CompilerOptionsDiagnosticsRequest>{
 type: "request",
 command: server.CommandNames.CompilerOptionsDiagnosticsFull,
 seq: 2,
 arguments: { projectFileName: projectName }
 }).response;
 assert.isTrue(diags.length === 0);
 });
 });
}

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

View file


Open in desktop

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

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

 if (languageServiceEnabled) {
 this.enableLanguageService();
 }
Expand Down

3 changes: 2 additions & 1 deletion
tests/baselines/reference/compileOnSaveWorksWhenEmitBlockingErrorOnOtherFile.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
EmitSkipped: true
Diagnostics:
 Cannot write file '/tests/cases/fourslash/b.js' because it would overwrite input file.
 Cannot write file '/tests/cases/fourslash/b.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig

EmitSkipped: false
FileName : /tests/cases/fourslash/a.js
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/declarationFileOverwriteError.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.d.ts' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.d.ts' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.d.ts (0 errors) ====

 declare class c {
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/declarationFileOverwriteErrorWithOut.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
error TS5055: Cannot write file 'tests/cases/compiler/out.d.ts' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig


!!! error TS5055: Cannot write file 'tests/cases/compiler/out.d.ts' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/out.d.ts (0 errors) ====

 declare class c {
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/exportDefaultInJsFile01.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
error TS5055: Cannot write file 'tests/cases/conformance/salsa/myFile01.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig


!!! error TS5055: Cannot write file 'tests/cases/conformance/salsa/myFile01.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/conformance/salsa/myFile01.js (0 errors) ====

 export default "hello";

2 changes: 2 additions & 0 deletions
tests/baselines/reference/exportDefaultInJsFile02.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
error TS5055: Cannot write file 'tests/cases/conformance/salsa/myFile02.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig


!!! error TS5055: Cannot write file 'tests/cases/conformance/salsa/myFile02.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/conformance/salsa/myFile02.js (0 errors) ====

 export default "hello";

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationAmbientVarDeclarationSyntax.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,1): error TS8009: 'declare' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 declare var v;
 ~~~~~~~
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationEmitBlockedCorrectly.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
error TS5056: Cannot write file 'tests/cases/compiler/a.js' because it would be overwritten by multiple input files.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
!!! error TS5056: Cannot write file 'tests/cases/compiler/a.js' because it would be overwritten by multiple input files.
==== tests/cases/compiler/a.ts (0 errors) ====
 class c {
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationEnumSyntax.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,6): error TS8015: 'enum declarations' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 enum E { }
 ~
Expand Down

2 changes: 2 additions & 0 deletions
...nes/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
error TS5055: Cannot write file 'tests/cases/compiler/c.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig


!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
!!! error TS5055: Cannot write file 'tests/cases/compiler/c.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.ts (0 errors) ====
 class c {
 }
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationExportAssignmentSyntax.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,1): error TS8003: 'export=' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 export = b;
 ~~~~~~~~~~~
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationHeritageClauseSyntaxOfClass.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,9): error TS8005: 'implements clauses' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 class C implements D { }
 ~~~~~~~~~~~~
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationImportEqualsSyntax.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,1): error TS8002: 'import ... =' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 import a = b;
 ~~~~~~~~~~~~~
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationInterfaceSyntax.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,11): error TS8006: 'interface declarations' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 interface I { }
 ~
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationModuleSyntax.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,8): error TS8007: 'module declarations' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 module M { }
 ~
Expand Down

2 changes: 2 additions & 0 deletions
...erence/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
error TS5055: Cannot write file 'tests/cases/compiler/c.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig


!!! error TS5055: Cannot write file 'tests/cases/compiler/c.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.ts (0 errors) ====
 class c {
 }
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationOptionalParameter.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,13): error TS8009: '?' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 function F(p?) { }
 ~
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationPublicMethodSyntaxOfClass.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(2,5): error TS8009: 'public' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 class C {
 public foo() {
Expand Down
Loading

, '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
Port #12027, #11980 and #11932 to master#12037

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 1 commit into

from

Nov 4, 2016
 Merged


Port #12027, #11980 and #11932 to master
#12037
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


12 changes: 12 additions & 0 deletions
src/compiler/core.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1127,6 +1127,18 @@ namespace ts {
 };
 }

 export function createCompilerDiagnosticFromMessageChain(chain: DiagnosticMessageChain): Diagnostic {
 return {
 file: undefined,
 start: undefined,
 length: undefined,

 code: chain.code,
 category: chain.category,
 messageText: chain.next ? chain : chain.messageText
 };
 }

 export function chainDiagnosticMessages(details: DiagnosticMessageChain, message: DiagnosticMessage, ...args: any[]): DiagnosticMessageChain;
 export function chainDiagnosticMessages(details: DiagnosticMessageChain, message: DiagnosticMessage): DiagnosticMessageChain {
 let text = getLocaleSpecificMessage(message);
Expand Down

4 changes: 4 additions & 0 deletions
src/compiler/diagnosticMessages.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3158,5 +3158,9 @@
 "Implement inherited abstract class": {
 "category": "Message",
 "code": 90007
 },
 "Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig": {
 "category": "Error",
 "code": 90009
 }
}

25 changes: 19 additions & 6 deletions
src/compiler/program.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -239,11 +239,11 @@ namespace ts {
 const { line, character } = getLineAndCharacterOfPosition(diagnostic.file, diagnostic.start);
 const fileName = diagnostic.file.fileName;
 const relativeFileName = convertToRelativePath(fileName, host.getCurrentDirectory(), fileName => host.getCanonicalFileName(fileName));
 output += `${relativeFileName}(${line + 1},${character + 1}): `;
 output += `${relativeFileName}(${line + 1},${character + 1}): `;
 }

 const category = DiagnosticCategory[diagnostic.category].toLowerCase();
 output += `${category} TS${diagnostic.code}: ${flattenDiagnosticMessageText(diagnostic.messageText, host.getNewLine())}${host.getNewLine()}`;
 output += `${category} TS${diagnostic.code}: ${flattenDiagnosticMessageText(diagnostic.messageText, host.getNewLine())}${host.getNewLine()}`;
 }
 return output;
 }
Expand DownExpand Up@@ -1685,13 +1685,24 @@ namespace ts {
 const emitFilePath = toPath(emitFileName, currentDirectory, getCanonicalFileName);
 // Report error if the output overwrites input file
 if (filesByName.contains(emitFilePath)) {
 createEmitBlockingDiagnostics(emitFileName, Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file);
 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));
 }
 }

 // Report error if multiple files write into same file
 if (emitFilesSeen.contains(emitFilePath)) {
 // Already seen the same emit file - report error
createEmitBlockingDiagnostics(emitFileName, Diagnostics.Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files);
blockEmittingOfFile(emitFileName, createCompilerDiagnostic(Diagnostics.Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files, emitFileName));
 }
 else {
 emitFilesSeen.set(emitFilePath, true);
Expand All@@ -1700,9 +1711,11 @@ namespace ts {
 }
 }

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

Expand Down

1 change: 1 addition & 0 deletions
src/compiler/types.ts

View file


Open in desktop

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

13 changes: 12 additions & 1 deletion
src/harness/fourslash.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1253,7 +1253,18 @@ namespace FourSlash {
 resultString += "Diagnostics:" + Harness.IO.newLine();
 const diagnostics = ts.getPreEmitDiagnostics(this.languageService.getProgram());
 for (const diagnostic of diagnostics) {
 resultString += " " + diagnostic.messageText + Harness.IO.newLine();
 if (typeof diagnostic.messageText !== "string") {
 let chainedMessage = <ts.DiagnosticMessageChain>diagnostic.messageText;
 let indentation = " ";
 while (chainedMessage) {
 resultString += indentation + chainedMessage.messageText + Harness.IO.newLine();
 chainedMessage = chainedMessage.next;
 indentation = indentation + " ";
 }
 }
 else {
 resultString += " " + diagnostic.messageText + Harness.IO.newLine();
 }
 }
 }

Expand Down

24 changes: 24 additions & 0 deletions
src/harness/unittests/tsserverProjectSystem.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2505,4 +2505,28 @@ namespace ts.projectSystem {
 checkProjectActualFiles(projectService.inferredProjects[0], [f.path]);
 });
 });

 describe("No overwrite emit error", () => {
 it("for inferred project", () => {
 const f1 = {
 path: "/a/b/f1.js",
 content: "function test1() { }"
 };
 const host = createServerHost([f1, libFile]);
 const session = createSession(host);
 openFilesForSession([f1], session);

 const projectService = session.getProjectService();
 checkNumberOfProjects(projectService, { inferredProjects: 1 });
 const projectName = projectService.inferredProjects[0].getProjectName();

 const diags = session.executeCommand(<server.protocol.CompilerOptionsDiagnosticsRequest>{
 type: "request",
 command: server.CommandNames.CompilerOptionsDiagnosticsFull,
 seq: 2,
 arguments: { projectFileName: projectName }
 }).response;
 assert.isTrue(diags.length === 0);
 });
 });
}

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

View file


Open in desktop

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

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

 if (languageServiceEnabled) {
 this.enableLanguageService();
 }
Expand Down

3 changes: 2 additions & 1 deletion
tests/baselines/reference/compileOnSaveWorksWhenEmitBlockingErrorOnOtherFile.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
EmitSkipped: true
Diagnostics:
 Cannot write file '/tests/cases/fourslash/b.js' because it would overwrite input file.
 Cannot write file '/tests/cases/fourslash/b.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig

EmitSkipped: false
FileName : /tests/cases/fourslash/a.js
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/declarationFileOverwriteError.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.d.ts' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.d.ts' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.d.ts (0 errors) ====

 declare class c {
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/declarationFileOverwriteErrorWithOut.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
error TS5055: Cannot write file 'tests/cases/compiler/out.d.ts' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig


!!! error TS5055: Cannot write file 'tests/cases/compiler/out.d.ts' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/out.d.ts (0 errors) ====

 declare class c {
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/exportDefaultInJsFile01.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
error TS5055: Cannot write file 'tests/cases/conformance/salsa/myFile01.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig


!!! error TS5055: Cannot write file 'tests/cases/conformance/salsa/myFile01.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/conformance/salsa/myFile01.js (0 errors) ====

 export default "hello";

2 changes: 2 additions & 0 deletions
tests/baselines/reference/exportDefaultInJsFile02.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
error TS5055: Cannot write file 'tests/cases/conformance/salsa/myFile02.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig


!!! error TS5055: Cannot write file 'tests/cases/conformance/salsa/myFile02.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/conformance/salsa/myFile02.js (0 errors) ====

 export default "hello";

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationAmbientVarDeclarationSyntax.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,1): error TS8009: 'declare' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 declare var v;
 ~~~~~~~
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationEmitBlockedCorrectly.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
error TS5056: Cannot write file 'tests/cases/compiler/a.js' because it would be overwritten by multiple input files.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
!!! error TS5056: Cannot write file 'tests/cases/compiler/a.js' because it would be overwritten by multiple input files.
==== tests/cases/compiler/a.ts (0 errors) ====
 class c {
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationEnumSyntax.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,6): error TS8015: 'enum declarations' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 enum E { }
 ~
Expand Down

2 changes: 2 additions & 0 deletions
...nes/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
error TS5055: Cannot write file 'tests/cases/compiler/c.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig


!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
!!! error TS5055: Cannot write file 'tests/cases/compiler/c.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.ts (0 errors) ====
 class c {
 }
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationExportAssignmentSyntax.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,1): error TS8003: 'export=' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 export = b;
 ~~~~~~~~~~~
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationHeritageClauseSyntaxOfClass.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,9): error TS8005: 'implements clauses' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 class C implements D { }
 ~~~~~~~~~~~~
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationImportEqualsSyntax.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,1): error TS8002: 'import ... =' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 import a = b;
 ~~~~~~~~~~~~~
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationInterfaceSyntax.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,11): error TS8006: 'interface declarations' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 interface I { }
 ~
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationModuleSyntax.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,8): error TS8007: 'module declarations' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 module M { }
 ~
Expand Down

2 changes: 2 additions & 0 deletions
...erence/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
error TS5055: Cannot write file 'tests/cases/compiler/c.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig


!!! error TS5055: Cannot write file 'tests/cases/compiler/c.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.ts (0 errors) ====
 class c {
 }
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationOptionalParameter.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,13): error TS8009: '?' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 function F(p?) { }
 ~
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationPublicMethodSyntaxOfClass.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(2,5): error TS8009: 'public' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 class C {
 public foo() {
Expand Down
Loading

, '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
Port #12027, #11980 and #11932 to master#12037

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 1 commit into

from

Nov 4, 2016
 Merged


Port #12027, #11980 and #11932 to master
#12037
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


12 changes: 12 additions & 0 deletions
src/compiler/core.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1127,6 +1127,18 @@ namespace ts {
 };
 }

 export function createCompilerDiagnosticFromMessageChain(chain: DiagnosticMessageChain): Diagnostic {
 return {
 file: undefined,
 start: undefined,
 length: undefined,

 code: chain.code,
 category: chain.category,
 messageText: chain.next ? chain : chain.messageText
 };
 }

 export function chainDiagnosticMessages(details: DiagnosticMessageChain, message: DiagnosticMessage, ...args: any[]): DiagnosticMessageChain;
 export function chainDiagnosticMessages(details: DiagnosticMessageChain, message: DiagnosticMessage): DiagnosticMessageChain {
 let text = getLocaleSpecificMessage(message);
Expand Down

4 changes: 4 additions & 0 deletions
src/compiler/diagnosticMessages.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3158,5 +3158,9 @@
 "Implement inherited abstract class": {
 "category": "Message",
 "code": 90007
 },
 "Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig": {
 "category": "Error",
 "code": 90009
 }
}

25 changes: 19 additions & 6 deletions
src/compiler/program.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -239,11 +239,11 @@ namespace ts {
 const { line, character } = getLineAndCharacterOfPosition(diagnostic.file, diagnostic.start);
 const fileName = diagnostic.file.fileName;
 const relativeFileName = convertToRelativePath(fileName, host.getCurrentDirectory(), fileName => host.getCanonicalFileName(fileName));
 output += `${relativeFileName}(${line + 1},${character + 1}): `;
 output += `${relativeFileName}(${line + 1},${character + 1}): `;
 }

 const category = DiagnosticCategory[diagnostic.category].toLowerCase();
 output += `${category} TS${diagnostic.code}: ${flattenDiagnosticMessageText(diagnostic.messageText, host.getNewLine())}${host.getNewLine()}`;
 output += `${category} TS${diagnostic.code}: ${flattenDiagnosticMessageText(diagnostic.messageText, host.getNewLine())}${host.getNewLine()}`;
 }
 return output;
 }
Expand DownExpand Up@@ -1685,13 +1685,24 @@ namespace ts {
 const emitFilePath = toPath(emitFileName, currentDirectory, getCanonicalFileName);
 // Report error if the output overwrites input file
 if (filesByName.contains(emitFilePath)) {
 createEmitBlockingDiagnostics(emitFileName, Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file);
 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));
 }
 }

 // Report error if multiple files write into same file
 if (emitFilesSeen.contains(emitFilePath)) {
 // Already seen the same emit file - report error
createEmitBlockingDiagnostics(emitFileName, Diagnostics.Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files);
blockEmittingOfFile(emitFileName, createCompilerDiagnostic(Diagnostics.Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files, emitFileName));
 }
 else {
 emitFilesSeen.set(emitFilePath, true);
Expand All@@ -1700,9 +1711,11 @@ namespace ts {
 }
 }

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

Expand Down

1 change: 1 addition & 0 deletions
src/compiler/types.ts

View file


Open in desktop

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

13 changes: 12 additions & 1 deletion
src/harness/fourslash.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1253,7 +1253,18 @@ namespace FourSlash {
 resultString += "Diagnostics:" + Harness.IO.newLine();
 const diagnostics = ts.getPreEmitDiagnostics(this.languageService.getProgram());
 for (const diagnostic of diagnostics) {
 resultString += " " + diagnostic.messageText + Harness.IO.newLine();
 if (typeof diagnostic.messageText !== "string") {
 let chainedMessage = <ts.DiagnosticMessageChain>diagnostic.messageText;
 let indentation = " ";
 while (chainedMessage) {
 resultString += indentation + chainedMessage.messageText + Harness.IO.newLine();
 chainedMessage = chainedMessage.next;
 indentation = indentation + " ";
 }
 }
 else {
 resultString += " " + diagnostic.messageText + Harness.IO.newLine();
 }
 }
 }

Expand Down

24 changes: 24 additions & 0 deletions
src/harness/unittests/tsserverProjectSystem.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2505,4 +2505,28 @@ namespace ts.projectSystem {
 checkProjectActualFiles(projectService.inferredProjects[0], [f.path]);
 });
 });

 describe("No overwrite emit error", () => {
 it("for inferred project", () => {
 const f1 = {
 path: "/a/b/f1.js",
 content: "function test1() { }"
 };
 const host = createServerHost([f1, libFile]);
 const session = createSession(host);
 openFilesForSession([f1], session);

 const projectService = session.getProjectService();
 checkNumberOfProjects(projectService, { inferredProjects: 1 });
 const projectName = projectService.inferredProjects[0].getProjectName();

 const diags = session.executeCommand(<server.protocol.CompilerOptionsDiagnosticsRequest>{
 type: "request",
 command: server.CommandNames.CompilerOptionsDiagnosticsFull,
 seq: 2,
 arguments: { projectFileName: projectName }
 }).response;
 assert.isTrue(diags.length === 0);
 });
 });
}

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

View file


Open in desktop

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

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

 if (languageServiceEnabled) {
 this.enableLanguageService();
 }
Expand Down

3 changes: 2 additions & 1 deletion
tests/baselines/reference/compileOnSaveWorksWhenEmitBlockingErrorOnOtherFile.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
EmitSkipped: true
Diagnostics:
 Cannot write file '/tests/cases/fourslash/b.js' because it would overwrite input file.
 Cannot write file '/tests/cases/fourslash/b.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig

EmitSkipped: false
FileName : /tests/cases/fourslash/a.js
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/declarationFileOverwriteError.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.d.ts' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.d.ts' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.d.ts (0 errors) ====

 declare class c {
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/declarationFileOverwriteErrorWithOut.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
error TS5055: Cannot write file 'tests/cases/compiler/out.d.ts' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig


!!! error TS5055: Cannot write file 'tests/cases/compiler/out.d.ts' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/out.d.ts (0 errors) ====

 declare class c {
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/exportDefaultInJsFile01.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
error TS5055: Cannot write file 'tests/cases/conformance/salsa/myFile01.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig


!!! error TS5055: Cannot write file 'tests/cases/conformance/salsa/myFile01.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/conformance/salsa/myFile01.js (0 errors) ====

 export default "hello";

2 changes: 2 additions & 0 deletions
tests/baselines/reference/exportDefaultInJsFile02.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
error TS5055: Cannot write file 'tests/cases/conformance/salsa/myFile02.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig


!!! error TS5055: Cannot write file 'tests/cases/conformance/salsa/myFile02.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/conformance/salsa/myFile02.js (0 errors) ====

 export default "hello";

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationAmbientVarDeclarationSyntax.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,1): error TS8009: 'declare' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 declare var v;
 ~~~~~~~
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationEmitBlockedCorrectly.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
error TS5056: Cannot write file 'tests/cases/compiler/a.js' because it would be overwritten by multiple input files.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
!!! error TS5056: Cannot write file 'tests/cases/compiler/a.js' because it would be overwritten by multiple input files.
==== tests/cases/compiler/a.ts (0 errors) ====
 class c {
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationEnumSyntax.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,6): error TS8015: 'enum declarations' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 enum E { }
 ~
Expand Down

2 changes: 2 additions & 0 deletions
...nes/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
error TS5055: Cannot write file 'tests/cases/compiler/c.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig


!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
!!! error TS5055: Cannot write file 'tests/cases/compiler/c.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.ts (0 errors) ====
 class c {
 }
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationExportAssignmentSyntax.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,1): error TS8003: 'export=' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 export = b;
 ~~~~~~~~~~~
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationHeritageClauseSyntaxOfClass.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,9): error TS8005: 'implements clauses' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 class C implements D { }
 ~~~~~~~~~~~~
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationImportEqualsSyntax.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,1): error TS8002: 'import ... =' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 import a = b;
 ~~~~~~~~~~~~~
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationInterfaceSyntax.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,11): error TS8006: 'interface declarations' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 interface I { }
 ~
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationModuleSyntax.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,8): error TS8007: 'module declarations' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 module M { }
 ~
Expand Down

2 changes: 2 additions & 0 deletions
...erence/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
error TS5055: Cannot write file 'tests/cases/compiler/c.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig


!!! error TS5055: Cannot write file 'tests/cases/compiler/c.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.ts (0 errors) ====
 class c {
 }
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationOptionalParameter.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(1,13): error TS8009: '?' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 function F(p?) { }
 ~
Expand Down

2 changes: 2 additions & 0 deletions
tests/baselines/reference/jsFileCompilationPublicMethodSyntaxOfClass.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
 Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
tests/cases/compiler/a.js(2,5): error TS8009: 'public' can only be used in a .ts file.


!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
==== tests/cases/compiler/a.js (1 errors) ====
 class C {
 public foo() {
Expand Down
Loading