Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: microsoft/TypeScript
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: rusongyu/TypeScript
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 7 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 3, 2017

  1. ready to update newest version

    larry committed Jan 3, 2017
    Configuration menu
    Copy the full SHA
    786169c View commit details
    Browse the repository at this point in the history

  2. update

    larry committed Jan 3, 2017
    Configuration menu
    Copy the full SHA
    18cb107 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'Microsoft-master' 

    # Conflicts:
#	jenkins.sh
#	lib/lib.dom.iterable.d.ts
#	lib/lib.es5.d.ts
#	src/harness/unittests/services/formatting/documentFormattingTests.json
#	src/harness/unittests/services/formatting/formatDiffTemplate.html
#	src/harness/unittests/services/formatting/getFormattingEditsForRange.ts
#	src/harness/unittests/services/formatting/getSmartIndentAtLineNumber.ts
#	src/harness/unittests/services/formatting/importedJavaScriptFormatting.ts
#	src/harness/unittests/services/formatting/ruleFormattingTests.json
#	src/harness/unittests/services/formatting/testCode/formatting/classes.ts
#	src/harness/unittests/services/formatting/testCode/formatting/classesBaseline.ts
#	src/harness/unittests/services/formatting/testCode/formatting/colonAndQMark.ts
#	src/harness/unittests/services/formatting/testCode/formatting/colonAndQMarkBaseline.ts
#	src/harness/unittests/services/formatting/testCode/formatting/documentReadyFunction.ts
#	src/harness/unittests/services/formatting/testCode/formatting/documentReadyFunctionBaseLine.ts
#	src/harness/unittests/services/formatting/testCode/formatting/emptyBlock.ts
#	src/harness/unittests/services/formatting/testCode/formatting/emptyBlockBaseline.ts
#	src/harness/unittests/services/formatting/testCode/formatting/emptyInterfaceLiteral.ts
#	src/harness/unittests/services/formatting/testCode/formatting/emptyInterfaceLiteralBaseLine.ts
#	src/harness/unittests/services/formatting/testCode/formatting/fatArrowFunctions.ts
#	src/harness/unittests/services/formatting/testCode/formatting/fatArrowFunctionsBaseline.ts
#	src/harness/unittests/services/formatting/testCode/formatting/formatDebuggerStatement.ts
#	src/harness/unittests/services/formatting/testCode/formatting/formatDebuggerStatementBaseline.ts
#	src/harness/unittests/services/formatting/testCode/formatting/formatvariableDeclarationList.ts
#	src/harness/unittests/services/formatting/testCode/formatting/formatvariableDeclarationListBaseline.ts
#	src/harness/unittests/services/formatting/testCode/formatting/implicitModule.ts
#	src/harness/unittests/services/formatting/testCode/formatting/implicitModuleBaseline.ts
#	src/harness/unittests/services/formatting/testCode/formatting/importDeclaration.ts
#	src/harness/unittests/services/formatting/testCode/formatting/importDeclarationBaseline.ts
#	src/harness/unittests/services/formatting/testCode/formatting/main.ts
#	src/harness/unittests/services/formatting/testCode/formatting/mainBaseline.ts
#	src/harness/unittests/services/formatting/testCode/formatting/moduleIndentation.ts
#	src/harness/unittests/services/formatting/testCode/formatting/moduleIndentationBaseline.ts
#	src/harness/unittests/services/formatting/testCode/formatting/modules.ts
#	src/harness/unittests/services/formatting/testCode/formatting/modulesBaseline.ts
#	src/harness/unittests/services/formatting/testCode/formatting/objectLiteral.ts
#	src/harness/unittests/services/formatting/testCode/formatting/objectLiteralBaseline.ts
#	src/harness/unittests/services/formatting/testCode/formatting/onClosingBracket.ts
#	src/harness/unittests/services/formatting/testCode/formatting/onClosingBracketBaseLine.ts
#	src/harness/unittests/services/formatting/testCode/formatting/onSemiColon.ts
#	src/harness/unittests/services/formatting/testCode/formatting/onSemiColonBaseline.ts
#	src/harness/unittests/services/formatting/testCode/formatting/spaceAfterConstructor.ts
#	src/harness/unittests/services/formatting/testCode/formatting/spaceAfterConstructorBaseline.ts
#	src/harness/unittests/services/formatting/testCode/formatting/tabAfterCloseCurly.ts
#	src/harness/unittests/services/formatting/testCode/formatting/tabAfterCloseCurlyBaseline.ts
#	src/harness/unittests/services/formatting/testCode/formatting/typescriptConstructs.ts
#	src/harness/unittests/services/formatting/testCode/formatting/typescriptConstructsBaseline.ts
#	src/harness/unittests/services/formatting/testCode/formatting/various.ts
#	src/harness/unittests/services/formatting/testCode/formatting/variousBaseline.ts
#	src/harness/unittests/services/formatting/testCode/formatting/withStatement.ts
#	src/harness/unittests/services/formatting/testCode/formatting/withStatementBaseline.ts
#	src/lib/scriptHost.d.ts
#	tests/cases/compiler/declarationEmitArrayTypesFromGenericArrayUsage.ts
#	tests/cases/compiler/declarationEmitInvalidReference.ts
#	tests/cases/compiler/declarationEmitInvalidReference2.ts
#	tests/cases/compiler/declarationEmitNameConflicts2.ts
#	tests/cases/compiler/declarationEmitNameConflicts3.ts
#	tests/cases/compiler/declarationEmitNameConflictsWithAlias.ts
#	tests/cases/compiler/declarationEmitProtectedMembers.ts
#	tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments01_ES6.ts
#	tests/cases/conformance/types/rest/restElementMustBeLast.ts
#	tests/cases/fourslash/shims-pp/getBraceMatchingAtPosition.ts
#	tests/cases/fourslash/underscoreTypings02.ts
    larry committed Jan 3, 2017
    Configuration menu
    Copy the full SHA
    ba75a05 View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2017

  1. tslint format

    @rusongyu
    rusongyu committed Feb 11, 2017
    Configuration menu
    Copy the full SHA
    c234aed View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:Microsoft/TypeScript 

    # Conflicts:
