microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-12-12 11:50:54 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Update dprint-typescript to 0.88.1, reformat (#55913)

Browse Source
This commit is contained in:
Jake Bailey 2023-09-29 14:12:50 -07:00 committed by GitHub
parent 952526c5c9
commit a48cebf65d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.dprint.jsonc
View File

@ -51,7 +51,7 @@
],
// Note: if adding new languages, make sure settings.template.json is updated too.
"plugins": [
"https://plugins.dprint.dev/typescript-0.87.1.wasm",
"https://plugins.dprint.dev/typescript-0.88.1.wasm",
"https://plugins.dprint.dev/prettier-0.27.0.json@3557a62b4507c55a47d8cde0683195b14d13c41dda66d0f0b0e111aed107e2fe",
"https://plugins.dprint.dev/json-0.17.4.wasm"
]

8
src/testRunner/unittests/services/colorization.ts
View File

@ -237,7 +237,7 @@ describe("unittests:: services:: Colorization", () => {
it("LexicallyClassifiesConflictTokens", () => {
// Test conflict markers.
testLexicalClassification(
"class C {\r\n\
"class C {\r\n\
<<<<<<< HEAD\r\n\
v = 1;\r\n\
=======\r\n\
@ -260,7 +260,7 @@ describe("unittests:: services:: Colorization", () => {
);
testLexicalClassification(
"<<<<<<< HEAD\r\n\
"<<<<<<< HEAD\r\n\
class C { }\r\n\
=======\r\n\
class D { }\r\n\
@ -277,7 +277,7 @@ class D { }\r\n\
);
testLexicalClassification(
"class C {\r\n\
"class C {\r\n\
<<<<<<< HEAD\r\n\
v = 1;\r\n\
||||||| merged common ancestors\r\n\
@ -303,7 +303,7 @@ class D { }\r\n\
);
testLexicalClassification(
"<<<<<<< HEAD\r\n\
"<<<<<<< HEAD\r\n\
class C { }\r\n\
||||||| merged common ancestors\r\n\
class E { }\r\n\