Merge branch 'main' into tcgc/forbid-polymorphism-flatten

Azure · Jul 23, 2024 · d0c63ec · d0c63ec
2 parents a037487 + 0739f7e
commit d0c63ec
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 42 deletions.
diff --git a/.chronus/changes/operation-validation-2024-6-19-18-35-46.md b/.chronus/changes/operation-validation-2024-6-19-18-35-46.md
diff --git a/.chronus/changes/revert-fix-2024-6-23-10-47-25.md b/.chronus/changes/revert-fix-2024-6-23-10-47-25.md
@@ -0,0 +1,7 @@
+---
+changeKind: internal
+packages:
+  - "@azure-tools/typespec-client-generator-core"
+---
+
+Revert "fix @clientName validation for operation within interface"
diff --git a/packages/typespec-client-generator-core/src/validate.ts b/packages/typespec-client-generator-core/src/validate.ts
@@ -57,11 +57,6 @@ function validateClientNamesPerNamespace(
   // Check for duplicate client names for operations
   validateClientNamesCore(tcgcContext, scope, namespace.operations.values());
 
-  // check for duplicate client names for operations in interfaces
-  for (const item of namespace.interfaces.values()) {
-    validateClientNamesCore(tcgcContext, scope, item.operations.values());
-  }
-
   // Check for duplicate client names for interfaces
   validateClientNamesCore(tcgcContext, scope, namespace.interfaces.values());
 

diff --git a/packages/typespec-client-generator-core/test/decorators.test.ts b/packages/typespec-client-generator-core/test/decorators.test.ts
@@ -2864,36 +2864,6 @@ describe("typespec-client-generator-core: decorators", () => {
       ]);
     });
 
-    it("duplicate operation in interface with all language scopes", async () => {
-      const diagnostics = await runner.diagnose(
-        `
-      @service
-      namespace Contoso.WidgetManager;
-      
-      interface C {
-        @clientName("b")
-        @route("/a")
-        op a(): void;
-
-        @route("/b")
-        op b(): void;
-      }
-      `
-      );
-
-      expectDiagnostics(diagnostics, [
-        {
-          code: "@azure-tools/typespec-client-generator-core/duplicate-client-name",
-          message: 'Client name: "b" is duplicated in language scope: "AllScopes"',
-        },
-        {
-          code: "@azure-tools/typespec-client-generator-core/duplicate-client-name",
-          message:
-            'Client name: "b" is defined somewhere causing nameing conflicts in language scope: "AllScopes"',
-        },
-      ]);
-    });
-
     it("duplicate scalar with all language scopes", async () => {
       const diagnostics = await runner.diagnose(
         `