Skip to content

Commit c105023

Browse files
committed
updatefailing
1 parent ea1ac02 commit c105023

File tree

219 files changed

+171
-730
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

219 files changed

+171
-730
lines changed

internal/fourslash/_scripts/crashingTests.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ TestCompletionsImport_require_addToExisting
33
TestCompletionsUniqueSymbol_import
44
TestFindReferencesBindingPatternInJsdocNoCrash1
55
TestFindReferencesBindingPatternInJsdocNoCrash2
6+
TestFormatDocumentWithTrivia
7+
TestFormattingJsxTexts4
68
TestGetOccurrencesIfElseBroken
79
TestImportNameCodeFix_importType8
810
TestJsdocLink2

internal/fourslash/_scripts/failingTests.txt

Lines changed: 1 addition & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ TestAutoImportProvider_wildcardExports2
3939
TestAutoImportProvider_wildcardExports3
4040
TestAutoImportProvider1
4141
TestAutoImportProvider4
42-
TestAutoImportProvider7
43-
TestAutoImportProvider8
4442
TestAutoImportProvider9
4543
TestAutoImportSortCaseSensitivity1
4644
TestAutoImportTypeImport1
@@ -100,7 +98,6 @@ TestCompletionForStringLiteralNonrelativeImport2
10098
TestCompletionForStringLiteralNonrelativeImport3
10199
TestCompletionForStringLiteralNonrelativeImport4
102100
TestCompletionForStringLiteralNonrelativeImport8
103-
TestCompletionForStringLiteralNonrelativeImport9
104101
TestCompletionForStringLiteralNonrelativeImportTypings1
105102
TestCompletionForStringLiteralNonrelativeImportTypings2
106103
TestCompletionForStringLiteralNonrelativeImportTypings3
@@ -244,7 +241,6 @@ TestCompletionsWithDeprecatedTag10
244241
TestCompletionWithConditionalOperatorMissingColon
245242
TestConstEnumQuickInfoAndCompletionList
246243
TestConstQuickInfoAndCompletionList
247-
TestConstructorBraceFormatting
248244
TestContextuallyTypedFunctionExpressionGeneric1
249245
TestContextualTypingOfGenericCallSignatures2
250246
TestCrossFileQuickInfoExportedTypeDoesNotUseImportType
@@ -336,27 +332,6 @@ TestFormatVariableDeclarationList
336332
TestFormatWithStatement
337333
TestFunctionIndentation
338334
TestFunctionTypePredicateFormatting
339-
TestFormatAfterWhitespace
340-
TestFormatAnyTypeLiteral
341-
TestFormatEmptyBlock
342-
TestFormatEmptyParamList
343-
TestFormatonkey01
344-
TestFormatOnSemiColonAfterBreak
345-
TestFormattingAfterMultiLineIfCondition
346-
TestFormattingBlockInCaseClauses
347-
TestFormattingEqualsBeforeBracketInTypeAlias
348-
TestFormattingIfInElseBlock
349-
TestFormattingInExpressionsInTsx
350-
TestFormattingOfChainedLambda
351-
TestFormattingOnCloseBrace
352-
TestFormattingOnDoWhileNoSemicolon
353-
TestFormattingOnEnter
354-
TestFormattingOnNestedDoWhileByEnter
355-
TestFormattingOnSemiColon
356-
TestFormattingSpaceAfterCommaBeforeOpenParen
357-
TestFormattingTemplates
358-
TestFormattingWithMultilineComments
359-
TestFunctionTypeFormatting
360335
TestFunduleWithRecursiveReference
361336
TestGenericCombinators3
362337
TestGenericCombinatorWithConstraints1
@@ -406,7 +381,6 @@ TestImportCompletionsPackageJsonImportsPattern2
406381
TestImportFixesGlobalTypingsCache
407382
TestImportMetaCompletionDetails
408383
TestImportNameCodeFix_avoidRelativeNodeModules
409-
TestImportNameCodeFix_externalNonRelateive2
410384
TestImportNameCodeFix_externalNonRelative1
411385
TestImportNameCodeFix_fileWithNoTrailingNewline
412386
TestImportNameCodeFix_HeaderComment1
@@ -500,8 +474,6 @@ TestMemberListInReopenedEnum
500474
TestMemberListInWithBlock
501475
TestMemberListOfExportedClass
502476
TestMemberListOnContextualThis
503-
TestModuleNodeNextAutoImport2
504-
TestModuleNodeNextAutoImport3
505477
TestMultilineCommentBeforeOpenBrace
506478
TestMultiModuleFundule
507479
TestNgProxy1
@@ -514,7 +486,6 @@ TestOptionalPropertyFormatting
514486
TestOverloadQuickInfo
515487
TestParameterWithDestructuring
516488
TestParameterWithNestedDestructuring
517-
TestPaste
518489
TestPathCompletionsAllowModuleAugmentationExtensions
519490
TestPathCompletionsAllowTsExtensions
520491
TestPathCompletionsPackageJsonExportsBundlerNoNodeCondition
@@ -685,12 +656,8 @@ TestRenamePrivateFields
685656
TestReverseMappedTypeQuickInfo
686657
TestSelfReferencedExternalModule
687658
TestSemicolonFormattingNestedStatements
688-
TestSpaceAfterReturn
689-
TestSemicolonFormatting
690-
TestSemicolonFormattingAfterArrayLiteral
691-
TestSemicolonFormattingNestedStatements
692659
TestSignatureHelpCallExpressionJs
693-
TestSpaceAfterConstructor
660+
TestSpaceAfterReturn
694661
TestStringCompletionsImportOrExportSpecifier
695662
TestStringCompletionsVsEscaping
696663
TestSymbolCompletionLowerPriority
@@ -715,7 +682,6 @@ TestTsxQuickInfo7
715682
TestTypeCheckAfterResolve
716683
TestTypeOperatorNodeBuilding
717684
TestUnclosedStringLiteralAutoformating
718-
TestWhiteSpaceBeforeReturnTypeFormatting
719685
TestWhiteSpaceTrimming
720686
TestWhiteSpaceTrimming2
721687
TestWhiteSpaceTrimming4

