TypeScript/tests/baselines/reference/objectLiteralMemberWithModifiers1.js

//// [objectLiteralMemberWithModifiers1.ts]
var v = { public foo() { } }

//// [objectLiteralMemberWithModifiers1.js]
var v = { foo: function () { } };
Merge branch 'master' into sourceFileUpdate Conflicts: src/compiler/checker.ts src/compiler/diagnosticInformationMap.generated.ts src/compiler/parser.ts tests/baselines/reference/FunctionDeclaration5_es6.errors.txt tests/baselines/reference/VariableDeclaration2_es6.errors.txt tests/baselines/reference/VariableDeclaration4_es6.errors.txt tests/baselines/reference/anonymousModules.errors.txt tests/baselines/reference/callSignaturesWithParameterInitializers2.errors.txt tests/baselines/reference/conflictMarkerTrivia1.errors.txt tests/baselines/reference/dottedModuleName.errors.txt tests/baselines/reference/innerModExport1.errors.txt tests/baselines/reference/innerModExport2.errors.txt tests/baselines/reference/parserAccessors10.errors.txt tests/baselines/reference/parserComputedPropertyName5.errors.txt tests/baselines/reference/parserErrantEqualsGreaterThanAfterFunction1.errors.txt tests/baselines/reference/parserErrantEqualsGreaterThanAfterFunction2.errors.txt tests/baselines/reference/parserModifierOnStatementInBlock2.errors.txt tests/baselines/reference/parserSkippedTokens16.errors.txt tests/baselines/reference/privateIndexer2.errors.txt 2014-12-17 06:50:10 +01:00			`//// [objectLiteralMemberWithModifiers1.ts]`
			`var v = { public foo() { } }`

			`//// [objectLiteralMemberWithModifiers1.js]`
Preserve single line blocks when emitting. 2015-02-07 03:45:09 +01:00			`var v = { foo: function () { } };`