Commit Graph

516 Commits

Author SHA1 Message Date
Vladimir Matveev
889264f457 ensure that autoformat is triggered by token characters 2015-02-02 22:21:41 -08:00
Vladimir Matveev
732ebf2aeb fix crash in getReturnTypeFromFunctionBody if function declaration is incomplete and does not have body 2015-01-30 18:20:26 -08:00
Vladimir Matveev
a5ce3e126d Merge pull request #1792 from Microsoft/getScriptLexicalStructureWithbindingPatterns
handle binding patterns correctly when getting script lexical structure
2015-01-29 19:42:26 -08:00
Daniel Rosenwasser
26929ee5f2 Merge pull request #1816 from Microsoft/typeArgsInSuperCall
Contextually type parameters in super calls using type arguments on the base class.
2015-01-27 17:29:48 -08:00
Sheetal Nandi
a43bb47d7b Merge pull request #1697 from Microsoft/docCommentUnion
Fixes the duplicate doc comment display in case of union property
2015-01-27 14:21:39 -08:00
Daniel Rosenwasser
4646d63558 Fixed fourslash test. 2015-01-27 13:28:32 -08:00
Daniel Rosenwasser
93dbcf006f Contextually type parameters in super calls using type arguments on the base class. 2015-01-26 18:42:17 -08:00
Vladimir Matveev
17b19bf465 Merge pull request #1779 from Microsoft/scopeOfUnionProperties
handle union properties in when doing getOccurences\findAllReferences
2015-01-26 15:21:48 -08:00
Vladimir Matveev
f4ca318c39 add binding elements from variable declaration into script lexical structure 2015-01-24 00:17:55 -08:00
Vladimir Matveev
b05f2bf1a3 handle binding patterns correctly when getting script lexical structure 2015-01-23 17:08:30 -08:00
Vladimir Matveev
29776f4e9b Merge pull request #1782 from Microsoft/findAllRefs
use nameTable - services layer storage of identifiers in the file
2015-01-23 16:15:44 -08:00
Vladimir Matveev
da6070bcf7 fixed typo in test name 2015-01-23 15:39:50 -08:00
Vladimir Matveev
6040e55fa4 add 'find all references' test 2015-01-23 15:36:36 -08:00
Vladimir Matveev
05ec43a0f3 make sure that enum values are computed before the emit 2015-01-23 12:04:55 -08:00
Vladimir Matveev
379d03b5a7 use nameTable - services layer storage of identifiers in the file 2015-01-22 18:20:40 -08:00
Vladimir Matveev
0940d3bb3b handle union properties in when doing getOccurences\findAllReferences 2015-01-22 17:16:18 -08:00
Vladimir Matveev
7f749909da Merge pull request #1746 from Microsoft/formattingTemplateLiterals
fixed smart indentation\formatting in template literals
2015-01-20 17:54:47 -08:00
Vladimir Matveev
8497667f33 drop trailing trivia prior to rescanning it 2015-01-20 14:44:24 -08:00
Vladimir Matveev
a6d374ee21 fixed smart indentation\formatting in template literals 2015-01-20 14:07:01 -08:00
Anders Hejlsberg
a2ecaf60f0 Merge branch 'master' into tsconfig 2015-01-19 14:50:18 -08:00
Sheetal Nandi
c46662fa72 Fixes the duplicate doc comment display in case of union property
Handles #1237
2015-01-16 12:58:10 -08:00
Anders Hejlsberg
50b0cb98cc Adding missing @module to several fourslash tests 2015-01-15 15:57:48 -08:00
Daniel Rosenwasser
bfe63cc4cb Merge pull request #1648 from Microsoft/contextualTypeParenthesizedExpressions
Contextually type parenthesized expressions
2015-01-14 14:52:07 -08:00
Jason Freeman
4a1851c7b8 Merge pull request #1562 from csnover/fix-1133
Ensure specialized signatures are always at the top when performing call candidate resolution
2015-01-13 17:33:57 -08:00
Vladimir Matveev
150720bd70 when formatting lists check if end list token still belongs to the parent node 2015-01-13 14:22:53 -08:00
Daniel Rosenwasser
6783e35f89 Removed probably-unnecessary statement from test. 2015-01-11 00:21:37 -08:00
Daniel Rosenwasser
22174a17c6 Contextually type parenthesized expressions. 2015-01-09 15:10:32 -08:00
Jason Freeman
7459c87265 Merge branch 'release-1.4'
Conflicts:
	bin/lib.core.es6.d.ts
	bin/lib.es6.d.ts
	bin/tsc.js
	bin/typescript.d.ts
	bin/typescriptServices.d.ts
	bin/typescriptServices.js
	bin/typescriptServices_internal.d.ts
	bin/typescript_internal.d.ts
