Merge pull request #3991 from microsoft/bugfix/es-tslint-disable-syntax

- fixes syntax for eslint/tslint enable/disable
microsoft · Jan 11, 2024 · c6d658c · c6d658c
2 parents 41efcb7 + b8fe12e
commit c6d658c
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed a bug where constructors and model names where clashing in Go. [#3920](https://github.com/microsoft/kiota/issues/3920)
 - Fixed a bug where the order of enum declaration might results in a missing enum type. [#3935](https://github.com/microsoft/kiota/issues/3935)
 - Fixed java generating compound types with underscore in the name. [#3824](https://github.com/microsoft/kiota/issues/3824)
+- Fixed syntax for ES/TS lint enable/disable.
 
 ## [1.9.1] - 2023-12-13
 

diff --git a/src/Kiota.Builder/Writers/TypeScript/TypeScriptConventionService.cs b/src/Kiota.Builder/Writers/TypeScript/TypeScriptConventionService.cs
@@ -13,14 +13,14 @@ public class TypeScriptConventionService : CommonLanguageConventionService
 {
     internal void WriteAutoGeneratedStart(LanguageWriter writer)
     {
-        writer.WriteLine("// tslint:disable");
-        writer.WriteLine("// eslint-disable");
+        writer.WriteLine("/* tslint:disable */");
+        writer.WriteLine("/* eslint-disable */");
         writer.WriteLine("// Generated by Microsoft Kiota");
     }
     internal void WriteAutoGeneratedEnd(LanguageWriter writer)
     {
-        writer.WriteLine("// tslint:enable");
-        writer.WriteLine("// eslint-enable");
+        writer.WriteLine("/* tslint:enable */");
+        writer.WriteLine("/* eslint-enable */");
     }
     public override string StreamTypeName => "ArrayBuffer";
     public override string VoidTypeName => "void";

diff --git a/tests/Kiota.Builder.Tests/Writers/TypeScript/CodeClassDeclarationWriterTests.cs b/tests/Kiota.Builder.Tests/Writers/TypeScript/CodeClassDeclarationWriterTests.cs
@@ -41,8 +41,8 @@ public void WritesAutoGenerationStart()
     {
         codeElementWriter.WriteCodeElement(parentClass.StartBlock, writer);
         var result = tw.ToString();
-        Assert.Contains("// eslint-disable", result);
-        Assert.Contains("// tslint:disable", result);
+        Assert.Contains("/* eslint-disable */", result);
+        Assert.Contains("/* tslint:disable */", result);
     }
     [Fact]
     public void WritesSimpleDeclaration()

diff --git a/tests/Kiota.Builder.Tests/Writers/TypeScript/CodeClassEndWriterTests.cs b/tests/Kiota.Builder.Tests/Writers/TypeScript/CodeClassEndWriterTests.cs
@@ -45,16 +45,16 @@ public void ClosesNestedClasses()
         codeElementWriter.WriteCodeElement(child.EndBlock, writer);
         var result = tw.ToString();
         Assert.Equal(1, result.Count(x => x == '}'));
-        Assert.DoesNotContain("// eslint-enable", result);
-        Assert.DoesNotContain("// tslint:enable", result);
+        Assert.DoesNotContain("/* eslint-enable */", result);
+        Assert.DoesNotContain("/* tslint:enable */", result);
     }
     [Fact]
     public void ClosesNonNestedClasses()
     {
         codeElementWriter.WriteCodeElement(parentClass.EndBlock, writer);
         var result = tw.ToString();
-        Assert.Contains("// eslint-enable", result);
-        Assert.Contains("// tslint:enable", result);
+        Assert.Contains("/* eslint-enable */", result);
+        Assert.Contains("/* tslint:enable */", result);
         Assert.Equal(1, result.Count(x => x == '}'));
     }
 }
diff --git a/tests/Kiota.Builder.Tests/Writers/TypeScript/CodeFileWriterTests.cs b/tests/Kiota.Builder.Tests/Writers/TypeScript/CodeFileWriterTests.cs
@@ -57,13 +57,13 @@ public async Task WritesAutoGenerationStart()
         WriteCode(writer, codeFile);
 
         var result = tw.ToString();
-        Assert.Contains("// eslint-disable", result);
-        Assert.Contains("// tslint:disable", result);
+        Assert.Contains("/* eslint-disable */", result);
+        Assert.Contains("/* tslint:disable */", result);
         Assert.Contains("export function deserializeIntoParentClass", result);
         Assert.Contains("export interface ParentClass", result);
         Assert.Contains("export function serializeParentClass", result);
-        Assert.Contains("// eslint-enable", result);
-        Assert.Contains("// tslint:enable", result);
+        Assert.Contains("/* eslint-enable */", result);
+        Assert.Contains("/* tslint:enable */", result);
     }
 
 }
diff --git a/tests/Kiota.Builder.Tests/Writers/TypeScript/CodeFunctionWriterTests.cs b/tests/Kiota.Builder.Tests/Writers/TypeScript/CodeFunctionWriterTests.cs
@@ -43,8 +43,8 @@ public async Task WritesAutoGenerationStart()
         var serializeFunction = root.FindChildByName<CodeFunction>($"deserializeInto{parentClass.Name.ToFirstCharacterUpperCase()}");
         writer.Write(serializeFunction);
         var result = tw.ToString();
-        Assert.DoesNotContain("// eslint-disable", result);
-        Assert.DoesNotContain("// tslint:disable", result);
+        Assert.DoesNotContain("/* eslint-disable */", result);
+        Assert.DoesNotContain("/* tslint:disable */", result);
     }
     [Fact]
     public async Task WritesAutoGenerationEnd()
@@ -56,8 +56,8 @@ public async Task WritesAutoGenerationEnd()
         var serializeFunction = root.FindChildByName<CodeFunction>($"deserializeInto{parentClass.Name.ToFirstCharacterUpperCase()}");
         writer.Write(serializeFunction);
         var result = tw.ToString();
-        Assert.DoesNotContain("// eslint-enable", result); //written by code end block writer
-        Assert.DoesNotContain("// tslint:enable", result);
+        Assert.DoesNotContain("/* eslint-enable */", result); //written by code end block writer
+        Assert.DoesNotContain("/* tslint:enable */", result);
     }
 
     [Fact]

diff --git a/tests/Kiota.Builder.Tests/Writers/TypeScript/CodeInterfaceDeclarationWriterTests .cs b/tests/Kiota.Builder.Tests/Writers/TypeScript/CodeInterfaceDeclarationWriterTests .cs
@@ -35,8 +35,8 @@ public void WritesAutoGenerationStart()
     {
         writer.Write(parentInterface.StartBlock);
         var result = tw.ToString();
-        Assert.Contains("// eslint-disable", result);
-        Assert.Contains("// tslint:disable", result);
+        Assert.Contains("/* eslint-disable */", result);
+        Assert.Contains("/* tslint:disable */", result);
     }
     [Fact]
     public void WritesSimpleDeclaration()