From b17b7b9374cbfb7ac2b344b5363eefbac700ddd0 Mon Sep 17 00:00:00 2001 From: uniqueiniquity Date: Thu, 2 Nov 2017 11:00:30 -0700 Subject: [PATCH] Revert "Update tests to expect empty doc comment template" This reverts commit b566480aaaf92460b37eb0977b5c07c1c0729c85. --- src/harness/fourslash.ts | 4 ++-- tests/cases/fourslash/docCommentTemplateEmptyFile.ts | 2 +- tests/cases/fourslash/docCommentTemplateInMultiLineComment.ts | 2 +- .../cases/fourslash/docCommentTemplateInSingleLineComment.ts | 2 +- .../fourslash/docCommentTemplateInsideFunctionDeclaration.ts | 2 +- .../fourslash/docCommentTemplateNamespacesAndModules02.ts | 4 ++-- tests/cases/fourslash/docCommentTemplateRegex.ts | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts index 79cd18da839..7ba4e94902d 100644 --- a/src/harness/fourslash.ts +++ b/src/harness/fourslash.ts @@ -4050,9 +4050,9 @@ namespace FourSlashInterface { this.state.verifyDocCommentTemplate({ newText: expectedText.replace(/\r?\n/g, "\r\n"), caretOffset: expectedOffset }); } - public emptyDocCommentTemplateAt(marker: string | FourSlash.Marker) { + public noDocCommentTemplateAt(marker: string | FourSlash.Marker) { this.state.goToMarker(marker); - this.state.verifyDocCommentTemplate({ newText: "", caretOffset: 0 }); + this.state.verifyDocCommentTemplate(/*expected*/ undefined); } public rangeAfterCodeFix(expectedText: string, includeWhiteSpace?: boolean, errorCode?: number, index?: number): void { diff --git a/tests/cases/fourslash/docCommentTemplateEmptyFile.ts b/tests/cases/fourslash/docCommentTemplateEmptyFile.ts index 6dcb5ef832b..f04653dc328 100644 --- a/tests/cases/fourslash/docCommentTemplateEmptyFile.ts +++ b/tests/cases/fourslash/docCommentTemplateEmptyFile.ts @@ -3,4 +3,4 @@ // @Filename: emptyFile.ts /////*0*/ -verify.emptyDocCommentTemplateAt("0"); +verify.noDocCommentTemplateAt("0"); diff --git a/tests/cases/fourslash/docCommentTemplateInMultiLineComment.ts b/tests/cases/fourslash/docCommentTemplateInMultiLineComment.ts index dc3da4e7599..6e749782c7d 100644 --- a/tests/cases/fourslash/docCommentTemplateInMultiLineComment.ts +++ b/tests/cases/fourslash/docCommentTemplateInMultiLineComment.ts @@ -3,4 +3,4 @@ // @Filename: justAComment.ts //// /* /*0*/ */ -verify.emptyDocCommentTemplateAt("0"); +verify.noDocCommentTemplateAt("0"); diff --git a/tests/cases/fourslash/docCommentTemplateInSingleLineComment.ts b/tests/cases/fourslash/docCommentTemplateInSingleLineComment.ts index 472d417a9ff..b60fff2d590 100644 --- a/tests/cases/fourslash/docCommentTemplateInSingleLineComment.ts +++ b/tests/cases/fourslash/docCommentTemplateInSingleLineComment.ts @@ -9,5 +9,5 @@ //// // /*2*/ for (const marker of test.markers()) { - verify.emptyDocCommentTemplateAt(marker); + verify.noDocCommentTemplateAt(marker); } diff --git a/tests/cases/fourslash/docCommentTemplateInsideFunctionDeclaration.ts b/tests/cases/fourslash/docCommentTemplateInsideFunctionDeclaration.ts index 13b6ebc0df6..e0ebc00dc39 100644 --- a/tests/cases/fourslash/docCommentTemplateInsideFunctionDeclaration.ts +++ b/tests/cases/fourslash/docCommentTemplateInsideFunctionDeclaration.ts @@ -4,5 +4,5 @@ ////f/*0*/unction /*1*/foo/*2*/(/*3*/) /*4*/{ /*5*/} for (const marker of test.markers()) { - verify.emptyDocCommentTemplateAt(marker); + verify.noDocCommentTemplateAt(marker); } diff --git a/tests/cases/fourslash/docCommentTemplateNamespacesAndModules02.ts b/tests/cases/fourslash/docCommentTemplateNamespacesAndModules02.ts index c1b9ed23ad6..787e9f04481 100644 --- a/tests/cases/fourslash/docCommentTemplateNamespacesAndModules02.ts +++ b/tests/cases/fourslash/docCommentTemplateNamespacesAndModules02.ts @@ -9,6 +9,6 @@ verify.docCommentTemplateAt("top", /*indentation*/ 3, "/** */"); -verify.emptyDocCommentTemplateAt("n2"); +verify.noDocCommentTemplateAt("n2"); -verify.emptyDocCommentTemplateAt("n3"); +verify.noDocCommentTemplateAt("n3"); diff --git a/tests/cases/fourslash/docCommentTemplateRegex.ts b/tests/cases/fourslash/docCommentTemplateRegex.ts index 7a6af09aeb5..685c1ca5aef 100644 --- a/tests/cases/fourslash/docCommentTemplateRegex.ts +++ b/tests/cases/fourslash/docCommentTemplateRegex.ts @@ -4,5 +4,5 @@ ////var regex = /*0*///*1*/asdf/*2*/ /*3*///*4*/; for (const marker of test.markers()) { - verify.emptyDocCommentTemplateAt(marker); + verify.noDocCommentTemplateAt(marker); }