2015-01-05 15:08:17 -08:00
Colin Snover
435b44ce57 Put specialized signatures at the top of the list of call candidates
Fixes #1133.
2014-12-26 01:01:41 +00:00
Cyrus Najmabadi
0707350c7b Update conflict marker formatting test. We now no longer format the second branch of hte merge. 2014-12-19 11:33:45 -08:00
Cyrus Najmabadi
a6ea497ff1 Classify the '=' sign in variable/parameter/property as if it was an operator. 2014-12-18 19:38:19 -08:00
Cyrus Najmabadi
48bef4698b Provide better error recovery when we encounter merge markers in the source.
Previously we would just treat each merge marker as trivia and then continue
scanning and parsing like normal.  This worked well in some scenarios, but
fell down in others like:

```
class C {
    public foo() {
<<<<<<< HEAD
        this.bar();
    }
=======
        this.baz();
    }
>>>>>>> Branch

    public bar() { }
}
```

The problem stems from the previous approach trying to incorporate both branches of the merge into
the final tree.  In a case like this, that approach breaks down entirely.  The the parser ends up
seeing the close curly in both included sections, and it considers the class finished.  Then, it
starts erroring when it encounters "public bar()".

The fix is to only incorporate one of these sections into the tree.  Specifically, we only include
the first section.  The second sectoin is treated like trivia and does not affect the parse at all.
To make the experience more pleasant we do *lexically* classify the second section.  That way it
does not appear as just plain black text in the editor.  Instead, it will have appropriate lexicla
classifications for keywords, literals, comments, operators, punctuation, etc.  However, any syntactic
or semantic feature will not work in the second block due to this being trivia as far as any feature
is concerned.

This experience is still much better than what we had originally (where merge markers would absolutely)
destroy the parse tree.  And it is better than what we checked in last week, which could easily create
a borked tree for many types of merges.

Now, almost all merges should still leave the tree in good shape.  All LS features will work in the
first section, and lexical classification will work in the second.
2014-12-18 19:18:13 -08:00
Daniel Rosenwasser
af9b56bdd9 Merge pull request #1528 from Microsoft/goToDefOnUnionMethod
Fix crash on go-to-def on union method
2014-12-18 12:11:05 -08:00
Daniel Rosenwasser
6fed3e2601 Merge pull request #1501 from Arnavion/no-emit
Add -noEmit compiler flag that skips the emit stage in ts.compile()
2014-12-17 18:00:33 -08:00
Daniel Rosenwasser
b3ccb562fb Added test for goToDef on union types. 2014-12-17 15:11:43 -08:00
Daniel Rosenwasser
42babc52d3 Use 'definitionCountIs' in union property tests. 2014-12-17 15:11:40 -08:00
Daniel Rosenwasser
6c753496e7 Rename file. 2014-12-17 15:11:38 -08:00
Daniel Rosenwasser
7a1be3cc04 Added test using code from original issue. 2014-12-17 15:11:35 -08:00
Daniel Rosenwasser
af4d7d3ff4 Added goToDef count verification in fourslash facilities. 2014-12-17 15:11:31 -08:00
Daniel Rosenwasser
eaaf7ad468 Normalize a few fourslash line endings. 2014-12-17 15:11:29 -08:00
Arnavion
cd6eb180c6 Don't emit outputs when -noEmit is specified. 2014-12-16 20:25:19 -08:00
Cyrus Najmabadi
c9ee88e5c4 Adding incremental test. 2014-12-16 11:58:47 -08:00
Cyrus Najmabadi
8917e96663 Merge branch 'funcDeclsInBlocks' into sourceFileUpdate
Conflicts:
	src/compiler/parser.ts
	src/compiler/utilities.ts
2014-12-16 03:12:31 -08:00
Cyrus Najmabadi
c7bb0a5ae6 Don't store variable statement flags on its variable declaration children. 2014-12-16 02:50:38 -08:00
Cyrus Najmabadi
41e59824fb Merge branch 'master' into funcDeclsInBlocks 2014-12-15 20:50:48 -08:00
Daniel Rosenwasser
e68c53f708 Separated fourslash test to two files. 2014-12-15 14:55:46 -08:00
Daniel Rosenwasser
b65a422c7a Fixed contextual typing for tagged template expressions. 2014-12-15 14:11:21 -08:00
Cyrus Najmabadi
14883cb18e Merge branch 'master' into typingHighFidelity 2014-12-14 23:46:05 -08:00
Cyrus Najmabadi
3478099a85 Add incremental parsing LS test. 2014-12-14 12:30:02 -08:00
Cyrus Najmabadi
872df4dda4 Merge branch 'noDebuggerInTests' into sourceFileUpdate 2014-12-14 12:23:05 -08:00