Skip to content

Merge master 12/20 #13075

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
merged 31 commits into from
Dec 21, 2016
Merged

Merge master 12/20 #13075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
366dfc0
expose parseCommandLine (#12934)
vladima Dec 15, 2016
371e4f7
Make line-endings LF only in the /lib dir
billti Dec 15, 2016
e2138da
Add more files to .npmignore
Dec 15, 2016
bfc10ca
Merge pull request #12937 from Microsoft/makeLibLFOnly
billti Dec 15, 2016
f9bcd26
Merge pull request #12947 from Microsoft/more_npm_ignore
Dec 15, 2016
b624d47
Update LKG
billti Dec 15, 2016
f034022
lift multiple statements into block if necessary (#12965)
vladima Dec 16, 2016
40d08df
Do not transform JSX tag names for ES3
rbuckton Dec 16, 2016
14e05cd
Fix condition in onSubstituteNode
rbuckton Dec 16, 2016
0f78f53
Merge pull request #12967 from Microsoft/fix12749
rbuckton Dec 16, 2016
82a2ee6
Mapped types assignable to objects with 'any' string index signature
ahejlsberg Dec 16, 2016
f834caf
Add tests
ahejlsberg Dec 16, 2016
4a8f340
Accept new baselines
ahejlsberg Dec 16, 2016
142a6f6
Disallow old style octal literal types
arusakov Dec 19, 2016
720a3bf
Skip files from package.json "main" or "types" if they have an unsupp…
Dec 19, 2016
994273d
Fix tslint version
mhegazy Dec 19, 2016
e3925db
Merge pull request #13028 from Microsoft/fixTslintVersion
mhegazy Dec 19, 2016
c05b733
Merge pull request #12990 from Microsoft/mappedTypeStringIndexAny
mhegazy Dec 19, 2016
0649c22
cache per-folder module resolutions during construction of the progra…
vladima Dec 19, 2016
8ae0376
Merge pull request #13016 from arusakov/disallow_old_style_octal_lite…
mhegazy Dec 19, 2016
7bf73be
space-before-function-paren
Dec 20, 2016
3b3d715
Add InsertSpaceAfterConstructor option & additonal test cases
Dec 20, 2016
47bcfb3
Guard against missing constraint in getModifiersTypeFromMappedType
ahejlsberg Dec 20, 2016
e569edd
Add regression test
ahejlsberg Dec 20, 2016
f3ad09a
Merge pull request #13061 from Microsoft/fixMappedTypeConstraint
ahejlsberg Dec 20, 2016
bf94a4a
Change function name
Dec 20, 2016
dc94264
Fix issue 12218 and linter error
DanCorder Dec 20, 2016
328a5ef
Merge pull request #13024 from Microsoft/package_json_unsupported_ext…
mhegazy Dec 20, 2016
6c60bfc
Merge pull request #13072 from DanCorder/fix12218
DanielRosenwasser Dec 21, 2016
c90af3a
Merge pull request #13045 from aochsner/fix-12234
mhegazy Dec 21, 2016
e252ae0
Merge branch 'master' into release-2.1
mhegazy Dec 21, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .npmignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
built
doc
Gulpfile.ts
internal
issue_template.md
jenkins.sh
lib/README.md
netci.groovy
pull_request_template.md
scripts
src
Expand Down
2 changes: 2 additions & 0 deletions lib/protocol.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1734,12 +1734,14 @@ declare namespace ts.server.protocol {
insertSpaceAfterCommaDelimiter?: boolean;
insertSpaceAfterSemicolonInForStatements?: boolean;
insertSpaceBeforeAndAfterBinaryOperators?: boolean;
insertSpaceAfterConstructor?: boolean;
insertSpaceAfterKeywordsInControlFlowStatements?: boolean;
insertSpaceAfterFunctionKeywordForAnonymousFunctions?: boolean;
insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis?: boolean;
insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets?: boolean;
insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces?: boolean;
insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces?: boolean;
insertSpaceBeforeFunctionParenthesis?: boolean;
placeOpenBraceOnNewLineForFunctions?: boolean;
placeOpenBraceOnNewLineForControlBlocks?: boolean;
}
Expand Down
176 changes: 134 additions & 42 deletions lib/tsc.js
View file
Open in desktop

Large diffs are not rendered by default.

197 changes: 152 additions & 45 deletions lib/tsserver.js
View file
Open in desktop

Large diffs are not rendered by default.

37 changes: 35 additions & 2 deletions lib/tsserverlibrary.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,12 +767,14 @@ declare namespace ts.server.protocol {
insertSpaceAfterCommaDelimiter?: boolean;
insertSpaceAfterSemicolonInForStatements?: boolean;
insertSpaceBeforeAndAfterBinaryOperators?: boolean;
insertSpaceAfterConstructor?: boolean;
insertSpaceAfterKeywordsInControlFlowStatements?: boolean;
insertSpaceAfterFunctionKeywordForAnonymousFunctions?: boolean;
insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis?: boolean;
insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets?: boolean;
insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces?: boolean;
insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces?: boolean;
insertSpaceBeforeFunctionParenthesis?: boolean;
placeOpenBraceOnNewLineForFunctions?: boolean;
placeOpenBraceOnNewLineForControlBlocks?: boolean;
}
Expand Down Expand Up @@ -4181,7 +4183,7 @@ declare namespace ts {
key: string;
message: string;
};
Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher: {
Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher_Use_the_syntax_0o_0: {
code: number;
category: DiagnosticCategory;
key: string;
Expand Down Expand Up @@ -7865,6 +7867,12 @@ declare namespace ts {
key: string;
message: string;
};
File_0_has_an_unsupported_extension_so_skipping_it: {
code: number;
category: DiagnosticCategory;
key: string;
message: string;
};
Only_amd_and_system_modules_are_supported_alongside_0: {
code: number;
category: DiagnosticCategory;
Expand Down Expand Up @@ -8255,6 +8263,12 @@ declare namespace ts {
key: string;
message: string;
};
Resolution_for_module_0_was_found_in_cache: {
code: number;
category: DiagnosticCategory;
key: string;
message: string;
};
Variable_0_implicitly_has_an_1_type: {
code: number;
category: DiagnosticCategory;
Expand Down Expand Up @@ -8687,6 +8701,12 @@ declare namespace ts {
key: string;
message: string;
};
Octal_literal_types_must_use_ES2015_syntax_Use_the_syntax_0o_0: {
code: number;
category: DiagnosticCategory;
key: string;
message: string;
};
};
}
declare namespace ts {
Expand Down Expand Up @@ -8907,7 +8927,13 @@ declare namespace ts {
}): string[] | undefined;
function resolveTypeReferenceDirective(typeReferenceDirectiveName: string, containingFile: string | undefined, options: CompilerOptions, host: ModuleResolutionHost): ResolvedTypeReferenceDirectiveWithFailedLookupLocations;
function getAutomaticTypeDirectiveNames(options: CompilerOptions, host: ModuleResolutionHost): string[];
function resolveModuleName(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations;
interface ModuleResolutionCache {
getOrCreateCacheForDirectory(directoryName: string): Map<ResolvedModuleWithFailedLookupLocations>;
}
function createModuleResolutionCache(currentDirectory: string, getCanonicalFileName: (s: string) => string): {
getOrCreateCacheForDirectory: (directoryName: string) => Map<ResolvedModuleWithFailedLookupLocations>;
};
function resolveModuleName(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: ModuleResolutionCache): ResolvedModuleWithFailedLookupLocations;
function nodeModuleNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations;
function directoryProbablyExists(directoryName: string, host: {
directoryExists?: (directoryName: string) => boolean;
Expand Down Expand Up @@ -8991,6 +9017,7 @@ declare namespace ts {
let fullTripleSlashReferenceTypeReferenceDirectiveRegEx: RegExp;
let fullTripleSlashAMDReferencePathRegEx: RegExp;
function isPartOfTypeNode(node: Node): boolean;
function isChildOfLiteralType(node: Node): boolean;
function forEachReturnStatement<T>(body: Block, visitor: (stmt: ReturnStatement) => T): T;
function forEachYieldExpression(body: Block, visitor: (expr: YieldExpression) => void): void;
function getRestParameterElementType(node: TypeNode): TypeNode;
Expand Down Expand Up @@ -10049,6 +10076,7 @@ declare namespace ts {
InsertSpaceAfterCommaDelimiter: boolean;
InsertSpaceAfterSemicolonInForStatements: boolean;
InsertSpaceBeforeAndAfterBinaryOperators: boolean;
InsertSpaceAfterConstructor?: boolean;
InsertSpaceAfterKeywordsInControlFlowStatements: boolean;
InsertSpaceAfterFunctionKeywordForAnonymousFunctions: boolean;
InsertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis: boolean;
Expand All @@ -10057,13 +10085,15 @@ declare namespace ts {
InsertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces: boolean;
InsertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces?: boolean;
InsertSpaceAfterTypeAssertion?: boolean;
InsertSpaceBeforeFunctionParenthesis?: boolean;
PlaceOpenBraceOnNewLineForFunctions: boolean;
PlaceOpenBraceOnNewLineForControlBlocks: boolean;
}
interface FormatCodeSettings extends EditorSettings {
insertSpaceAfterCommaDelimiter?: boolean;
insertSpaceAfterSemicolonInForStatements?: boolean;
insertSpaceBeforeAndAfterBinaryOperators?: boolean;
insertSpaceAfterConstructor?: boolean;
insertSpaceAfterKeywordsInControlFlowStatements?: boolean;
insertSpaceAfterFunctionKeywordForAnonymousFunctions?: boolean;
insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis?: boolean;
Expand All @@ -10072,6 +10102,7 @@ declare namespace ts {
insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces?: boolean;
insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces?: boolean;
insertSpaceAfterTypeAssertion?: boolean;
insertSpaceBeforeFunctionParenthesis?: boolean;
placeOpenBraceOnNewLineForFunctions?: boolean;
placeOpenBraceOnNewLineForControlBlocks?: boolean;
}
Expand Down Expand Up @@ -10710,6 +10741,7 @@ declare namespace ts.formatting {
SpaceAfterLetConstInVariableDeclaration: Rule;
NoSpaceBeforeOpenParenInFuncCall: Rule;
SpaceAfterFunctionInFuncDecl: Rule;
SpaceBeforeOpenParenInFuncDecl: Rule;
NoSpaceBeforeOpenParenInFuncDecl: Rule;
SpaceAfterVoidOperator: Rule;
NoSpaceBetweenReturnAndSemicolon: Rule;
Expand All @@ -10718,6 +10750,7 @@ declare namespace ts.formatting {
SpaceAfterGetSetInMember: Rule;
SpaceBeforeBinaryKeywordOperator: Rule;
SpaceAfterBinaryKeywordOperator: Rule;
SpaceAfterConstructor: Rule;
NoSpaceAfterConstructor: Rule;
NoSpaceAfterModuleImport: Rule;
SpaceAfterCertainTypeScriptKeywords: Rule;
Expand Down
Loading