internal/fourslash/tests/gen/asOperatorFormatting_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
)
99

1010
func TestAsOperatorFormatting(t *testing.T) {
11+
fourslash.SkipIfFailing(t)
1112
t.Parallel()
12-
1313
defer testutil.RecoverAndFail(t, "Panic on fourslash test")
1414
const content = `/**/var x = 3 as number;`
1515
f, done := fourslash.NewFourslash(t, nil /*capabilities*/, content)

internal/fourslash/tests/gen/autoFormattingOnPasting_test.go

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,8 @@ import (
88
)
99

1010
func TestAutoFormattingOnPasting(t *testing.T) {
11-
<<<<<<< HEAD
12-
t.Parallel()
13-
t.Skip()
14-
=======
1511
fourslash.SkipIfFailing(t)
1612
t.Parallel()
17-
>>>>>>> 20bf4fc90d3d38016f07fda1fb972eedc715bb02
1813
defer testutil.RecoverAndFail(t, "Panic on fourslash test")
1914
const content = `module TestModule {
2015
/**/
@@ -23,14 +18,10 @@ func TestAutoFormattingOnPasting(t *testing.T) {
2318
defer done()
2419
f.GoToMarker(t, "")
2520
f.Paste(t, " class TestClass{\nprivate foo;\npublic testMethod( )\n{}\n}")
26-
<<<<<<< HEAD
2721
f.VerifyCurrentFileContent(t, `module TestModule {
2822
class TestClass {
2923
private foo;
3024
public testMethod() { }
3125
}
3226
}`)
33-
=======
34-
f.VerifyCurrentFileContentIs(t, "module TestModule {\n class TestClass {\n private foo;\n public testMethod() { }\n }\n}")
35-
>>>>>>> 20bf4fc90d3d38016f07fda1fb972eedc715bb02
3627
}

internal/fourslash/tests/gen/autoImportProvider1_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
)
99

1010
func TestAutoImportProvider1(t *testing.T) {
11+
fourslash.SkipIfFailing(t)
1112
t.Parallel()
12-
t.Skip()
1313
defer testutil.RecoverAndFail(t, "Panic on fourslash test")
1414
const content = `// @Filename: /home/src/workspaces/project/node_modules/@angular/forms/package.json
1515
{ "name": "@angular/forms", "typings": "./forms.d.ts" }

internal/fourslash/tests/gen/autoImportProvider2_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
)
99

1010
func TestAutoImportProvider2(t *testing.T) {
11+
fourslash.SkipIfFailing(t)
1112
t.Parallel()
12-
1313
defer testutil.RecoverAndFail(t, "Panic on fourslash test")
1414
const content = `// @Filename: /home/src/workspaces/project/node_modules/direct-dependency/package.json
1515
{ "name": "direct-dependency", "dependencies": { "indirect-dependency": "*" } }

internal/fourslash/tests/gen/autoImportProvider7_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111
)
1212

1313
func TestAutoImportProvider7(t *testing.T) {
14+
fourslash.SkipIfFailing(t)
1415
t.Parallel()
15-
t.Skip()
1616
defer testutil.RecoverAndFail(t, "Panic on fourslash test")
1717
const content = `// @Filename: /home/src/workspaces/project/tsconfig.json
1818
{ "compilerOptions": { "module": "commonjs" } }

internal/fourslash/tests/gen/autoImportProvider8_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111
)
1212

1313
func TestAutoImportProvider8(t *testing.T) {
14+
fourslash.SkipIfFailing(t)
1415
t.Parallel()
15-
t.Skip()
1616
defer testutil.RecoverAndFail(t, "Panic on fourslash test")
1717
const content = `// @Filename: /home/src/workspaces/project/tsconfig.json
1818
{ "compilerOptions": { "module": "commonjs" } }

internal/fourslash/tests/gen/chainedFatArrowFormatting_test.go

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,13 @@ import (
88
)
99

1010
func TestChainedFatArrowFormatting(t *testing.T) {
11-
<<<<<<< HEAD
12-
t.Parallel()
13-
14-
=======
1511
fourslash.SkipIfFailing(t)
1612
t.Parallel()
17-
>>>>>>> 20bf4fc90d3d38016f07fda1fb972eedc715bb02
1813
defer testutil.RecoverAndFail(t, "Panic on fourslash test")
1914
const content = `var fn = () => () => null/**/`
2015
f, done := fourslash.NewFourslash(t, nil /*capabilities*/, content)
2116
defer done()
2217
f.GoToMarker(t, "")
2318
f.Insert(t, ";")
24-
<<<<<<< HEAD
2519
f.VerifyCurrentLineContent(t, `var fn = () => () => null;`)
26-
=======
27-
f.VerifyCurrentLineContentIs(t, "var fn = () => () => null;")
28-
>>>>>>> 20bf4fc90d3d38016f07fda1fb972eedc715bb02
2920
}

internal/fourslash/tests/gen/commentsBlocks_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
)
99

1010
func TestCommentsBlocks(t *testing.T) {
11+
fourslash.SkipIfFailing(t)
1112
t.Parallel()
12-
1313
defer testutil.RecoverAndFail(t, "Panic on fourslash test")
1414
const content = `/*1*/// 1
1515
var x,

0 commit comments

Comments
 (0)