Initial import of the vscode semantic highlight code #2

orta · 2020-06-01T20:01:14Z

This PR:

Imports https://github.com/aeschli/typescript-vscode-sh-plugin and gets it feeling like it lives in the codebase
Adds a new optional property to the semantic classicification request on TSServer for the response format: _format?: "original" | "2020"
converts the fourslash classification module to a classification(format: "original" | "2020") which gives back primitives for building tests

We need to have the format option because VS uses the original format and there is a new one for vscode which has already shipped - I'm totally open to the names of the strings etc, e.g. "classic" | "identifiers" but just wanted to get something out.

andrewbranch · 2020-06-02T16:32:24Z

src/services/classifierVscode.ts

+        let symbol = typeChecker.getSymbolAtLocation(node);
+        if (symbol) {
+          if (symbol.flags & SymbolFlags.Alias) {
+            symbol = typeChecker.getAliasedSymbol(symbol);
+          }


I believe there’s a skipAlias util that would condense this a bit

andrewbranch · 2020-06-02T16:35:35Z

src/services/classifierVscode.ts

+      if (meaning & SemanticMeaning.Type) {
+        return TokenType.interface;
+      }


What case does this filter out? If this is the only place getMeaningFromLocation is used, is there a more direct way to work with the declaration for this case?

andrewbranch · 2020-06-02T16:37:21Z

src/services/classifierVscode.ts

+namespace ts.classifier.vscode {
+
+  enum TokenType {
+    class, enum, interface, namespace, typeParameter, type, parameter, variable, enumMember, property, function, member, _


Casing is very Swift 😉

andrewbranch · 2020-06-02T16:38:42Z

src/harness/client.ts

@@ -739,7 +739,7 @@ namespace ts.server {
            return notImplemented();
        }

-        getEncodedSemanticClassifications(_fileName: string, _span: TextSpan): Classifications {
+        getEncodedSemanticClassifications(_fileName: string, _span: TextSpan, _format?: "original" | "2020"): Classifications {


I would use a const enum by the time you’re ready to make a real PR

const string enum* — strings are still a good idea since it’s originating outside of TypeScript

andrewbranch · 2020-06-02T16:43:50Z

src/harness/fourslashInterfaceImpl.ts

-    export namespace Classification {
-        export function comment(text: string, position?: number): Classification {
+
+    export function classification(format: "original" | "2020") {


I don’t see much advantage in making this a factory function instead of just two namespaces since they share literally no code, but 🤷‍♂️

…ownproperty-call fix(helpers): Use `hasOwnProperty.call`

* Don’t create expando declarations on alias symbols * Update other baseline * Fix brace nesting refactor mistake

Migrate maps and sets

# Conflicts: # src/compiler/transformers/module/module.ts

Fix namespace import/export helper usage under '--esModuleInterop'

…eature

* Fix find-all-references on `undefined` * Show references in input files in baseline * Inline commentEachLine * firstOrUndefined doesn’t take undefined

…ature Add ToggleLineComment and ToggleMultilineComment service

* add convertOptionalChain * cover more cases * expose containsMatchingReference * clean up performing edits * bound start position * add tests * refactor and handle edge cases * update tests * consider explicit requests for empty spans * update fourslash to use trigger reason * add tests cases for trigger reason * fix errors * remove type assertion * fix non ampersand chains * clean up some logic * add ternary case * add diagnostic message * add nullish check for ternary expressions * Update src/services/refactors/convertToOptionalChainExpression.ts Co-authored-by: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com> * Update src/services/refactors/convertToOptionalChainExpression.ts Co-authored-by: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com> * Update tests/cases/fourslash/refactorConvertToOptionalChainExpressionForTriggerReason3.ts Co-authored-by: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com> * Update tests/cases/fourslash/refactorConvertToOptionalChainExpressionForTriggerReason1.ts Co-authored-by: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com> * reformat and remove unused checks * allow any for ternary refactor * add tests * add tests * check return and variable statements * use isMatchingReference instead of containsMatchingReference * allow partial selections * fine tune selection ranges * recurse for call expressions * fix spellings * add recursive cases * remove isOrContainsMatchingReference * cleanup * more refactoring * cleanup * rename tests * address PR comments * check match syntactically * handle another call expression case * some renames * inline some checks * add test * address comments * add refactorNotAvailableReason Co-authored-by: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>

…changes (microsoft#39604) * Add failing test * Ensure source files are bound before analyzing them

…t exists in the current scope (microsoft#38419)

…ing fragments (microsoft#39475)

…39606)

* Fix incorrect deprecated mark * improve test

…print them structurally (microsoft#39552)

…dynamic import (microsoft#39617) * Existing tests showing require in ts file is not used for module resolution * Do not resolve require calls in typescript files even if it contains dynamic import Fixes microsoft#38611

…tation in union/intersection types (microsoft#39570) * add graceful error message for unparenthesized function types in union and intersection * add unparenthesizedFunctionTypeInUnionOrIntersection test * add unparenthesizedConstructorTypeInUnionOrIntersection test * Update src/compiler/parser.ts Co-authored-by: Daniel Rosenwasser <DanielRosenwasser@users.noreply.github.com> * pass isInUnionType to parseFunctionOrConstructorTypeToError * Apply suggestions from code review Co-authored-by: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com> * syntax fix * refactor isStartOfFunctionType into isStartOfFunctionTypeOrConstructorType * Update src/compiler/parser.ts Co-authored-by: Daniel Rosenwasser <DanielRosenwasser@users.noreply.github.com> * hoist isUnionType Co-authored-by: Daniel Rosenwasser <DanielRosenwasser@users.noreply.github.com> Co-authored-by: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>

…al (microsoft#39614) * Permit variadic tuple inference from trailing optional to non-optional * Add tests

* Mark spec files as archived Maybe then people won't try to edit them and submit PRs * update README

* Fixes stack overflow when exporting a lot in commonjs Fixes microsoft#38691 * Add missing test files

* Add CodeQL security scanning * Add CodeQL configuration Limiting analysis to the src folder only * Add configuration file to codeql action workflow * Update codeql-configuration.yml

…t#39697)

* Add optionalReplacementRange to completions response * Get the name right * Fix unit tests * Fix comment typo * Fix comment typo * Baseline

…icrosoft#39963)

…eclarations (microsoft#40037) * Better support class instances assigned to the module object for JS declarations * Extract constant

@weswigham

* Add DockerFile for ChromeDevTools Note that I was not able to verify it fully works, as it throws an authentication error on typescript/typescript on the Docker Hub. This is part of microsoft#39568 CC @weswigham * Fix run command * Update run command

* Allow private symbols to be control flow narrowed * Add test with narrowing of inferred control flow type for completeness * Reformat long line

* Add full stops in diagnostic messages (fixes microsoft#37753) * Accept baselines * Fix whitespace

…oft#40254) * Consistently error when rest element isn't last in tuple type * Add regression test * Accept new baselines * Stricter circular recursion check in type inference * Revert "Stricter circular recursion check in type inference" This reverts commit 80e6df6. * Revert "Accept new baselines" This reverts commit 355706d. * Accept new baselines

…osoft#40293)

LEGO: Merge pull request 40437

…t for readonly arrays (microsoft#39258) * Explore using a different isArray declaration * Add tests and the new isArray definition * Baseline updates * Upda the isArray type

…soft#40240)

…soft#40191)

…osoft#40226)

WIP - don't provide a breaking change

… semantic_2

Co-authored-by: Sheetal Nandi <shkamat@microsoft.com>

andrewbranch reviewed Jun 2, 2020

View reviewed changes

orta force-pushed the semantic_2 branch from 2d86a6e to bfa943a Compare June 17, 2020 10:26

orta force-pushed the semantic_2 branch 2 times, most recently from 0c45a0f to 6ba0d3f Compare July 6, 2020 17:33

orta force-pushed the semantic_2 branch from 6ba0d3f to b8742c3 Compare July 7, 2020 15:34

rbuckton and others added 25 commits July 10, 2020 16:54

Merge pull request microsoft#39537 from microsoft/fix/helpers/use-has…

87fd182

…ownproperty-call fix(helpers): Use `hasOwnProperty.call`

PR comments and minor bugs

0d38f09

fix(types/mocha): change deprecated Mocha types (microsoft#39573)

31f75fe

Fix typo (microsoft#39585)

629dd64

Don’t create expando declarations on alias symbols (microsoft#39558)

583bd92

* Don’t create expando declarations on alias symbols * Update other baseline * Fix brace nesting refactor mistake

Fix typo (microsoft#39562)

bcb4a49

Merge pull request microsoft#39264 from microsoft/migrateMapsAndSets

2c08aff

Migrate maps and sets

Merge branch 'master' into fix37113

5ad8532

# Conflicts: # src/compiler/transformers/module/module.ts

Merge pull request microsoft#39490 from microsoft/fix37113

1e7d089

Fix namespace import/export helper usage under '--esModuleInterop'

Merge remote-tracking branch 'upstream/master' into AddToggleCommentF…

635ee24

…eature

Fix find-all-references on undefined (microsoft#39591)

3c91133

* Fix find-all-references on `undefined` * Show references in input files in baseline * Inline commentEachLine * firstOrUndefined doesn’t take undefined

Merge pull request microsoft#37029 from armanio123/AddToggleCommentFe…

6279f98

…ature Add ToggleLineComment and ToggleMultilineComment service

Load ETW module from a specified path (microsoft#39599)

f68a839

Fix tsc --watch crash on module augmentations when module resolution …

98ab3a7

…changes (microsoft#39604) * Add failing test * Ensure source files are bound before analyzing them

fix(33511): show jsx namespace default import quick fix if it does no…

ececf3b

…t exists in the current scope (microsoft#38419)

Use jsxFragmentFactory entity name for factory name lookup from check…

ef9affe

…ing fragments (microsoft#39475)

Don’t give all instantiated signatures in JS strict arity (microsoft#…

dd2fc86

…39606)

Fix incorrect deprecated mark (microsoft#39611)

7b72875

* Fix incorrect deprecated mark * improve test

Use combined node flags (microsoft#39403)

fcd4fcb

Flag mapped types with circular property types and do not attempt to …

f2c5643

…print them structurally (microsoft#39552)

Support variadic tuple inference from trailing optional to non-option…

db79030

…al (microsoft#39614) * Permit variadic tuple inference from trailing optional to non-optional * Add tests

fix(38868): add separator for type parameters (microsoft#39621)

6430211

rbuckton and others added 30 commits September 3, 2020 17:21

Remove optionality for Promise resolve callback (microsoft#39817)

d5a646e

Mark spec files as archived (microsoft#40373)

30cb204

* Mark spec files as archived Maybe then people won't try to edit them and submit PRs * update README

fix(lib/es2015): Remove Reflect.enumerate(…) (microsoft#38967)

237b6f6

Fixes stack overflow when exporting a lot in commonjs (microsoft#38994)

79f919e

* Fixes stack overflow when exporting a lot in commonjs Fixes microsoft#38691 * Add missing test files

Add CodeQL security scanning (microsoft#38939)

ea842c4

* Add CodeQL security scanning * Add CodeQL configuration Limiting analysis to the src folder only * Add configuration file to codeql action workflow * Update codeql-configuration.yml

fix(26141): show completions for string parenthesized types (microsof…

8384018

…t#39697)

Add optionalReplacementSpan to completions response (microsoft#40347)

f6f2d36

* Add optionalReplacementRange to completions response * Get the name right * Fix unit tests * Fix comment typo * Fix comment typo * Baseline

fix(28516): forbid using async modifier with the abstract modifier (m…

09d68ef

…icrosoft#39963)

Better support class instances assigned to the module object for JS d…

155610e

…eclarations (microsoft#40037) * Better support class instances assigned to the module object for JS declarations * Extract constant

Accept baseline from test added since merged PR was made

6cd2dc9

Allow private symbols to be control flow narrowed (microsoft#39978)

e5fd0dd

* Allow private symbols to be control flow narrowed * Add test with narrowing of inferred control flow type for completeness * Reformat long line

Add full stops in diagnostic messages (microsoft#40165)

2ef393b

* Add full stops in diagnostic messages (fixes microsoft#37753) * Accept baselines * Fix whitespace

Remove Language specification link from README (microsoft#40407)

de5ef35

Add errors when providing type arguments for intrinsic JSX tags (micr…

7838b01

…osoft#40293)

LEGO: check in for master to temporary branch.

68d4505

LEGO: Merge pull request 40437

42196df

LEGO: Merge pull request 40437

Remove trailing space from Gulpfile.js comment (microsoft#40199)

1d2278b

Remove assignability cases in getNarrowedType + an isArray improvemen…

fa89ce6

…t for readonly arrays (microsoft#39258) * Explore using a different isArray declaration * Add tests and the new isArray definition * Baseline updates * Upda the isArray type

fix(40222): fix crash on using destructuring in a catch clause (micro…

1508446

…soft#40240)

fix(40150): use parameter name for a Promise callback function (micro…

6101fbc

…soft#40191)

feat(25770): add Quick Fix to convert LiteralType to MappedType (micr…

6aec7f4

…osoft#40226)

Update package-lock.json

2b0278a

Fix all build errors

219c64a

Merge pull request #4 from orta/semantic_2_2

415b30f

WIP - don't provide a breaking change

Merge branch 'master' of https://github.com/microsoft/TypeScript into…

1747860

… semantic_2

Update baselines

a9035d6

Update src/services/classifier2020.ts

8739cbf

Co-authored-by: Sheetal Nandi <shkamat@microsoft.com>

Addresses Ron's feedback

ff748a5

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Initial import of the vscode semantic highlight code #2

Initial import of the vscode semantic highlight code #2

orta commented Jun 1, 2020 •

edited

andrewbranch Jun 2, 2020

andrewbranch Jun 2, 2020

andrewbranch Jun 2, 2020

andrewbranch Jun 2, 2020

andrewbranch Jun 2, 2020

andrewbranch Jun 2, 2020

Initial import of the vscode semantic highlight code #2

Are you sure you want to change the base?

Initial import of the vscode semantic highlight code #2

Conversation

orta commented Jun 1, 2020 • edited

andrewbranch Jun 2, 2020

Choose a reason for hiding this comment

andrewbranch Jun 2, 2020

Choose a reason for hiding this comment

andrewbranch Jun 2, 2020

Choose a reason for hiding this comment

andrewbranch Jun 2, 2020

Choose a reason for hiding this comment

andrewbranch Jun 2, 2020

Choose a reason for hiding this comment

andrewbranch Jun 2, 2020

Choose a reason for hiding this comment

orta commented Jun 1, 2020 •

edited