#	tests/baselines/reference/additionOperatorWithOnlyNullValueOrUndefinedValue.errors.txt
#	tests/baselines/reference/additionOperatorWithTypeParameter.errors.txt
#	tests/baselines/reference/arithmeticOperatorWithNullValueAndInvalidOperands.errors.txt
#	tests/baselines/reference/arithmeticOperatorWithOnlyNullValueOrUndefinedValue.errors.txt
#	tests/baselines/reference/arithmeticOperatorWithUndefinedValueAndInvalidOperands.errors.txt
#	tests/baselines/reference/binaryArithmatic3.errors.txt
#	tests/baselines/reference/binaryArithmatic4.errors.txt
#	tests/baselines/reference/compoundArithmeticAssignmentWithInvalidOperands.errors.txt
#	tests/baselines/reference/negateOperatorInvalidOperations.errors.txt
#	tests/baselines/reference/noCatchBlock.js
#	tests/baselines/reference/noCatchBlock.js.map
#	tests/baselines/reference/noCatchBlock.sourcemap.txt
#	tests/baselines/reference/nullKeyword.errors.txt
#	tests/baselines/reference/operatorAddNullUndefined.errors.txt
#	tests/baselines/reference/propertyAccess4.errors.txt
#	tests/baselines/reference/propertyAccess5.errors.txt
#	tests/baselines/reference/returnValueInSetter.errors.txt
#	tests/baselines/reference/sourceMap-SkippedNode.js
#	tests/baselines/reference/sourceMap-SkippedNode.js.map
#	tests/baselines/reference/sourceMap-SkippedNode.sourcemap.txt
#	tests/baselines/reference/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.errors.txt
#	tests/baselines/reference/typeOfOperator1.errors.txt
#	tests/baselines/reference/typeParameterAssignmentCompat1.errors.txt
#	tests/baselines/reference/voidOperatorWithAnyOtherType.errors.txt
#	tests/cases/compiler/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.ts
#	tests/cases/compiler/typeParameterWithInvalidConstraintType.ts
#	tests/cases/conformance/types/typeAliases/reservedNamesInAliases.ts
#	tests/cases/fourslash/completionListAtIdentifierDefinitionLocations_Generics.ts
#	tests/cases/fourslash/completionListAtIdentifierDefinitionLocations_catch.ts
#	tests/cases/fourslash/completionListAtIdentifierDefinitionLocations_classes.ts
#	tests/cases/fourslash/completionListAtIdentifierDefinitionLocations_enumMembers.ts
#	tests/cases/fourslash/completionListAtIdentifierDefinitionLocations_enumMembers2.ts
#	tests/cases/fourslash/completionListAtIdentifierDefinitionLocations_enums.ts
#	tests/cases/fourslash/completionListAtIdentifierDefinitionLocations_functions.ts
#	tests/cases/fourslash/completionListAtIdentifierDefinitionLocations_interfaceMembers.ts
#	tests/cases/fourslash/completionListAtIdentifierDefinitionLocations_interfaceMembers2.ts
#	tests/cases/fourslash/completionListAtIdentifierDefinitionLocations_interfaceMembers3.ts
#	tests/cases/fourslash/completionListAtIdentifierDefinitionLocations_interfaces.ts
#	tests/cases/fourslash/completionListAtIdentifierDefinitionLocations_parameters.ts
#	tests/cases/fourslash/completionListAtIdentifierDefinitionLocations_properties.ts
#	tests/cases/fourslash/completionListAtIdentifierDefinitionLocations_varDeclarations.ts
#	tests/cases/fourslash/completionListBuilderLocations_VariableDeclarations.ts
#	tests/cases/fourslash/completionListBuilderLocations_parameters.ts
#	tests/cases/fourslash/completionListBuilderLocations_properties.ts
#	tests/cases/fourslash/completionListInStringLiterals1.ts
#	tests/cases/fourslash/completionListInStringLiterals2.ts
#	tests/cases/fourslash/completionListInTemplateLiteralParts1.ts
#	tests/cases/fourslash/completionListInTemplateLiteralPartsNegatives1.ts
#	tests/cases/fourslash/getOccurrencesConst02.ts
#	tests/cases/fourslash/getOccurrencesConst03.ts
#	tests/cases/fourslash/getOccurrencesConstructor.ts
#	tests/cases/fourslash/getOccurrencesConstructor2.ts
#	tests/cases/fourslash/getOccurrencesDeclare2.ts
#	tests/cases/fourslash/getOccurrencesExport2.ts
#	tests/cases/fourslash/getOccurrencesIfElse.ts
#	tests/cases/fourslash/getOccurrencesIfElse2.ts
#	tests/cases/fourslash/getOccurrencesIfElse3.ts
#	tests/cases/fourslash/getOccurrencesIfElseBroken.ts
#	tests/cases/fourslash/getOccurrencesIsWriteAccess.ts
#	tests/cases/fourslash/getOccurrencesLoopBreakContinue.ts
#	tests/cases/fourslash/getOccurrencesLoopBreakContinue2.ts
#	tests/cases/fourslash/getOccurrencesLoopBreakContinue3.ts
#	tests/cases/fourslash/getOccurrencesLoopBreakContinue4.ts
#	tests/cases/fourslash/getOccurrencesLoopBreakContinue5.ts
#	tests/cases/fourslash/getOccurrencesLoopBreakContinue6.ts
#	tests/cases/fourslash/getOccurrencesLoopBreakContinueNegatives.ts
#	tests/cases/fourslash/getOccurrencesModifiersNegatives1.ts
#	tests/cases/fourslash/getOccurrencesOfAnonymousFunction.ts
#	tests/cases/fourslash/getOccurrencesPrivate1.ts
#	tests/cases/fourslash/getOccurrencesPrivate2.ts
#	tests/cases/fourslash/getOccurrencesProtected1.ts
#	tests/cases/fourslash/getOccurrencesProtected2.ts
#	tests/cases/fourslash/getOccurrencesPublic1.ts
#	tests/cases/fourslash/getOccurrencesPublic2.ts
#	tests/cases/fourslash/getOccurrencesReturn.ts
#	tests/cases/fourslash/getOccurrencesReturn2.ts
#	tests/cases/fourslash/getOccurrencesReturn3.ts
#	tests/cases/fourslash/getOccurrencesSetAndGet.ts
#	tests/cases/fourslash/getOccurrencesSetAndGet2.ts
#	tests/cases/fourslash/getOccurrencesSetAndGet3.ts
#	tests/cases/fourslash/getOccurrencesStatic1.ts
#	tests/cases/fourslash/getOccurrencesSuper.ts
#	tests/cases/fourslash/getOccurrencesSuper2.ts
#	tests/cases/fourslash/getOccurrencesSuperNegatives.ts
#	tests/cases/fourslash/getOccurrencesSwitchCaseDefault.ts
#	tests/cases/fourslash/getOccurrencesSwitchCaseDefault2.ts
#	tests/cases/fourslash/getOccurrencesSwitchCaseDefault3.ts
#	tests/cases/fourslash/getOccurrencesSwitchCaseDefault4.ts
#	tests/cases/fourslash/getOccurrencesThis.ts
#	tests/cases/fourslash/getOccurrencesThis2.ts
#	tests/cases/fourslash/getOccurrencesThis3.ts
#	tests/cases/fourslash/getOccurrencesThis4.ts
#	tests/cases/fourslash/getOccurrencesThis5.ts
#	tests/cases/fourslash/getOccurrencesThisNegatives2.ts
#	tests/cases/fourslash/getOccurrencesThrow.ts
#	tests/cases/fourslash/getOccurrencesThrow2.ts
#	tests/cases/fourslash/getOccurrencesThrow3.ts
#	tests/cases/fourslash/getOccurrencesThrow4.ts
#	tests/cases/fourslash/getOccurrencesThrow5.ts
#	tests/cases/fourslash/getOccurrencesThrow6.ts
#	tests/cases/fourslash/getOccurrencesThrow7.ts
#	tests/cases/fourslash/getOccurrencesThrow8.ts
#	tests/cases/fourslash/quickInfoInvalidLocations.ts
#	tests/cases/fourslash/signatureHelpTaggedTemplates1.ts
#	tests/cases/fourslash/signatureHelpTaggedTemplates2.ts
#	tests/cases/fourslash/signatureHelpTaggedTemplates3.ts
#	tests/cases/fourslash/signatureHelpTaggedTemplates4.ts
#	tests/cases/fourslash/signatureHelpTaggedTemplates5.ts
#	tests/cases/fourslash/signatureHelpTaggedTemplates6.ts
#	tests/cases/fourslash/signatureHelpTaggedTemplates7.ts
#	tests/cases/fourslash/signatureHelpTaggedTemplatesIncomplete1.ts
#	tests/cases/fourslash/signatureHelpTaggedTemplatesIncomplete2.ts
#	tests/cases/fourslash/signatureHelpTaggedTemplatesIncomplete3.ts
#	tests/cases/fourslash/signatureHelpTaggedTemplatesIncomplete4.ts
#	tests/cases/fourslash/signatureHelpTaggedTemplatesIncomplete5.ts
#	tests/cases/fourslash/signatureHelpTaggedTemplatesIncomplete6.ts
#	tests/cases/fourslash/signatureHelpTaggedTemplatesIncomplete7.ts
#	tests/cases/fourslash/signatureHelpTaggedTemplatesIncomplete8.ts
#	tests/cases/fourslash/signatureHelpTaggedTemplatesIncomplete9.ts
#	tests/cases/fourslash/signatureHelpTaggedTemplatesNegatives1.ts
#	tests/cases/fourslash/signatureHelpTaggedTemplatesNegatives2.ts
#	tests/cases/fourslash/signatureHelpTaggedTemplatesNegatives3.ts
#	tests/cases/fourslash/signatureHelpTaggedTemplatesNegatives4.ts
#	tests/cases/fourslash/signatureHelpTaggedTemplatesNegatives5.ts
#	tests/cases/fourslash/signatureHelpTaggedTemplatesNested1.ts
#	tests/cases/fourslash/signatureHelpTaggedTemplatesNested2.ts
#	tests/cases/fourslash/signatureHelpTaggedTemplatesWithOverloadedTags1.ts
#	tests/cases/fourslash/signatureHelpTaggedTemplatesWithOverloadedTags2.ts
#	tests/cases/fourslash/signatureHelpTaggedTemplatesWithOverloadedTags4.ts
#	tests/cases/fourslash/signatureHelpTaggedTemplatesWithOverloadedTags5.ts
#	tests/cases/fourslash/signatureHelpTaggedTemplatesWithOverloadedTags6.ts
#	tests/cases/fourslash/signatureHelpTaggedTemplatesWithOverloadedTags8.ts
#	tests/cases/fourslash/signatureHelpTaggedTemplatesWithOverloadedTags9.ts
#	tests/cases/fourslash_old/completionListGenericConstraintsNames.ts
#	tslint.json
    @rusongyu
    rusongyu committed Feb 11, 2017
    Configuration menu
    Copy the full SHA
    5143480 View commit details
    Browse the repository at this point in the history

  3. update tslint

    @rusongyu
    rusongyu committed Feb 11, 2017
    Configuration menu
    Copy the full SHA
    45a0f56 View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2017

  1. Revert "Merge branch 'master' of github.com:Microsoft/TypeScript" 

    This reverts commit 5143480, reversing
changes made to 2fc634f.
    @rusongyu
    rusongyu committed Feb 12, 2017
    Configuration menu
    Copy the full SHA
    995bc4f View commit details
    Browse the repository at this point in the history
Loading