microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-10 21:07:52 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

merge with origin/master

Browse Source
This commit is contained in:
Vladimir Matveev
2016-01-14 13:58:48 -08:00
parent a69dcd16fa 1868caa066
commit e90db461ce
36 changed files with 402 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
CONTRIBUTING.md
View File

@@ -1,3 +1,45 @@
# Instructions for Logging Issues
## 1. Read the FAQ
Please [read the FAQ](https://github.com/Microsoft/TypeScript/wiki/FAQ) before logging new issues, even if you think you have found a bug.
Issues that ask questions answered in the FAQ will be closed without elaboration.
## 2. Search for Duplicates
[Search the existing issues](https://github.com/Microsoft/TypeScript/issues?utf8=%E2%9C%93&q=is%3Aissue) before logging a new one.
## 3. Do you have a question?
The issue tracker is for **issues**, in other words, bugs and suggestions.
If you have a *question*, please use [http://stackoverflow.com/questions/tagged/typescript](Stack Overflow), [https://gitter.im/Microsoft/TypeScript](Gitter), your favorite search engine, or other resources.
Due to increased traffic, we can no longer answer questions in the issue tracker.
## 4. Did you find a bug?
When logging a bug, please be sure to include the following:
* What version of TypeScript you're using (run `tsc --v`)
* If at all possible, an *isolated* way to reproduce the behavior
* The behavior you expect to see, and the actual behavior
You can try out the nightly build of TypeScript (`npm install typescript@next`) to see if the bug has already been fixed.
## 5. Do you have a suggestion?
We also accept suggestions in the issue tracker.
Be sure to [check the FAQ](https://github.com/Microsoft/TypeScript/wiki/FAQ) and [search](https://github.com/Microsoft/TypeScript/issues?utf8=%E2%9C%93&q=is%3Aissue) first.
In general, things we find useful when reviewing suggestins are:
* A description of the problem you're trying to solve
* An overview of the suggested solution
* Examples of how the suggestion would work in various places
* Code examples showing e.g. "this would be an error, this wouldn't"
* Code examples showing the generated JavaScript (if applicable)
* If relevant, precedent in other languages can be useful for establishing context and expected behavior
# Instructions for Contributing Code
## Contributing bug fixes
TypeScript is currently accepting contributions in the form of bug fixes. A bug must have an issue tracking it in the issue tracker that has been approved ("Milestone == Community") by the TypeScript team. Your pull request should include a link to the bug that you are fixing. If you've submitted a PR for a bug, please post a comment in the bug to avoid duplication of effort.

38
src/compiler/checker.ts
View File

@@ -762,7 +762,9 @@ namespace ts {
if (!result) {
if (nameNotFoundMessage) {
error(errorLocation, nameNotFoundMessage, typeof nameArg === "string" ? nameArg : declarationNameToString(nameArg));
if (!checkAndReportErrorForMissingPrefix(errorLocation, name, nameArg)) {
error(errorLocation, nameNotFoundMessage, typeof nameArg === "string" ? nameArg : declarationNameToString(nameArg));
}
}
return undefined;
}
@@ -799,6 +801,40 @@ namespace ts {
return result;
}
function checkAndReportErrorForMissingPrefix(errorLocation: Node, name: string, nameArg: string | Identifier): boolean {
if (!errorLocation || (errorLocation.kind === SyntaxKind.Identifier && (isTypeReferenceIdentifier(<Identifier>errorLocation)) || isInTypeQuery(errorLocation))) {
return false;
}
const container = getThisContainer(errorLocation, /* includeArrowFunctions */ true);
let location = container;
while (location) {
if (isClassLike(location.parent)) {
const symbol = getSymbolOfNode(location.parent);
let classType: Type;
if (location.flags & NodeFlags.Static) {
classType = getTypeOfSymbol(symbol);
if (getPropertyOfType(classType, name)) {
error(errorLocation, Diagnostics.Cannot_find_name_0_Did_you_mean_the_static_member_1_0, typeof nameArg === "string" ? nameArg : declarationNameToString(nameArg), symbolToString(symbol));
return true;
}
}
else {
if (location === container) {
classType = (<InterfaceType>getDeclaredTypeOfSymbol(symbol)).thisType;
if (getPropertyOfType(classType, name)) {
error(errorLocation, Diagnostics.Cannot_find_name_0_Did_you_mean_the_instance_member_this_0, typeof nameArg === "string" ? nameArg : declarationNameToString(nameArg));
return true;
}
}
}
}
location = location.parent;
}
return false;
}
function checkResolvedBlockScopedVariable(result: Symbol, errorLocation: Node): void {
Debug.assert((result.flags & SymbolFlags.BlockScopedVariable) !== 0);
// Block-scoped variables cannot be used before their definition

11
src/compiler/core.ts
View File

@@ -616,7 +616,9 @@ namespace ts {
return path.substr(0, rootLength) + normalized.join(directorySeparator);
}
export function getDirectoryPath(path: string) {
export function getDirectoryPath(path: Path): Path;
export function getDirectoryPath(path: string): string;
export function getDirectoryPath(path: string): any {
return path.substr(0, Math.max(getRootLength(path), path.lastIndexOf(directorySeparator)));
}
@@ -874,4 +876,11 @@ namespace ts {
}
return copiedList;
}
export function createGetCanonicalFileName(useCaseSensitivefileNames: boolean): (fileName: string) => string {
return useCaseSensitivefileNames
? ((fileName) => fileName)
: ((fileName) => fileName.toLowerCase());
}
}

22
src/compiler/diagnosticMessages.json
View File

@@ -1767,34 +1767,42 @@
"category": "Error",
"code": 2661
},
"Invalid module name in augmentation, module '{0}' cannot be found.": {
"Cannot find name '{0}'. Did you mean the static member '{1}.{0}'?": {
"category": "Error",
"code": 2662
},
"Module augmentation cannot introduce new names in the top level scope.": {
"Cannot find name '{0}'. Did you mean the instance member 'this.{0}'?": {
"category": "Error",
"code": 2663
},
"Exports and export assignments are not permitted in module augmentations.": {
"Invalid module name in augmentation, module '{0}' cannot be found.": {
"category": "Error",
"code": 2664
},
"Imports are not permitted in module augmentations. Consider moving them to the enclosing external module.": {
"Module augmentation cannot introduce new names in the top level scope.": {
"category": "Error",
"code": 2665
},
"'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible.": {
"Exports and export assignments are not permitted in module augmentations.": {
"category": "Error",
"code": 2666
},
"Augmentations for the global scope can only be directly nested in external modules or ambient module declarations.": {
"Imports are not permitted in module augmentations. Consider moving them to the enclosing external module.": {
"category": "Error",
"code": 2667
},
"Augmentations for the global scope should have 'declare' modifier unless they appear in already ambient context.": {
"'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible.": {
"category": "Error",
"code": 2668
},
"Augmentations for the global scope can only be directly nested in external modules or ambient module declarations.": {
"category": "Error",
"code": 2669
},
"Augmentations for the global scope should have 'declare' modifier unless they appear in already ambient context.": {
"category": "Error",
"code": 2670
},
"Import declaration '{0}' is using private name '{1}'.": {
"category": "Error",
"code": 4000

146
src/compiler/sys.ts
View File

@@ -1,6 +1,9 @@
/// <reference path="core.ts"/>
namespace ts {
export type FileWatcherCallback = (path: string, removed?: boolean) => void;
export type DirectoryWatcherCallback = (path: string) => void;
export interface System {
args: string[];
newLine: string;
@@ -8,8 +11,8 @@ namespace ts {
write(s: string): void;
readFile(path: string, encoding?: string): string;
writeFile(path: string, data: string, writeByteOrderMark?: boolean): void;
watchFile?(path: string, callback: (path: string, removed?: boolean) => void): FileWatcher;
watchDirectory?(path: string, callback: (path: string) => void, recursive?: boolean): FileWatcher;
watchFile?(path: Path, callback: FileWatcherCallback): FileWatcher;
watchDirectory?(path: string, callback: DirectoryWatcherCallback, recursive?: boolean): FileWatcher;
resolvePath(path: string): string;
fileExists(path: string): boolean;
directoryExists(path: string): boolean;
@@ -22,15 +25,20 @@ namespace ts {
}
interface WatchedFile {
fileName: string;
callback: (fileName: string, removed?: boolean) => void;
mtime: Date;
filePath: Path;
callback: FileWatcherCallback;
mtime?: Date;
}
export interface FileWatcher {
close(): void;
}
export interface DirectoryWatcher extends FileWatcher {
directoryPath: Path;
referenceCount: number;
}
declare var require: any;
declare var module: any;
declare var process: any;
@@ -62,8 +70,8 @@ namespace ts {
readFile(path: string): string;
writeFile(path: string, contents: string): void;
readDirectory(path: string, extension?: string, exclude?: string[]): string[];
watchFile?(path: string, callback: (path: string, removed?: boolean) => void): FileWatcher;
watchDirectory?(path: string, callback: (path: string) => void, recursive?: boolean): FileWatcher;
watchFile?(path: string, callback: FileWatcherCallback): FileWatcher;
watchDirectory?(path: string, callback: DirectoryWatcherCallback, recursive?: boolean): FileWatcher;
};
export var sys: System = (function () {
@@ -221,7 +229,7 @@ namespace ts {
// average async stat takes about 30 microseconds
// set chunk size to do 30 files in < 1 millisecond
function createWatchedFileSet(interval = 2500, chunkSize = 30) {
function createPollingWatchedFileSet(interval = 2500, chunkSize = 30) {
let watchedFiles: WatchedFile[] = [];
let nextFileToCheck = 0;
let watchTimer: any;
@@ -236,13 +244,13 @@ namespace ts {
return;
}
_fs.stat(watchedFile.fileName, (err: any, stats: any) => {
_fs.stat(watchedFile.filePath, (err: any, stats: any) => {
if (err) {
watchedFile.callback(watchedFile.fileName);
watchedFile.callback(watchedFile.filePath);
}
else if (watchedFile.mtime.getTime() !== stats.mtime.getTime()) {
watchedFile.mtime = getModifiedTime(watchedFile.fileName);
watchedFile.callback(watchedFile.fileName, watchedFile.mtime.getTime() === 0);
watchedFile.mtime = getModifiedTime(watchedFile.filePath);
watchedFile.callback(watchedFile.filePath, watchedFile.mtime.getTime() === 0);
}
});
}
@@ -270,11 +278,11 @@ namespace ts {
}, interval);
}
function addFile(fileName: string, callback: (fileName: string, removed?: boolean) => void): WatchedFile {
function addFile(filePath: Path, callback: FileWatcherCallback): WatchedFile {
const file: WatchedFile = {
fileName,
filePath,
callback,
mtime: getModifiedTime(fileName)
mtime: getModifiedTime(filePath)
};
watchedFiles.push(file);
@@ -297,6 +305,88 @@ namespace ts {
};
}
function createWatchedFileSet() {
const dirWatchers = createFileMap<DirectoryWatcher>();
// One file can have multiple watchers
const fileWatcherCallbacks = createFileMap<FileWatcherCallback[]>();
return { addFile, removeFile };
function reduceDirWatcherRefCountForFile(filePath: Path) {
const dirPath = getDirectoryPath(filePath);
if (dirWatchers.contains(dirPath)) {
const watcher = dirWatchers.get(dirPath);
watcher.referenceCount -= 1;
if (watcher.referenceCount <= 0) {
watcher.close();
dirWatchers.remove(dirPath);
}
}
}
function addDirWatcher(dirPath: Path): void {
if (dirWatchers.contains(dirPath)) {
const watcher = dirWatchers.get(dirPath);
watcher.referenceCount += 1;
return;
}
const watcher: DirectoryWatcher = _fs.watch(
dirPath,
{ persistent: true },
(eventName: string, relativeFileName: string) => fileEventHandler(eventName, relativeFileName, dirPath)
);
watcher.referenceCount = 1;
dirWatchers.set(dirPath, watcher);
return;
}
function addFileWatcherCallback(filePath: Path, callback: FileWatcherCallback): void {
if (fileWatcherCallbacks.contains(filePath)) {
fileWatcherCallbacks.get(filePath).push(callback);
}
else {
fileWatcherCallbacks.set(filePath, [callback]);
}
}
function addFile(filePath: Path, callback: FileWatcherCallback): WatchedFile {
addFileWatcherCallback(filePath, callback);
addDirWatcher(getDirectoryPath(filePath));
return { filePath, callback };
}
function removeFile(watchedFile: WatchedFile) {
removeFileWatcherCallback(watchedFile.filePath, watchedFile.callback);
reduceDirWatcherRefCountForFile(watchedFile.filePath);
}
function removeFileWatcherCallback(filePath: Path, callback: FileWatcherCallback) {
if (fileWatcherCallbacks.contains(filePath)) {
const newCallbacks = copyListRemovingItem(callback, fileWatcherCallbacks.get(filePath));
if (newCallbacks.length === 0) {
fileWatcherCallbacks.remove(filePath);
}
else {
fileWatcherCallbacks.set(filePath, newCallbacks);
}
}
}
/**
* @param watcherPath is the path from which the watcher is triggered.
*/
function fileEventHandler(eventName: string, relativefileName: string, baseDirPath: Path) {
// When files are deleted from disk, the triggered "rename" event would have a relativefileName of "undefined"
const filePath = relativefileName === undefined ? undefined : toPath(relativefileName, baseDirPath, getCanonicalPath);
if (eventName === "change" && fileWatcherCallbacks.contains(filePath)) {
for (const fileCallback of fileWatcherCallbacks.get(filePath)) {
fileCallback(filePath);
}
}
}
}
// REVIEW: for now this implementation uses polling.
// The advantage of polling is that it works reliably
// on all os and with network mounted files.
@@ -310,8 +400,13 @@ namespace ts {
// changes for large reference sets? If so, do we want
// to increase the chunk size or decrease the interval
// time dynamically to match the large reference set?
const pollingWatchedFileSet = createPollingWatchedFileSet();
const watchedFileSet = createWatchedFileSet();
function isNode4OrLater(): boolean {
return parseInt(process.version.charAt(1)) >= 4;
}
const platform: string = _os.platform();
// win32\win64 are case insensitive platforms, MacOS (darwin) by default is also case insensitive
const useCaseSensitiveFileNames = platform !== "win32" && platform !== "win64" && platform !== "darwin";
@@ -405,29 +500,38 @@ namespace ts {
},
readFile,
writeFile,
watchFile: (fileName, callback) => {
watchFile: (filePath, callback) => {
// Node 4.0 stablized the `fs.watch` function on Windows which avoids polling
// and is more efficient than `fs.watchFile` (ref: https://github.com/nodejs/node/pull/2649
// and https://github.com/Microsoft/TypeScript/issues/4643), therefore
// if the current node.js version is newer than 4, use `fs.watch` instead.
const watchedFile = watchedFileSet.addFile(fileName, callback);
const watchSet = isNode4OrLater() ? watchedFileSet : pollingWatchedFileSet;
const watchedFile = watchSet.addFile(filePath, callback);
return {
close: () => watchedFileSet.removeFile(watchedFile)
close: () => watchSet.removeFile(watchedFile)
};
},
watchDirectory: (path, callback, recursive) => {
// Node 4.0 `fs.watch` function supports the "recursive" option on both OSX and Windows
// (ref: https://github.com/nodejs/node/pull/2649 and https://github.com/Microsoft/TypeScript/issues/4643)
let options: any;
if (isNode4OrLater() && (process.platform === "win32" || process.platform === "darwin")) {
options = { persistent: true, recursive: !!recursive };
}
else {
options = { persistent: true };
}
return _fs.watch(
path,
{ persistent: true, recursive: !!recursive },
options,
(eventName: string, relativeFileName: string) => {
// In watchDirectory we only care about adding and removing files (when event name is
// "rename"); changes made within files are handled by corresponding fileWatchers (when
// event name is "change")
if (eventName === "rename") {
// When deleting a file, the passed baseFileName is null
callback(!relativeFileName ? relativeFileName : normalizePath(ts.combinePaths(path, relativeFileName)));
callback(!relativeFileName ? relativeFileName : normalizePath(combinePaths(path, relativeFileName)));
};
}
);
@@ -511,5 +615,3 @@ namespace ts {
}
})();
}

6
src/compiler/tsc.ts
View File

@@ -334,7 +334,8 @@ namespace ts {
return sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped);
}
if (configFileName) {
configFileWatcher = sys.watchFile(configFileName, configFileChanged);
const configFilePath = toPath(configFileName, sys.getCurrentDirectory(), createGetCanonicalFileName(sys.useCaseSensitiveFileNames));
configFileWatcher = sys.watchFile(configFilePath, configFileChanged);
}
if (sys.watchDirectory && configFileName) {
const directory = ts.getDirectoryPath(configFileName);
@@ -442,7 +443,8 @@ namespace ts {
const sourceFile = hostGetSourceFile(fileName, languageVersion, onError);
if (sourceFile && compilerOptions.watch) {
// Attach a file watcher
sourceFile.fileWatcher = sys.watchFile(sourceFile.fileName, (fileName: string, removed?: boolean) => sourceFileChanged(sourceFile, removed));
const filePath = toPath(sourceFile.fileName, sys.getCurrentDirectory(), createGetCanonicalFileName(sys.useCaseSensitiveFileNames));
sourceFile.fileWatcher = sys.watchFile(filePath, (fileName: string, removed?: boolean) => sourceFileChanged(sourceFile, removed));
}
return sourceFile;
}

4
src/server/editorServices.ts
View File

@@ -1002,7 +1002,7 @@ namespace ts.server {
info.setFormatOptions(this.getFormatCodeOptions());
this.filenameToScriptInfo[fileName] = info;
if (!info.isOpen) {
info.fileWatcher = this.host.watchFile(fileName, _ => { this.watchedFileChanged(fileName); });
info.fileWatcher = this.host.watchFile(<Path>fileName, _ => { this.watchedFileChanged(fileName); });
}
}
}
@@ -1215,7 +1215,7 @@ namespace ts.server {
}
}
project.finishGraph();
project.projectFileWatcher = this.host.watchFile(configFilename, _ => this.watchedProjectConfigFileChanged(project));
project.projectFileWatcher = this.host.watchFile(<Path>configFilename, _ => this.watchedProjectConfigFileChanged(project));
this.log("Add recursive watcher for: " + ts.getDirectoryPath(configFilename));
project.directoryWatcher = this.host.watchDirectory(
ts.getDirectoryPath(configFilename),

7
src/services/services.ts
View File

@@ -2019,13 +2019,6 @@ namespace ts {
return createLanguageServiceSourceFile(sourceFile.fileName, scriptSnapshot, sourceFile.languageVersion, version, /*setNodeParents*/ true);
}
export function createGetCanonicalFileName(useCaseSensitivefileNames: boolean): (fileName: string) => string {
return useCaseSensitivefileNames
? ((fileName) => fileName)
: ((fileName) => fileName.toLowerCase());
}
export function createDocumentRegistry(useCaseSensitiveFileNames?: boolean, currentDirectory = ""): DocumentRegistry {
// Maps from compiler setting target (ES3, ES5, etc.) to all the cached documents we have
// for those settings.

4
tests/baselines/reference/YieldExpression11_es6.errors.txt
View File

@@ -1,5 +1,5 @@
tests/cases/conformance/es6/yieldExpressions/YieldExpression11_es6.ts(2,3): error TS1220: Generators are only available when targeting ECMAScript 6 or higher.
tests/cases/conformance/es6/yieldExpressions/YieldExpression11_es6.ts(3,11): error TS2304: Cannot find name 'foo'.
tests/cases/conformance/es6/yieldExpressions/YieldExpression11_es6.ts(3,11): error TS2663: Cannot find name 'foo'. Did you mean the instance member 'this.foo'?
==== tests/cases/conformance/es6/yieldExpressions/YieldExpression11_es6.ts (2 errors) ====
@@ -9,6 +9,6 @@ tests/cases/conformance/es6/yieldExpressions/YieldExpression11_es6.ts(3,11): err
!!! error TS1220: Generators are only available when targeting ECMAScript 6 or higher.
yield(foo);
~~~
!!! error TS2304: Cannot find name 'foo'.
!!! error TS2663: Cannot find name 'foo'. Did you mean the instance member 'this.foo'?
}
}

4
tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.errors.txt
View File

@@ -1,4 +1,4 @@
tests/cases/compiler/ambientExternalModuleInAnotherExternalModule.ts(5,16): error TS2662: Invalid module name in augmentation, module 'ext' cannot be found.
tests/cases/compiler/ambientExternalModuleInAnotherExternalModule.ts(5,16): error TS2664: Invalid module name in augmentation, module 'ext' cannot be found.
tests/cases/compiler/ambientExternalModuleInAnotherExternalModule.ts(10,22): error TS2307: Cannot find module 'ext'.
@@ -9,7 +9,7 @@ tests/cases/compiler/ambientExternalModuleInAnotherExternalModule.ts(10,22): err
declare module "ext" {
~~~~~
!!! error TS2662: Invalid module name in augmentation, module 'ext' cannot be found.
!!! error TS2664: Invalid module name in augmentation, module 'ext' cannot be found.
export class C { }
}

4
tests/baselines/reference/ambientExternalModuleInsideNonAmbient.errors.txt
View File

@@ -1,4 +1,4 @@
tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbient.ts(2,5): error TS2666: 'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible.
tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbient.ts(2,5): error TS2668: 'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible.
tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbient.ts(2,27): error TS2435: Ambient modules cannot be nested in other modules or namespaces.
@@ -6,7 +6,7 @@ tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbient.ts(2,27):
module M {
export declare module "M" { }
~~~~~~
!!! error TS2666: 'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible.
!!! error TS2668: 'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible.
~~~
!!! error TS2435: Ambient modules cannot be nested in other modules or namespaces.
}

8
tests/baselines/reference/ambientExternalModuleInsideNonAmbientExternalModule.errors.txt
View File

@@ -1,10 +1,10 @@
tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbientExternalModule.ts(1,1): error TS2666: 'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible.
tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbientExternalModule.ts(1,23): error TS2662: Invalid module name in augmentation, module 'M' cannot be found.
tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbientExternalModule.ts(1,1): error TS2668: 'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible.
tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbientExternalModule.ts(1,23): error TS2664: Invalid module name in augmentation, module 'M' cannot be found.
==== tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbientExternalModule.ts (2 errors) ====
export declare module "M" { }
~~~~~~
!!! error TS2666: 'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible.
!!! error TS2668: 'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible.
~~~
!!! error TS2662: Invalid module name in augmentation, module 'M' cannot be found.
!!! error TS2664: Invalid module name in augmentation, module 'M' cannot be found.

4
tests/baselines/reference/importDeclRefereingExternalModuleWithNoResolve.errors.txt
View File

@@ -1,6 +1,6 @@
tests/cases/compiler/importDeclRefereingExternalModuleWithNoResolve.ts(1,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
tests/cases/compiler/importDeclRefereingExternalModuleWithNoResolve.ts(1,20): error TS2307: Cannot find module 'externalModule'.
tests/cases/compiler/importDeclRefereingExternalModuleWithNoResolve.ts(2,16): error TS2662: Invalid module name in augmentation, module 'm1' cannot be found.
tests/cases/compiler/importDeclRefereingExternalModuleWithNoResolve.ts(2,16): error TS2664: Invalid module name in augmentation, module 'm1' cannot be found.
tests/cases/compiler/importDeclRefereingExternalModuleWithNoResolve.ts(3,26): error TS2307: Cannot find module 'externalModule'.
@@ -12,7 +12,7 @@ tests/cases/compiler/importDeclRefereingExternalModuleWithNoResolve.ts(3,26): er
!!! error TS2307: Cannot find module 'externalModule'.
declare module "m1" {
~~~~
!!! error TS2662: Invalid module name in augmentation, module 'm1' cannot be found.
!!! error TS2664: Invalid module name in augmentation, module 'm1' cannot be found.
import im2 = require("externalModule");
~~~~~~~~~~~~~~~~
!!! error TS2307: Cannot find module 'externalModule'.

8
tests/baselines/reference/initializerReferencingConstructorParameters.errors.txt
View File

@@ -1,9 +1,9 @@
tests/cases/conformance/classes/propertyMemberDeclarations/initializerReferencingConstructorParameters.ts(4,9): error TS2304: Cannot find name 'x'.
tests/cases/conformance/classes/propertyMemberDeclarations/initializerReferencingConstructorParameters.ts(5,15): error TS2304: Cannot find name 'x'.
tests/cases/conformance/classes/propertyMemberDeclarations/initializerReferencingConstructorParameters.ts(10,9): error TS2304: Cannot find name 'x'.
tests/cases/conformance/classes/propertyMemberDeclarations/initializerReferencingConstructorParameters.ts(10,9): error TS2663: Cannot find name 'x'. Did you mean the instance member 'this.x'?
tests/cases/conformance/classes/propertyMemberDeclarations/initializerReferencingConstructorParameters.ts(11,15): error TS2304: Cannot find name 'x'.
tests/cases/conformance/classes/propertyMemberDeclarations/initializerReferencingConstructorParameters.ts(17,15): error TS1003: Identifier expected.
tests/cases/conformance/classes/propertyMemberDeclarations/initializerReferencingConstructorParameters.ts(23,9): error TS2304: Cannot find name 'x'.
tests/cases/conformance/classes/propertyMemberDeclarations/initializerReferencingConstructorParameters.ts(23,9): error TS2663: Cannot find name 'x'. Did you mean the instance member 'this.x'?
==== tests/cases/conformance/classes/propertyMemberDeclarations/initializerReferencingConstructorParameters.ts (6 errors) ====
@@ -22,7 +22,7 @@ tests/cases/conformance/classes/propertyMemberDeclarations/initializerReferencin
class D {
a = x; // error
~
!!! error TS2304: Cannot find name 'x'.
!!! error TS2663: Cannot find name 'x'. Did you mean the instance member 'this.x'?
b: typeof x; // error
~
!!! error TS2304: Cannot find name 'x'.
@@ -41,6 +41,6 @@ tests/cases/conformance/classes/propertyMemberDeclarations/initializerReferencin
a = this.x; // ok
b = x; // error
~
!!! error TS2304: Cannot find name 'x'.
!!! error TS2663: Cannot find name 'x'. Did you mean the instance member 'this.x'?
constructor(public x: T) { }
}

8
tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.errors.txt
View File

@@ -1,5 +1,5 @@
tests/cases/compiler/map1.ts(7,15): error TS2663: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/map2.ts(6,15): error TS2663: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/map1.ts(7,15): error TS2665: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/map2.ts(6,15): error TS2665: Module augmentation cannot introduce new names in the top level scope.
==== tests/cases/compiler/map1.ts (1 errors) ====
@@ -11,7 +11,7 @@ tests/cases/compiler/map2.ts(6,15): error TS2663: Module augmentation cannot int
declare module "./observable" {
interface I {x0}
~
!!! error TS2663: Module augmentation cannot introduce new names in the top level scope.
!!! error TS2665: Module augmentation cannot introduce new names in the top level scope.
}
==== tests/cases/compiler/map2.ts (1 errors) ====
@@ -22,7 +22,7 @@ tests/cases/compiler/map2.ts(6,15): error TS2663: Module augmentation cannot int
declare module "./observable" {
interface I {x1}
~
!!! error TS2663: Module augmentation cannot introduce new names in the top level scope.
!!! error TS2665: Module augmentation cannot introduce new names in the top level scope.
}

76
tests/baselines/reference/moduleAugmentationDisallowedExtensions.errors.txt
View File

@@ -1,26 +1,26 @@
tests/cases/compiler/x.ts(7,9): error TS2663: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/x.ts(8,9): error TS2663: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/x.ts(9,11): error TS2663: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/x.ts(10,10): error TS2663: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/x.ts(10,14): error TS2663: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/x.ts(10,23): error TS2663: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/x.ts(10,38): error TS2663: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/x.ts(10,43): error TS2663: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/x.ts(10,48): error TS2663: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/x.ts(11,15): error TS2663: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/x.ts(12,15): error TS2663: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/x.ts(15,11): error TS2663: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/x.ts(16,14): error TS2663: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/x.ts(17,10): error TS2663: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/x.ts(18,5): error TS2665: Imports are not permitted in module augmentations. Consider moving them to the enclosing external module.
tests/cases/compiler/x.ts(7,9): error TS2665: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/x.ts(8,9): error TS2665: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/x.ts(9,11): error TS2665: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/x.ts(10,10): error TS2665: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/x.ts(10,14): error TS2665: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/x.ts(10,23): error TS2665: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/x.ts(10,38): error TS2665: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/x.ts(10,43): error TS2665: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/x.ts(10,48): error TS2665: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/x.ts(11,15): error TS2665: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/x.ts(12,15): error TS2665: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/x.ts(15,11): error TS2665: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/x.ts(16,14): error TS2665: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/x.ts(17,10): error TS2665: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/x.ts(18,5): error TS2667: Imports are not permitted in module augmentations. Consider moving them to the enclosing external module.
tests/cases/compiler/x.ts(18,26): error TS2307: Cannot find module './x0'.
tests/cases/compiler/x.ts(19,5): error TS2665: Imports are not permitted in module augmentations. Consider moving them to the enclosing external module.
tests/cases/compiler/x.ts(19,5): error TS2667: Imports are not permitted in module augmentations. Consider moving them to the enclosing external module.
tests/cases/compiler/x.ts(19,21): error TS2307: Cannot find module './x0'.
tests/cases/compiler/x.ts(20,5): error TS2664: Exports and export assignments are not permitted in module augmentations.
tests/cases/compiler/x.ts(20,5): error TS2666: Exports and export assignments are not permitted in module augmentations.
tests/cases/compiler/x.ts(20,19): error TS2307: Cannot find module './x0'.
tests/cases/compiler/x.ts(21,5): error TS2664: Exports and export assignments are not permitted in module augmentations.
tests/cases/compiler/x.ts(21,5): error TS2666: Exports and export assignments are not permitted in module augmentations.
tests/cases/compiler/x.ts(21,21): error TS2307: Cannot find module './x0'.
tests/cases/compiler/x.ts(25,5): error TS2664: Exports and export assignments are not permitted in module augmentations.
tests/cases/compiler/x.ts(25,5): error TS2666: Exports and export assignments are not permitted in module augmentations.
==== tests/cases/compiler/x0.ts (0 errors) ====
@@ -36,61 +36,61 @@ tests/cases/compiler/x.ts(25,5): error TS2664: Exports and export assignments ar
declare module "./observable" {
var x: number;
~
!!! error TS2663: Module augmentation cannot introduce new names in the top level scope.
!!! error TS2665: Module augmentation cannot introduce new names in the top level scope.
let y: number;
~
!!! error TS2663: Module augmentation cannot introduce new names in the top level scope.
!!! error TS2665: Module augmentation cannot introduce new names in the top level scope.
const z: number;
~
!!! error TS2663: Module augmentation cannot introduce new names in the top level scope.
!!! error TS2665: Module augmentation cannot introduce new names in the top level scope.
let {x1, y1, z0: {n}, z1: {arr: [el1, el2, el3]}}: {x1: number, y1: string, z0: {n: number}, z1: {arr: number[]} }
~~
!!! error TS2663: Module augmentation cannot introduce new names in the top level scope.
!!! error TS2665: Module augmentation cannot introduce new names in the top level scope.
~~
!!! error TS2663: Module augmentation cannot introduce new names in the top level scope.
!!! error TS2665: Module augmentation cannot introduce new names in the top level scope.
~
!!! error TS2663: Module augmentation cannot introduce new names in the top level scope.
!!! error TS2665: Module augmentation cannot introduce new names in the top level scope.
~~~
!!! error TS2663: Module augmentation cannot introduce new names in the top level scope.
!!! error TS2665: Module augmentation cannot introduce new names in the top level scope.
~~~
!!! error TS2663: Module augmentation cannot introduce new names in the top level scope.
!!! error TS2665: Module augmentation cannot introduce new names in the top level scope.
~~~
!!! error TS2663: Module augmentation cannot introduce new names in the top level scope.
!!! error TS2665: Module augmentation cannot introduce new names in the top level scope.
interface A { x }
~
!!! error TS2663: Module augmentation cannot introduce new names in the top level scope.
!!! error TS2665: Module augmentation cannot introduce new names in the top level scope.
namespace N {
~
!!! error TS2663: Module augmentation cannot introduce new names in the top level scope.
!!! error TS2665: Module augmentation cannot introduce new names in the top level scope.
export class C {}
}
class Cls {}
~~~
!!! error TS2663: Module augmentation cannot introduce new names in the top level scope.
!!! error TS2665: Module augmentation cannot introduce new names in the top level scope.
function foo(): number;
~~~
!!! error TS2663: Module augmentation cannot introduce new names in the top level scope.
!!! error TS2665: Module augmentation cannot introduce new names in the top level scope.
type T = number;
~
!!! error TS2663: Module augmentation cannot introduce new names in the top level scope.
!!! error TS2665: Module augmentation cannot introduce new names in the top level scope.
import * as all from "./x0";
~~~~~~
!!! error TS2665: Imports are not permitted in module augmentations. Consider moving them to the enclosing external module.
!!! error TS2667: Imports are not permitted in module augmentations. Consider moving them to the enclosing external module.
~~~~~~
!!! error TS2307: Cannot find module './x0'.
import {a} from "./x0";
~~~~~~
!!! error TS2665: Imports are not permitted in module augmentations. Consider moving them to the enclosing external module.
!!! error TS2667: Imports are not permitted in module augmentations. Consider moving them to the enclosing external module.
~~~~~~
!!! error TS2307: Cannot find module './x0'.
export * from "./x0";
~~~~~~
!!! error TS2664: Exports and export assignments are not permitted in module augmentations.
!!! error TS2666: Exports and export assignments are not permitted in module augmentations.
~~~~~~
!!! error TS2307: Cannot find module './x0'.
export {a} from "./x0";
~~~~~~
!!! error TS2664: Exports and export assignments are not permitted in module augmentations.
!!! error TS2666: Exports and export assignments are not permitted in module augmentations.
~~~~~~
!!! error TS2307: Cannot find module './x0'.
}
@@ -98,7 +98,7 @@ tests/cases/compiler/x.ts(25,5): error TS2664: Exports and export assignments ar
declare module "./test" {
export = N1;
~~~~~~
!!! error TS2664: Exports and export assignments are not permitted in module augmentations.
!!! error TS2666: Exports and export assignments are not permitted in module augmentations.
}
export {}

8
tests/baselines/reference/moduleAugmentationGlobal4.errors.txt
View File

@@ -1,5 +1,5 @@
tests/cases/compiler/f1.ts(3,15): error TS2663: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/f2.ts(3,15): error TS2663: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/f1.ts(3,15): error TS2665: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/f2.ts(3,15): error TS2665: Module augmentation cannot introduce new names in the top level scope.
==== tests/cases/compiler/f1.ts (1 errors) ====
@@ -7,7 +7,7 @@ tests/cases/compiler/f2.ts(3,15): error TS2663: Module augmentation cannot intro
declare global {
interface Something {x}
~~~~~~~~~
!!! error TS2663: Module augmentation cannot introduce new names in the top level scope.
!!! error TS2665: Module augmentation cannot introduce new names in the top level scope.
}
export {};
==== tests/cases/compiler/f2.ts (1 errors) ====
@@ -15,7 +15,7 @@ tests/cases/compiler/f2.ts(3,15): error TS2663: Module augmentation cannot intro
declare global {
interface Something {y}
~~~~~~~~~
!!! error TS2663: Module augmentation cannot introduce new names in the top level scope.
!!! error TS2665: Module augmentation cannot introduce new names in the top level scope.
}
export {};
==== tests/cases/compiler/f3.ts (0 errors) ====

8
tests/baselines/reference/moduleAugmentationGlobal5.errors.txt
View File

@@ -1,5 +1,5 @@
tests/cases/compiler/f1.d.ts(4,19): error TS2663: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/f2.d.ts(3,19): error TS2663: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/f1.d.ts(4,19): error TS2665: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/f2.d.ts(3,19): error TS2665: Module augmentation cannot introduce new names in the top level scope.
==== tests/cases/compiler/f3.ts (0 errors) ====
@@ -15,7 +15,7 @@ tests/cases/compiler/f2.d.ts(3,19): error TS2663: Module augmentation cannot int
global {
interface Something {x}
~~~~~~~~~
!!! error TS2663: Module augmentation cannot introduce new names in the top level scope.
!!! error TS2665: Module augmentation cannot introduce new names in the top level scope.
}
}
==== tests/cases/compiler/f2.d.ts (1 errors) ====
@@ -23,6 +23,6 @@ tests/cases/compiler/f2.d.ts(3,19): error TS2663: Module augmentation cannot int
global {
interface Something {y}
~~~~~~~~~
!!! error TS2663: Module augmentation cannot introduce new names in the top level scope.
!!! error TS2665: Module augmentation cannot introduce new names in the top level scope.
}
}

4
tests/baselines/reference/moduleAugmentationGlobal6.errors.txt
View File

@@ -1,9 +1,9 @@
tests/cases/compiler/moduleAugmentationGlobal6.ts(1,9): error TS2667: Augmentations for the global scope can only be directly nested in external modules or ambient module declarations.
tests/cases/compiler/moduleAugmentationGlobal6.ts(1,9): error TS2669: Augmentations for the global scope can only be directly nested in external modules or ambient module declarations.
==== tests/cases/compiler/moduleAugmentationGlobal6.ts (1 errors) ====
declare global {
~~~~~~
!!! error TS2667: Augmentations for the global scope can only be directly nested in external modules or ambient module declarations.
!!! error TS2669: Augmentations for the global scope can only be directly nested in external modules or ambient module declarations.
interface Array<T> { x }
}

8
tests/baselines/reference/moduleAugmentationGlobal6_1.errors.txt
View File

@@ -1,12 +1,12 @@
tests/cases/compiler/moduleAugmentationGlobal6_1.ts(1,1): error TS2667: Augmentations for the global scope can only be directly nested in external modules or ambient module declarations.
tests/cases/compiler/moduleAugmentationGlobal6_1.ts(1,1): error TS2668: Augmentations for the global scope should have 'declare' modifier unless they appear in already ambient context.
tests/cases/compiler/moduleAugmentationGlobal6_1.ts(1,1): error TS2669: Augmentations for the global scope can only be directly nested in external modules or ambient module declarations.
tests/cases/compiler/moduleAugmentationGlobal6_1.ts(1,1): error TS2670: Augmentations for the global scope should have 'declare' modifier unless they appear in already ambient context.
==== tests/cases/compiler/moduleAugmentationGlobal6_1.ts (2 errors) ====
global {
~~~~~~
!!! error TS2667: Augmentations for the global scope can only be directly nested in external modules or ambient module declarations.
!!! error TS2669: Augmentations for the global scope can only be directly nested in external modules or ambient module declarations.
~~~~~~
!!! error TS2668: Augmentations for the global scope should have 'declare' modifier unless they appear in already ambient context.
!!! error TS2670: Augmentations for the global scope should have 'declare' modifier unless they appear in already ambient context.
interface Array<T> { x }
}

4
tests/baselines/reference/moduleAugmentationGlobal7.errors.txt
View File

@@ -1,11 +1,11 @@
tests/cases/compiler/moduleAugmentationGlobal7.ts(2,13): error TS2667: Augmentations for the global scope can only be directly nested in external modules or ambient module declarations.
tests/cases/compiler/moduleAugmentationGlobal7.ts(2,13): error TS2669: Augmentations for the global scope can only be directly nested in external modules or ambient module declarations.
==== tests/cases/compiler/moduleAugmentationGlobal7.ts (1 errors) ====
namespace A {
declare global {
~~~~~~
!!! error TS2667: Augmentations for the global scope can only be directly nested in external modules or ambient module declarations.
!!! error TS2669: Augmentations for the global scope can only be directly nested in external modules or ambient module declarations.
interface Array<T> { x }
}
}

8
tests/baselines/reference/moduleAugmentationGlobal7_1.errors.txt
View File

@@ -1,14 +1,14 @@
tests/cases/compiler/moduleAugmentationGlobal7_1.ts(2,5): error TS2667: Augmentations for the global scope can only be directly nested in external modules or ambient module declarations.
tests/cases/compiler/moduleAugmentationGlobal7_1.ts(2,5): error TS2668: Augmentations for the global scope should have 'declare' modifier unless they appear in already ambient context.
tests/cases/compiler/moduleAugmentationGlobal7_1.ts(2,5): error TS2669: Augmentations for the global scope can only be directly nested in external modules or ambient module declarations.
tests/cases/compiler/moduleAugmentationGlobal7_1.ts(2,5): error TS2670: Augmentations for the global scope should have 'declare' modifier unless they appear in already ambient context.
==== tests/cases/compiler/moduleAugmentationGlobal7_1.ts (2 errors) ====
namespace A {
global {
~~~~~~
!!! error TS2667: Augmentations for the global scope can only be directly nested in external modules or ambient module declarations.
!!! error TS2669: Augmentations for the global scope can only be directly nested in external modules or ambient module declarations.
~~~~~~
!!! error TS2668: Augmentations for the global scope should have 'declare' modifier unless they appear in already ambient context.
!!! error TS2670: Augmentations for the global scope should have 'declare' modifier unless they appear in already ambient context.
interface Array<T> { x }
}
}

4
tests/baselines/reference/moduleAugmentationGlobal8.errors.txt
View File

@@ -1,11 +1,11 @@
tests/cases/compiler/moduleAugmentationGlobal8.ts(2,13): error TS2667: Augmentations for the global scope can only be directly nested in external modules or ambient module declarations.
tests/cases/compiler/moduleAugmentationGlobal8.ts(2,13): error TS2669: Augmentations for the global scope can only be directly nested in external modules or ambient module declarations.
==== tests/cases/compiler/moduleAugmentationGlobal8.ts (1 errors) ====
namespace A {
declare global {
~~~~~~
!!! error TS2667: Augmentations for the global scope can only be directly nested in external modules or ambient module declarations.
!!! error TS2669: Augmentations for the global scope can only be directly nested in external modules or ambient module declarations.
interface Array<T> { x }
}
}

8
tests/baselines/reference/moduleAugmentationGlobal8_1.errors.txt
View File

@@ -1,14 +1,14 @@
tests/cases/compiler/moduleAugmentationGlobal8_1.ts(2,5): error TS2667: Augmentations for the global scope can only be directly nested in external modules or ambient module declarations.
tests/cases/compiler/moduleAugmentationGlobal8_1.ts(2,5): error TS2668: Augmentations for the global scope should have 'declare' modifier unless they appear in already ambient context.
tests/cases/compiler/moduleAugmentationGlobal8_1.ts(2,5): error TS2669: Augmentations for the global scope can only be directly nested in external modules or ambient module declarations.
tests/cases/compiler/moduleAugmentationGlobal8_1.ts(2,5): error TS2670: Augmentations for the global scope should have 'declare' modifier unless they appear in already ambient context.
==== tests/cases/compiler/moduleAugmentationGlobal8_1.ts (2 errors) ====
namespace A {
global {
~~~~~~
!!! error TS2667: Augmentations for the global scope can only be directly nested in external modules or ambient module declarations.
!!! error TS2669: Augmentations for the global scope can only be directly nested in external modules or ambient module declarations.
~~~~~~
!!! error TS2668: Augmentations for the global scope should have 'declare' modifier unless they appear in already ambient context.
!!! error TS2670: Augmentations for the global scope should have 'declare' modifier unless they appear in already ambient context.
interface Array<T> { x }
}
}

20
tests/baselines/reference/moduleAugmentationImportsAndExports2.errors.txt
View File

@@ -1,12 +1,12 @@
tests/cases/compiler/f3.ts(11,5): error TS2665: Imports are not permitted in module augmentations. Consider moving them to the enclosing external module.
tests/cases/compiler/f3.ts(11,5): error TS2667: Imports are not permitted in module augmentations. Consider moving them to the enclosing external module.
tests/cases/compiler/f3.ts(11,21): error TS2307: Cannot find module './f2'.
tests/cases/compiler/f3.ts(12,5): error TS2664: Exports and export assignments are not permitted in module augmentations.
tests/cases/compiler/f3.ts(12,5): error TS2666: Exports and export assignments are not permitted in module augmentations.
tests/cases/compiler/f3.ts(12,21): error TS2307: Cannot find module './f2'.
tests/cases/compiler/f3.ts(13,12): error TS2663: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/f3.ts(13,12): error TS2665: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/f3.ts(13,16): error TS4000: Import declaration 'I' is using private name 'N'.
tests/cases/compiler/f3.ts(14,12): error TS2663: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/f3.ts(14,12): error TS2665: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/f3.ts(14,16): error TS4000: Import declaration 'C' is using private name 'N'.
tests/cases/compiler/f3.ts(16,15): error TS2663: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/f3.ts(16,15): error TS2665: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/f4.ts(5,11): error TS2339: Property 'foo' does not exist on type 'A'.
@@ -32,28 +32,28 @@ tests/cases/compiler/f4.ts(5,11): error TS2339: Property 'foo' does not exist on
declare module "./f1" {
import {B} from "./f2";
~~~~~~
!!! error TS2665: Imports are not permitted in module augmentations. Consider moving them to the enclosing external module.
!!! error TS2667: Imports are not permitted in module augmentations. Consider moving them to the enclosing external module.
~~~~~~
!!! error TS2307: Cannot find module './f2'.
export {B} from "./f2";
~~~~~~
!!! error TS2664: Exports and export assignments are not permitted in module augmentations.
!!! error TS2666: Exports and export assignments are not permitted in module augmentations.
~~~~~~
!!! error TS2307: Cannot find module './f2'.
import I = N.Ifc;
~
!!! error TS2663: Module augmentation cannot introduce new names in the top level scope.
!!! error TS2665: Module augmentation cannot introduce new names in the top level scope.
~
!!! error TS4000: Import declaration 'I' is using private name 'N'.
import C = N.Cls;
~
!!! error TS2663: Module augmentation cannot introduce new names in the top level scope.
!!! error TS2665: Module augmentation cannot introduce new names in the top level scope.
~
!!! error TS4000: Import declaration 'C' is using private name 'N'.
// should have explicit export
interface A {
~
!!! error TS2663: Module augmentation cannot introduce new names in the top level scope.
!!! error TS2665: Module augmentation cannot introduce new names in the top level scope.
foo(): B;
bar(): I;
baz(): C;

12
tests/baselines/reference/moduleAugmentationImportsAndExports3.errors.txt
View File

@@ -1,8 +1,8 @@
tests/cases/compiler/f3.ts(11,5): error TS2665: Imports are not permitted in module augmentations. Consider moving them to the enclosing external module.
tests/cases/compiler/f3.ts(11,5): error TS2667: Imports are not permitted in module augmentations. Consider moving them to the enclosing external module.
tests/cases/compiler/f3.ts(11,21): error TS2307: Cannot find module './f2'.
tests/cases/compiler/f3.ts(12,12): error TS2663: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/f3.ts(12,12): error TS2665: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/f3.ts(12,16): error TS4000: Import declaration 'I' is using private name 'N'.
tests/cases/compiler/f3.ts(13,12): error TS2663: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/f3.ts(13,12): error TS2665: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/f3.ts(13,16): error TS4000: Import declaration 'C' is using private name 'N'.
@@ -28,17 +28,17 @@ tests/cases/compiler/f3.ts(13,16): error TS4000: Import declaration 'C' is using
declare module "./f1" {
import {B} from "./f2";
~~~~~~
!!! error TS2665: Imports are not permitted in module augmentations. Consider moving them to the enclosing external module.
!!! error TS2667: Imports are not permitted in module augmentations. Consider moving them to the enclosing external module.
~~~~~~
!!! error TS2307: Cannot find module './f2'.
import I = N.Ifc;
~
!!! error TS2663: Module augmentation cannot introduce new names in the top level scope.
!!! error TS2665: Module augmentation cannot introduce new names in the top level scope.
~
!!! error TS4000: Import declaration 'I' is using private name 'N'.
import C = N.Cls;
~
!!! error TS2663: Module augmentation cannot introduce new names in the top level scope.
!!! error TS2665: Module augmentation cannot introduce new names in the top level scope.
~
!!! error TS4000: Import declaration 'C' is using private name 'N'.
interface A {

24
tests/baselines/reference/moduleAugmentationNoNewNames.errors.txt
View File

@@ -1,9 +1,9 @@
tests/cases/compiler/map.ts(10,11): error TS2663: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/map.ts(11,9): error TS2663: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/map.ts(11,20): error TS2663: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/map.ts(12,13): error TS2663: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/map.ts(12,19): error TS2663: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/map.ts(13,12): error TS2663: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/map.ts(10,11): error TS2665: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/map.ts(11,9): error TS2665: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/map.ts(11,20): error TS2665: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/map.ts(12,13): error TS2665: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/map.ts(12,19): error TS2665: Module augmentation cannot introduce new names in the top level scope.
tests/cases/compiler/map.ts(13,12): error TS2665: Module augmentation cannot introduce new names in the top level scope.
==== tests/cases/compiler/map.ts (6 errors) ====
@@ -18,20 +18,20 @@ tests/cases/compiler/map.ts(13,12): error TS2663: Module augmentation cannot int
}
class Bar {}
~~~
!!! error TS2663: Module augmentation cannot introduce new names in the top level scope.
!!! error TS2665: Module augmentation cannot introduce new names in the top level scope.
let y: number, z: string;
~
!!! error TS2663: Module augmentation cannot introduce new names in the top level scope.
!!! error TS2665: Module augmentation cannot introduce new names in the top level scope.
~
!!! error TS2663: Module augmentation cannot introduce new names in the top level scope.
!!! error TS2665: Module augmentation cannot introduce new names in the top level scope.
let {a: x, b: x1}: {a: number, b: number};
~
!!! error TS2663: Module augmentation cannot introduce new names in the top level scope.
!!! error TS2665: Module augmentation cannot introduce new names in the top level scope.
~~
!!! error TS2663: Module augmentation cannot introduce new names in the top level scope.
!!! error TS2665: Module augmentation cannot introduce new names in the top level scope.
module Z {}
~
!!! error TS2663: Module augmentation cannot introduce new names in the top level scope.
!!! error TS2665: Module augmentation cannot introduce new names in the top level scope.
}
==== tests/cases/compiler/observable.ts (0 errors) ====

20
tests/baselines/reference/parserharness.errors.txt
View File

@@ -7,11 +7,11 @@ tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(25,17): er
tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(41,12): error TS2304: Cannot find name 'ActiveXObject'.
tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(43,19): error TS2304: Cannot find name 'require'.
tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(44,14): error TS2304: Cannot find name 'require'.
tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(341,13): error TS2304: Cannot find name 'errorHandlerStack'.
tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(347,13): error TS2304: Cannot find name 'errorHandlerStack'.
tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(351,17): error TS2304: Cannot find name 'errorHandlerStack'.
tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(354,17): error TS2304: Cannot find name 'errorHandlerStack'.
tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(354,35): error TS2304: Cannot find name 'errorHandlerStack'.
tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(341,13): error TS2662: Cannot find name 'errorHandlerStack'. Did you mean the static member 'Runnable.errorHandlerStack'?
tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(347,13): error TS2662: Cannot find name 'errorHandlerStack'. Did you mean the static member 'Runnable.errorHandlerStack'?
tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(351,17): error TS2662: Cannot find name 'errorHandlerStack'. Did you mean the static member 'Runnable.errorHandlerStack'?
tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(354,17): error TS2662: Cannot find name 'errorHandlerStack'. Did you mean the static member 'Runnable.errorHandlerStack'?
tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(354,35): error TS2662: Cannot find name 'errorHandlerStack'. Did you mean the static member 'Runnable.errorHandlerStack'?
tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(691,50): error TS2304: Cannot find name 'ITextWriter'.
tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(716,47): error TS2503: Cannot find namespace 'TypeScript'.
tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(721,62): error TS2304: Cannot find name 'ITextWriter'.
@@ -471,7 +471,7 @@ tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(2030,32):
static pushGlobalErrorHandler(done: IDone) {
errorHandlerStack.push(function (e) {
~~~~~~~~~~~~~~~~~
!!! error TS2304: Cannot find name 'errorHandlerStack'.
!!! error TS2662: Cannot find name 'errorHandlerStack'. Did you mean the static member 'Runnable.errorHandlerStack'?
done(e);
});
}
@@ -479,20 +479,20 @@ tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(2030,32):
static popGlobalErrorHandler() {
errorHandlerStack.pop();
~~~~~~~~~~~~~~~~~
!!! error TS2304: Cannot find name 'errorHandlerStack'.
!!! error TS2662: Cannot find name 'errorHandlerStack'. Did you mean the static member 'Runnable.errorHandlerStack'?
}
static handleError(e: Error) {
if (errorHandlerStack.length === 0) {
~~~~~~~~~~~~~~~~~
!!! error TS2304: Cannot find name 'errorHandlerStack'.
!!! error TS2662: Cannot find name 'errorHandlerStack'. Did you mean the static member 'Runnable.errorHandlerStack'?
IO.printLine('Global error: ' + e);
} else {
errorHandlerStack[errorHandlerStack.length - 1](e);
~~~~~~~~~~~~~~~~~
!!! error TS2304: Cannot find name 'errorHandlerStack'.
!!! error TS2662: Cannot find name 'errorHandlerStack'. Did you mean the static member 'Runnable.errorHandlerStack'?
~~~~~~~~~~~~~~~~~
!!! error TS2304: Cannot find name 'errorHandlerStack'.
!!! error TS2662: Cannot find name 'errorHandlerStack'. Did you mean the static member 'Runnable.errorHandlerStack'?
}
}
}

4
tests/baselines/reference/parserindenter.errors.txt
View File

@@ -28,7 +28,7 @@ tests/cases/conformance/parser/ecmascript5/RealWorld/parserindenter.ts(152,63):
tests/cases/conformance/parser/ecmascript5/RealWorld/parserindenter.ts(153,30): error TS2304: Cannot find name 'List_TextEditInfo'.
tests/cases/conformance/parser/ecmascript5/RealWorld/parserindenter.ts(155,32): error TS2304: Cannot find name 'AuthorTokenKind'.
tests/cases/conformance/parser/ecmascript5/RealWorld/parserindenter.ts(182,79): error TS2503: Cannot find namespace 'Services'.
tests/cases/conformance/parser/ecmascript5/RealWorld/parserindenter.ts(183,20): error TS2304: Cannot find name 'GetIndentSizeFromText'.
tests/cases/conformance/parser/ecmascript5/RealWorld/parserindenter.ts(183,20): error TS2662: Cannot find name 'GetIndentSizeFromText'. Did you mean the static member 'Indenter.GetIndentSizeFromText'?
tests/cases/conformance/parser/ecmascript5/RealWorld/parserindenter.ts(186,67): error TS2503: Cannot find namespace 'Services'.
tests/cases/conformance/parser/ecmascript5/RealWorld/parserindenter.ts(207,50): error TS2304: Cannot find name 'TokenSpan'.
tests/cases/conformance/parser/ecmascript5/RealWorld/parserindenter.ts(207,67): error TS2304: Cannot find name 'ParseNode'.
@@ -373,7 +373,7 @@ tests/cases/conformance/parser/ecmascript5/RealWorld/parserindenter.ts(736,38):
!!! error TS2503: Cannot find namespace 'Services'.
return GetIndentSizeFromText(indentText, editorOptions, /*includeNonIndentChars:*/ false);
~~~~~~~~~~~~~~~~~~~~~
!!! error TS2304: Cannot find name 'GetIndentSizeFromText'.
!!! error TS2662: Cannot find name 'GetIndentSizeFromText'. Did you mean the static member 'Indenter.GetIndentSizeFromText'?
}
static GetIndentSizeFromText(text: string, editorOptions: Services.EditorOptions, includeNonIndentChars: boolean): number {

8
tests/baselines/reference/privacyGloImportParseErrors.errors.txt
View File

@@ -1,4 +1,4 @@
tests/cases/compiler/privacyGloImportParseErrors.ts(22,5): error TS2666: 'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible.
tests/cases/compiler/privacyGloImportParseErrors.ts(22,5): error TS2668: 'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible.
tests/cases/compiler/privacyGloImportParseErrors.ts(22,27): error TS2435: Ambient modules cannot be nested in other modules or namespaces.
tests/cases/compiler/privacyGloImportParseErrors.ts(30,20): error TS2435: Ambient modules cannot be nested in other modules or namespaces.
tests/cases/compiler/privacyGloImportParseErrors.ts(49,29): error TS4000: Import declaration 'm1_im2_private' is using private name 'm1_M2_private'.
@@ -14,7 +14,7 @@ tests/cases/compiler/privacyGloImportParseErrors.ts(125,45): error TS1147: Impor
tests/cases/compiler/privacyGloImportParseErrors.ts(133,9): error TS1038: A 'declare' modifier cannot be used in an already ambient context.
tests/cases/compiler/privacyGloImportParseErrors.ts(133,24): error TS2435: Ambient modules cannot be nested in other modules or namespaces.
tests/cases/compiler/privacyGloImportParseErrors.ts(138,16): error TS2435: Ambient modules cannot be nested in other modules or namespaces.
tests/cases/compiler/privacyGloImportParseErrors.ts(141,12): error TS2662: Invalid module name in augmentation, module 'abc3' cannot be found.
tests/cases/compiler/privacyGloImportParseErrors.ts(141,12): error TS2664: Invalid module name in augmentation, module 'abc3' cannot be found.
tests/cases/compiler/privacyGloImportParseErrors.ts(146,25): error TS1147: Import declarations in a namespace cannot reference a module.
tests/cases/compiler/privacyGloImportParseErrors.ts(149,29): error TS1147: Import declarations in a namespace cannot reference a module.
@@ -43,7 +43,7 @@ tests/cases/compiler/privacyGloImportParseErrors.ts(149,29): error TS1147: Impor
export declare module "m1_M3_public" {
~~~~~~
!!! error TS2666: 'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible.
!!! error TS2668: 'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible.
~~~~~~~~~~~~~~
!!! error TS2435: Ambient modules cannot be nested in other modules or namespaces.
export function f1();
@@ -194,7 +194,7 @@ tests/cases/compiler/privacyGloImportParseErrors.ts(149,29): error TS1147: Impor
}
module "abc3" {
~~~~~~
!!! error TS2662: Invalid module name in augmentation, module 'abc3' cannot be found.
!!! error TS2664: Invalid module name in augmentation, module 'abc3' cannot be found.
}
}

48
tests/baselines/reference/privacyImportParseErrors.errors.txt
View File

@@ -1,4 +1,4 @@
tests/cases/compiler/privacyImportParseErrors.ts(22,5): error TS2666: 'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible.
tests/cases/compiler/privacyImportParseErrors.ts(22,5): error TS2668: 'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible.
tests/cases/compiler/privacyImportParseErrors.ts(22,27): error TS2435: Ambient modules cannot be nested in other modules or namespaces.
tests/cases/compiler/privacyImportParseErrors.ts(30,20): error TS2435: Ambient modules cannot be nested in other modules or namespaces.
tests/cases/compiler/privacyImportParseErrors.ts(59,37): error TS1147: Import declarations in a namespace cannot reference a module.
@@ -7,7 +7,7 @@ tests/cases/compiler/privacyImportParseErrors.ts(69,37): error TS1147: Import de
tests/cases/compiler/privacyImportParseErrors.ts(69,37): error TS2307: Cannot find module 'm1_M4_private'.
tests/cases/compiler/privacyImportParseErrors.ts(81,43): error TS1147: Import declarations in a namespace cannot reference a module.
tests/cases/compiler/privacyImportParseErrors.ts(82,43): error TS1147: Import declarations in a namespace cannot reference a module.
tests/cases/compiler/privacyImportParseErrors.ts(106,5): error TS2666: 'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible.
tests/cases/compiler/privacyImportParseErrors.ts(106,5): error TS2668: 'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible.
tests/cases/compiler/privacyImportParseErrors.ts(106,27): error TS2435: Ambient modules cannot be nested in other modules or namespaces.
tests/cases/compiler/privacyImportParseErrors.ts(114,20): error TS2435: Ambient modules cannot be nested in other modules or namespaces.
tests/cases/compiler/privacyImportParseErrors.ts(143,37): error TS1147: Import declarations in a namespace cannot reference a module.
@@ -16,35 +16,35 @@ tests/cases/compiler/privacyImportParseErrors.ts(153,37): error TS1147: Import d
tests/cases/compiler/privacyImportParseErrors.ts(153,37): error TS2307: Cannot find module 'm2_M4_private'.
tests/cases/compiler/privacyImportParseErrors.ts(166,43): error TS1147: Import declarations in a namespace cannot reference a module.
tests/cases/compiler/privacyImportParseErrors.ts(167,43): error TS1147: Import declarations in a namespace cannot reference a module.
tests/cases/compiler/privacyImportParseErrors.ts(180,1): error TS2666: 'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible.
tests/cases/compiler/privacyImportParseErrors.ts(180,23): error TS2662: Invalid module name in augmentation, module 'glo_M2_public' cannot be found.
tests/cases/compiler/privacyImportParseErrors.ts(198,1): error TS2666: 'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible.
tests/cases/compiler/privacyImportParseErrors.ts(198,23): error TS2662: Invalid module name in augmentation, module 'glo_M4_private' cannot be found.
tests/cases/compiler/privacyImportParseErrors.ts(180,1): error TS2668: 'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible.
tests/cases/compiler/privacyImportParseErrors.ts(180,23): error TS2664: Invalid module name in augmentation, module 'glo_M2_public' cannot be found.
tests/cases/compiler/privacyImportParseErrors.ts(198,1): error TS2668: 'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible.
tests/cases/compiler/privacyImportParseErrors.ts(198,23): error TS2664: Invalid module name in augmentation, module 'glo_M4_private' cannot be found.
tests/cases/compiler/privacyImportParseErrors.ts(218,34): error TS2307: Cannot find module 'glo_M2_public'.
tests/cases/compiler/privacyImportParseErrors.ts(238,34): error TS2307: Cannot find module 'glo_M4_private'.
tests/cases/compiler/privacyImportParseErrors.ts(251,40): error TS2307: Cannot find module 'glo_M2_public'.
tests/cases/compiler/privacyImportParseErrors.ts(252,40): error TS2307: Cannot find module 'glo_M4_private'.
tests/cases/compiler/privacyImportParseErrors.ts(255,1): error TS2666: 'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible.
tests/cases/compiler/privacyImportParseErrors.ts(255,23): error TS2662: Invalid module name in augmentation, module 'use_glo_M1_public' cannot be found.
tests/cases/compiler/privacyImportParseErrors.ts(255,1): error TS2668: 'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible.
tests/cases/compiler/privacyImportParseErrors.ts(255,23): error TS2664: Invalid module name in augmentation, module 'use_glo_M1_public' cannot be found.
tests/cases/compiler/privacyImportParseErrors.ts(258,45): error TS2304: Cannot find name 'use_glo_M1_public'.
tests/cases/compiler/privacyImportParseErrors.ts(261,39): error TS2304: Cannot find name 'use_glo_M1_public'.
tests/cases/compiler/privacyImportParseErrors.ts(264,40): error TS2307: Cannot find module 'glo_M2_public'.
tests/cases/compiler/privacyImportParseErrors.ts(273,38): error TS1147: Import declarations in a namespace cannot reference a module.
tests/cases/compiler/privacyImportParseErrors.ts(277,45): error TS1147: Import declarations in a namespace cannot reference a module.
tests/cases/compiler/privacyImportParseErrors.ts(284,16): error TS2662: Invalid module name in augmentation, module 'use_glo_M3_private' cannot be found.
tests/cases/compiler/privacyImportParseErrors.ts(284,16): error TS2664: Invalid module name in augmentation, module 'use_glo_M3_private' cannot be found.
tests/cases/compiler/privacyImportParseErrors.ts(287,46): error TS2304: Cannot find name 'use_glo_M3_private'.
tests/cases/compiler/privacyImportParseErrors.ts(290,40): error TS2304: Cannot find name 'use_glo_M3_private'.
tests/cases/compiler/privacyImportParseErrors.ts(293,41): error TS2307: Cannot find module 'glo_M4_private'.
tests/cases/compiler/privacyImportParseErrors.ts(302,38): error TS1147: Import declarations in a namespace cannot reference a module.
tests/cases/compiler/privacyImportParseErrors.ts(306,45): error TS1147: Import declarations in a namespace cannot reference a module.
tests/cases/compiler/privacyImportParseErrors.ts(312,16): error TS2662: Invalid module name in augmentation, module 'anotherParseError' cannot be found.
tests/cases/compiler/privacyImportParseErrors.ts(312,16): error TS2664: Invalid module name in augmentation, module 'anotherParseError' cannot be found.
tests/cases/compiler/privacyImportParseErrors.ts(314,9): error TS1038: A 'declare' modifier cannot be used in an already ambient context.
tests/cases/compiler/privacyImportParseErrors.ts(314,24): error TS2435: Ambient modules cannot be nested in other modules or namespaces.
tests/cases/compiler/privacyImportParseErrors.ts(319,16): error TS2435: Ambient modules cannot be nested in other modules or namespaces.
tests/cases/compiler/privacyImportParseErrors.ts(322,12): error TS2435: Ambient modules cannot be nested in other modules or namespaces.
tests/cases/compiler/privacyImportParseErrors.ts(326,1): error TS2666: 'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible.
tests/cases/compiler/privacyImportParseErrors.ts(326,1): error TS2668: 'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible.
tests/cases/compiler/privacyImportParseErrors.ts(326,9): error TS1029: 'export' modifier must precede 'declare' modifier.
tests/cases/compiler/privacyImportParseErrors.ts(326,23): error TS2662: Invalid module name in augmentation, module 'anotherParseError2' cannot be found.
tests/cases/compiler/privacyImportParseErrors.ts(326,23): error TS2664: Invalid module name in augmentation, module 'anotherParseError2' cannot be found.
tests/cases/compiler/privacyImportParseErrors.ts(328,9): error TS1038: A 'declare' modifier cannot be used in an already ambient context.
tests/cases/compiler/privacyImportParseErrors.ts(328,24): error TS2435: Ambient modules cannot be nested in other modules or namespaces.
tests/cases/compiler/privacyImportParseErrors.ts(333,16): error TS2435: Ambient modules cannot be nested in other modules or namespaces.
@@ -79,7 +79,7 @@ tests/cases/compiler/privacyImportParseErrors.ts(353,29): error TS1147: Import d
export declare module "m1_M3_public" {
~~~~~~
!!! error TS2666: 'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible.
!!! error TS2668: 'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible.
~~~~~~~~~~~~~~
!!! error TS2435: Ambient modules cannot be nested in other modules or namespaces.
export function f1();
@@ -181,7 +181,7 @@ tests/cases/compiler/privacyImportParseErrors.ts(353,29): error TS1147: Import d
export declare module "m2_M3_public" {
~~~~~~
!!! error TS2666: 'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible.
!!! error TS2668: 'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible.
~~~~~~~~~~~~~~
!!! error TS2435: Ambient modules cannot be nested in other modules or namespaces.
export function f1();
@@ -273,9 +273,9 @@ tests/cases/compiler/privacyImportParseErrors.ts(353,29): error TS1147: Import d
export declare module "glo_M2_public" {
~~~~~~
!!! error TS2666: 'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible.
!!! error TS2668: 'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible.
~~~~~~~~~~~~~~~
!!! error TS2662: Invalid module name in augmentation, module 'glo_M2_public' cannot be found.
!!! error TS2664: Invalid module name in augmentation, module 'glo_M2_public' cannot be found.
export function f1();
export class c1 {
}
@@ -295,9 +295,9 @@ tests/cases/compiler/privacyImportParseErrors.ts(353,29): error TS1147: Import d
export declare module "glo_M4_private" {
~~~~~~
!!! error TS2666: 'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible.
!!! error TS2668: 'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible.
~~~~~~~~~~~~~~~~
!!! error TS2662: Invalid module name in augmentation, module 'glo_M4_private' cannot be found.
!!! error TS2664: Invalid module name in augmentation, module 'glo_M4_private' cannot be found.
export function f1();
export class c1 {
}
@@ -364,9 +364,9 @@ tests/cases/compiler/privacyImportParseErrors.ts(353,29): error TS1147: Import d
export declare module "use_glo_M1_public" {
~~~~~~
!!! error TS2666: 'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible.
!!! error TS2668: 'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible.
~~~~~~~~~~~~~~~~~~~
!!! error TS2662: Invalid module name in augmentation, module 'use_glo_M1_public' cannot be found.
!!! error TS2664: Invalid module name in augmentation, module 'use_glo_M1_public' cannot be found.
import use_glo_M1_public = glo_M1_public;
export var use_glo_M1_public_v1_public: { new (): use_glo_M1_public.c1; };
export var use_glo_M1_public_v2_public: use_glo_M1_public;
@@ -407,7 +407,7 @@ tests/cases/compiler/privacyImportParseErrors.ts(353,29): error TS1147: Import d
declare module "use_glo_M3_private" {
~~~~~~~~~~~~~~~~~~~~
!!! error TS2662: Invalid module name in augmentation, module 'use_glo_M3_private' cannot be found.
!!! error TS2664: Invalid module name in augmentation, module 'use_glo_M3_private' cannot be found.
import use_glo_M3_private = glo_M3_private;
export var use_glo_M3_private_v1_public: { new (): use_glo_M3_private.c1; };
export var use_glo_M3_private_v2_public: use_glo_M3_private;
@@ -447,7 +447,7 @@ tests/cases/compiler/privacyImportParseErrors.ts(353,29): error TS1147: Import d
declare module "anotherParseError" {
~~~~~~~~~~~~~~~~~~~
!!! error TS2662: Invalid module name in augmentation, module 'anotherParseError' cannot be found.
!!! error TS2664: Invalid module name in augmentation, module 'anotherParseError' cannot be found.
module m2 {
declare module "abc" {
~~~~~~~
@@ -471,11 +471,11 @@ tests/cases/compiler/privacyImportParseErrors.ts(353,29): error TS1147: Import d
declare export module "anotherParseError2" {
~~~~~~~
!!! error TS2666: 'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible.
!!! error TS2668: 'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible.
~~~~~~
!!! error TS1029: 'export' modifier must precede 'declare' modifier.
~~~~~~~~~~~~~~~~~~~~
!!! error TS2662: Invalid module name in augmentation, module 'anotherParseError2' cannot be found.
!!! error TS2664: Invalid module name in augmentation, module 'anotherParseError2' cannot be found.
module m2 {
declare module "abc" {
~~~~~~~

8
tests/baselines/reference/recursiveClassReferenceTest.errors.txt
View File

@@ -1,6 +1,6 @@
tests/cases/compiler/recursiveClassReferenceTest.ts(16,19): error TS2304: Cannot find name 'Element'.
tests/cases/compiler/recursiveClassReferenceTest.ts(56,11): error TS2304: Cannot find name 'domNode'.
tests/cases/compiler/recursiveClassReferenceTest.ts(88,36): error TS2304: Cannot find name 'mode'.
tests/cases/compiler/recursiveClassReferenceTest.ts(56,11): error TS2663: Cannot find name 'domNode'. Did you mean the instance member 'this.domNode'?
tests/cases/compiler/recursiveClassReferenceTest.ts(88,36): error TS2663: Cannot find name 'mode'. Did you mean the instance member 'this.mode'?
tests/cases/compiler/recursiveClassReferenceTest.ts(95,21): error TS2345: Argument of type 'Window' is not assignable to parameter of type 'IMode'.
Property 'getInitialState' is missing in type 'Window'.
@@ -65,7 +65,7 @@ tests/cases/compiler/recursiveClassReferenceTest.ts(95,21): error TS2345: Argume
public getDomNode() {
return domNode;
~~~~~~~
!!! error TS2304: Cannot find name 'domNode'.
!!! error TS2663: Cannot find name 'domNode'. Did you mean the instance member 'this.domNode'?
}
public destroy() {
@@ -99,7 +99,7 @@ tests/cases/compiler/recursiveClassReferenceTest.ts(95,21): error TS2345: Argume
public getMode(): IMode { return mode; }
~~~~
!!! error TS2304: Cannot find name 'mode'.
!!! error TS2663: Cannot find name 'mode'. Did you mean the instance member 'this.mode'?
}
export class Mode extends AbstractMode {

12
tests/baselines/reference/scannertest1.errors.txt
View File

@@ -1,14 +1,14 @@
tests/cases/conformance/scanner/ecmascript5/scannertest1.ts(1,1): error TS6053: File 'tests/cases/conformance/scanner/ecmascript5/References.ts' not found.
tests/cases/conformance/scanner/ecmascript5/scannertest1.ts(5,21): error TS2304: Cannot find name 'CharacterCodes'.
tests/cases/conformance/scanner/ecmascript5/scannertest1.ts(5,47): error TS2304: Cannot find name 'CharacterCodes'.
tests/cases/conformance/scanner/ecmascript5/scannertest1.ts(9,16): error TS2304: Cannot find name 'isDecimalDigit'.
tests/cases/conformance/scanner/ecmascript5/scannertest1.ts(9,16): error TS2662: Cannot find name 'isDecimalDigit'. Did you mean the static member 'CharacterInfo.isDecimalDigit'?
tests/cases/conformance/scanner/ecmascript5/scannertest1.ts(10,22): error TS2304: Cannot find name 'CharacterCodes'.
tests/cases/conformance/scanner/ecmascript5/scannertest1.ts(10,47): error TS2304: Cannot find name 'CharacterCodes'.
tests/cases/conformance/scanner/ecmascript5/scannertest1.ts(11,22): error TS2304: Cannot find name 'CharacterCodes'.
tests/cases/conformance/scanner/ecmascript5/scannertest1.ts(11,47): error TS2304: Cannot find name 'CharacterCodes'.
tests/cases/conformance/scanner/ecmascript5/scannertest1.ts(15,9): error TS2304: Cannot find name 'Debug'.
tests/cases/conformance/scanner/ecmascript5/scannertest1.ts(15,22): error TS2304: Cannot find name 'isHexDigit'.
tests/cases/conformance/scanner/ecmascript5/scannertest1.ts(16,16): error TS2304: Cannot find name 'isDecimalDigit'.
tests/cases/conformance/scanner/ecmascript5/scannertest1.ts(15,22): error TS2662: Cannot find name 'isHexDigit'. Did you mean the static member 'CharacterInfo.isHexDigit'?
tests/cases/conformance/scanner/ecmascript5/scannertest1.ts(16,16): error TS2662: Cannot find name 'isDecimalDigit'. Did you mean the static member 'CharacterInfo.isDecimalDigit'?
tests/cases/conformance/scanner/ecmascript5/scannertest1.ts(17,20): error TS2304: Cannot find name 'CharacterCodes'.
tests/cases/conformance/scanner/ecmascript5/scannertest1.ts(18,21): error TS2304: Cannot find name 'CharacterCodes'.
tests/cases/conformance/scanner/ecmascript5/scannertest1.ts(18,46): error TS2304: Cannot find name 'CharacterCodes'.
@@ -33,7 +33,7 @@ tests/cases/conformance/scanner/ecmascript5/scannertest1.ts(20,23): error TS2304
public static isHexDigit(c: number): boolean {
return isDecimalDigit(c) ||
~~~~~~~~~~~~~~
!!! error TS2304: Cannot find name 'isDecimalDigit'.
!!! error TS2662: Cannot find name 'isDecimalDigit'. Did you mean the static member 'CharacterInfo.isDecimalDigit'?
(c >= CharacterCodes.A && c <= CharacterCodes.F) ||
~~~~~~~~~~~~~~
!!! error TS2304: Cannot find name 'CharacterCodes'.
@@ -51,10 +51,10 @@ tests/cases/conformance/scanner/ecmascript5/scannertest1.ts(20,23): error TS2304
~~~~~
!!! error TS2304: Cannot find name 'Debug'.
~~~~~~~~~~
!!! error TS2304: Cannot find name 'isHexDigit'.
!!! error TS2662: Cannot find name 'isHexDigit'. Did you mean the static member 'CharacterInfo.isHexDigit'?
return isDecimalDigit(c)
~~~~~~~~~~~~~~
!!! error TS2304: Cannot find name 'isDecimalDigit'.
!!! error TS2662: Cannot find name 'isDecimalDigit'. Did you mean the static member 'CharacterInfo.isDecimalDigit'?
? (c - CharacterCodes._0)
~~~~~~~~~~~~~~
!!! error TS2304: Cannot find name 'CharacterCodes'.

4
tests/baselines/reference/scopeCheckExtendedClassInsidePublicMethod2.errors.txt
View File

@@ -1,4 +1,4 @@
tests/cases/compiler/scopeCheckExtendedClassInsidePublicMethod2.ts(4,7): error TS2304: Cannot find name 'v'.
tests/cases/compiler/scopeCheckExtendedClassInsidePublicMethod2.ts(4,7): error TS2663: Cannot find name 'v'. Did you mean the instance member 'this.v'?
tests/cases/compiler/scopeCheckExtendedClassInsidePublicMethod2.ts(6,7): error TS2304: Cannot find name 's'.
@@ -8,7 +8,7 @@ tests/cases/compiler/scopeCheckExtendedClassInsidePublicMethod2.ts(6,7): error T
public c() {
v = 1;
~
!!! error TS2304: Cannot find name 'v'.
!!! error TS2663: Cannot find name 'v'. Did you mean the instance member 'this.v'?
this.p = 1;
s = 1;
~

4
tests/baselines/reference/scopeCheckExtendedClassInsideStaticMethod1.errors.txt
View File

@@ -1,6 +1,6 @@
tests/cases/compiler/scopeCheckExtendedClassInsideStaticMethod1.ts(4,7): error TS2304: Cannot find name 'v'.
tests/cases/compiler/scopeCheckExtendedClassInsideStaticMethod1.ts(5,12): error TS2339: Property 'p' does not exist on type 'typeof D'.
tests/cases/compiler/scopeCheckExtendedClassInsideStaticMethod1.ts(6,7): error TS2304: Cannot find name 's'.
tests/cases/compiler/scopeCheckExtendedClassInsideStaticMethod1.ts(6,7): error TS2662: Cannot find name 's'. Did you mean the static member 'D.s'?
==== tests/cases/compiler/scopeCheckExtendedClassInsideStaticMethod1.ts (3 errors) ====
@@ -15,6 +15,6 @@ tests/cases/compiler/scopeCheckExtendedClassInsideStaticMethod1.ts(6,7): error T
!!! error TS2339: Property 'p' does not exist on type 'typeof D'.
s = 1;
~
!!! error TS2304: Cannot find name 's'.
!!! error TS2662: Cannot find name 's'. Did you mean the static member 'D.s'?
}
}

4
tests/baselines/reference/unqualifiedCallToClassStatic1.errors.txt
View File

@@ -1,4 +1,4 @@
tests/cases/compiler/unqualifiedCallToClassStatic1.ts(4,3): error TS2304: Cannot find name 'foo'.
tests/cases/compiler/unqualifiedCallToClassStatic1.ts(4,3): error TS2662: Cannot find name 'foo'. Did you mean the static member 'Vector.foo'?
==== tests/cases/compiler/unqualifiedCallToClassStatic1.ts (1 errors) ====
@@ -7,6 +7,6 @@ tests/cases/compiler/unqualifiedCallToClassStatic1.ts(4,3): error TS2304: Cannot
// 'foo' cannot be called in an unqualified manner.
foo();
~~~
!!! error TS2304: Cannot find name 'foo'.
!!! error TS2662: Cannot find name 'foo'. Did you mean the static member 'Vector.foo'?
}
}