Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,340 Commits 367 Branches 233 Tags
cd246992ed4de56d700de735a2c823bb9278bea0
Commit Graph
1074 Commits
Author SHA1 Message Date
Daniel Rosenwasser cd246992ed Clarified comment in test. 2015-01-09 14:19:24 -08:00
Daniel Rosenwasser f5f4e28f4f Fixed portion of test. 2015-01-08 16:53:26 -08:00
Daniel Rosenwasser d5f02813f0 Added tests for contextual typing on parenthesized expressions, added case for tagged templates. 2015-01-08 16:39:47 -08:00
Daniel Rosenwasser 7b11621750 Merge pull request #1571 from Arnavion/1570-template-strings 
Don't emit an empty template head literal if there's a template span with a non-empty literal.
 2015-01-08 12:17:17 -08:00
Vladimir Matveev 4daa107cb4 Merge pull request #1614 from Microsoft/type_parameters_visibility 
consider type parameters always visible
 2015-01-07 12:41:47 -08:00
Daniel Rosenwasser f32683d231 Merge pull request #1529 from Microsoft/uninstantiatedModulesBeforeClasses 
Allow uninstantiated modules before clodules
 2015-01-07 12:40:50 -08:00
Vladimir Matveev 01218f86ff consider type parameters always visible 2015-01-06 17:55:54 -08:00
Arnavion d07151f87c Update tests and baselines. 2015-01-06 15:28:06 -08:00
Arnavion 4dfb0cc3d8 Update tests and baselines. 2015-01-06 02:42:22 -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
Cyrus Najmabadi a1d04c3c65 Merge branch 'master' into mergeMarkers1 2014-12-28 18:58:47 -08: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
Cyrus Najmabadi 828b33aae7 Add test demonstrating the problem with conflict markers. 2014-12-18 17:23:34 -08:00
Daniel Rosenwasser 50d0f9b719 Added tests/baselines. 2014-12-18 16:45:26 -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 46cd90daf0 Added test, modified test, updated baselines. 2014-12-17 17:05:05 -08:00
Anders Hejlsberg b2a02fe9ef Merge pull request #1443 from Microsoft/improvedTypeInference 
Make initial inferences from parameterless function expressions
 2014-12-17 16:19:49 -08:00
Daniel Rosenwasser ca5d243ca7 Added test from original issue. 2014-12-17 15:49:00 -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
Jason Freeman 29dfa3d6c0 Add module emit test 2014-12-17 14:33:32 -08:00
Cyrus Najmabadi 6a08c54f42 Merge branch 'master' into sourceFileUpdate 
Conflicts:
	src/compiler/checker.ts
	src/compiler/diagnosticInformationMap.generated.ts
	src/compiler/diagnosticMessages.json
	src/harness/fourslash.ts
 2014-12-17 13:22:04 -08:00
Cyrus Najmabadi 4545549e07 Disable incremental by default before merging into master. 2014-12-17 12:41:08 -08:00
Anders Hejlsberg 766756b4b1 Merge branch 'master' into spreadAndRest 
Conflicts:
	src/compiler/parser.ts
 2014-12-17 11:49:45 -08:00
Cyrus Najmabadi cd308e78ba 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-16 21:50:10 -08:00
Arnavion cd6eb180c6 Don't emit outputs when -noEmit is specified. 2014-12-16 20:25:19 -08:00
Yui T c2b03b6384 Address code review 2014-12-16 19:53:42 -08:00
Anders Hejlsberg fab94d84e5 Merge branch 'master' into spreadAndRest 
Conflicts:
	src/compiler/parser.ts
 2014-12-16 18:09:21 -08:00
Yui T 9ab59a4964 Merge branch 'master' into refactorGrammarCheck 
Conflicts:
	src/compiler/diagnosticInformationMap.generated.ts
	src/compiler/diagnosticMessages.json
	src/compiler/parser.ts
	src/compiler/types.ts
	tests/baselines/reference/YieldExpression8_es6.errors.txt
	tests/baselines/reference/ambientErrors.errors.txt
	tests/baselines/reference/giant.errors.txt
 2014-12-16 17:38:40 -08:00
Jason Freeman ab33a65d30 Fix issue #1503 with modules and imports sharing a name 2014-12-16 14:59:21 -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 6326b9d51f Merge branch 'master' into sourceFileUpdate 2014-12-16 02:59:05 -08:00
Cyrus Najmabadi c7bb0a5ae6 Don't store variable statement flags on its variable declaration children. 2014-12-16 02:50:38 -08:00
Vladimir Matveev 59c73c5f34 Merge pull request #1466 from Microsoft/linked_imports 
defer decision whether import used on the right side of import declarati...
 2014-12-16 00:46:26 -08:00
Cyrus Najmabadi 41e59824fb Merge branch 'master' into funcDeclsInBlocks 2014-12-15 20:50:48 -08:00
Daniel Rosenwasser 1f6cd941fd Changed tests to error when actual contextual typing is broken. 2014-12-15 17:09:56 -08:00
Daniel Rosenwasser 17c822966d Added tests for erroneous function expressions in both tagged/untagged template expressions. 2014-12-15 16:39:12 -08:00
Daniel Rosenwasser 0263d60071 Split contextual typing test for substitution expressions into two tests. 2014-12-15 16:14:35 -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
Yui T 1cc0d184bb Move grammar checking: shorthandPropertyAssignment; Add more parser test; there are still errors from incomplete migration 2014-12-14 19:14:02 -08:00