CyrusNajmabadi 122d8a4d98 Merge pull request #1456 from Microsoft/mergeMarkers ...

Make the compiler resilient to encountering merge conflict markers in a source code file.

2014-12-11 18:04:25 -08:00

..

compiler

Remove empty file

2014-11-24 00:35:10 +01:00

core

Merge branch 'master' into refactorRefFilesPath

2014-11-06 15:47:58 -08:00

formatting

Removed tokenSpan.ts.

2014-12-11 13:44:08 -08:00

resources

Move over all changes from my private branch.

2014-12-05 14:55:39 -08:00

syntax

Merge branch 'master' into invertedIncremental

2014-12-06 01:30:38 -08:00

text

Speeding up parsing and incremental parsing.

2014-11-02 23:32:51 -08:00

breakpoints.ts

Also split out .PropertyDeclaration and .PropertySignature from .Property.

2014-12-08 16:37:35 -08:00

navigationBar.ts

Merge branch 'master' into destructuring

2014-12-09 11:26:43 -08:00

outliningElementsCollector.ts

move OutliningSpan definitions to services to ensure it is visible in definitions file

2014-12-11 13:44:12 -08:00

services.ts

Merge pull request #1456 from Microsoft/mergeMarkers

2014-12-11 18:04:25 -08:00

shims.ts

Respond to code review comments

2014-12-11 17:08:11 -08:00

signatureHelp.ts

Merge pull request #1362 from Microsoft/contextSensitiveExpressions

2014-12-04 13:02:56 -08:00

utilities.ts

Moved non-exposed functions to utilities; fix up emitted .d.ts in Jakefile.

2014-12-11 14:00:36 -08:00