From 7dad68f869502e5c0ab32c12cbf8db866e020713 Mon Sep 17 00:00:00 2001
From: Jay Kwak <82421531+jkwak-work@users.noreply.github.com>
Date: Wed, 11 Jun 2025 22:33:16 -0700
Subject: Fix intermittent debug failures with Debug build (#7369)

This PR replaces enable/disable style C function calls with C++ RAII style code.

In debug build, when an assertion failed in between enable and disable functions, an exception is thrown and the disable function is not called. RAII style code is safer for an exception
---
 tests/language-server/robustness-2.slang         | 2 +-
 tests/language-server/robustness-3.slang         | 2 +-
 tests/language-server/robustness-4.slang         | 2 +-
 tests/language-server/robustness-5.slang         | 4 ++--
 tests/language-server/robustness-6.slang         | 2 +-
 tests/language-server/robustness-7.slang         | 4 ++--
 tests/language-server/robustness-8.slang         | 4 ++--
 tests/language-server/scalar-member.slang        | 4 ++--
 tests/language-server/smoke.slang                | 2 +-
 tests/language-server/this-type-hover.slang      | 2 +-
 tests/language-server/typename-enum-intval.slang | 4 ++--
 tests/language-server/vector-member.slang        | 4 ++--
 12 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'tests/language-server')

diff --git a/tests/language-server/robustness-2.slang b/tests/language-server/robustness-2.slang
index be488feba..bd73d25ed 100644
--- a/tests/language-server/robustness-2.slang
+++ b/tests/language-server/robustness-2.slang
@@ -1,4 +1,4 @@
-//DISABLE_TEST:LANG_SERVER:
+//TEST:LANG_SERVER:
 //
 // tests broken generic parameter.
 
diff --git a/tests/language-server/robustness-3.slang b/tests/language-server/robustness-3.slang
index 4f9c379da..29835eb70 100644
--- a/tests/language-server/robustness-3.slang
+++ b/tests/language-server/robustness-3.slang
@@ -1,4 +1,4 @@
-//DISABLE_TEST:LANG_SERVER:
+//TEST:LANG_SERVER:
 //
 // tests broken subscript decl.
 //HOVER:7,24
diff --git a/tests/language-server/robustness-4.slang b/tests/language-server/robustness-4.slang
index 39177dbef..d1f110f5c 100644
--- a/tests/language-server/robustness-4.slang
+++ b/tests/language-server/robustness-4.slang
@@ -1,4 +1,4 @@
-//DISABLE_TEST:LANG_SERVER:
+//TEST:LANG_SERVER:
 //
 //Broken syntax
 //HOVER:1,1
diff --git a/tests/language-server/robustness-5.slang b/tests/language-server/robustness-5.slang
index 9d53d3f38..a2d54b398 100644
--- a/tests/language-server/robustness-5.slang
+++ b/tests/language-server/robustness-5.slang
@@ -1,4 +1,4 @@
-//DISABLE_TEST:LANG_SERVER:
+//TEST:LANG_SERVER:
 //
 //Broken syntax
 //HOVER:9,11
@@ -10,4 +10,4 @@ struct MyStruct
 {
     int a = 5;
     
-}
+}
\ No newline at end of file
diff --git a/tests/language-server/robustness-6.slang b/tests/language-server/robustness-6.slang
index 89e9768f5..ef5924cf3 100644
--- a/tests/language-server/robustness-6.slang
+++ b/tests/language-server/robustness-6.slang
@@ -1,4 +1,4 @@
-//DISABLE_TEST:LANG_SERVER:
+//TEST:LANG_SERVER:
 //HOVER:4,8
 
 float dsqr<T:II
diff --git a/tests/language-server/robustness-7.slang b/tests/language-server/robustness-7.slang
index 178391a53..ebc34e078 100644
--- a/tests/language-server/robustness-7.slang
+++ b/tests/language-server/robustness-7.slang
@@ -1,4 +1,4 @@
-//DISABLE_TEST:LANG_SERVER:
+//TEST:LANG_SERVER:
 //HOVER:6,15
 
 // Test that we can specialize a generic method called through a dynamic interface.
@@ -60,4 +60,4 @@ void computeMain(uint3 dispatchThreadID: SV_DispatchThreadID)
     float arr[3] = { 2, 3, 4 };
     gOutputBuffer[0] = obj.run(arr);
 
-}
+}
\ No newline at end of file
diff --git a/tests/language-server/robustness-8.slang b/tests/language-server/robustness-8.slang
index 17939f841..84d6c8945 100644
--- a/tests/language-server/robustness-8.slang
+++ b/tests/language-server/robustness-8.slang
@@ -1,8 +1,8 @@
-//DISABLE_TEST:LANG_SERVER(filecheck=CHECK):
+//TEST:LANG_SERVER(filecheck=CHECK):
 //
 __generic < T : struct> extension T
 {
 // CHECK: null
 //HOVER:7,32
     __init(StructuredBuffer<T>) {}
-}
+}
\ No newline at end of file
diff --git a/tests/language-server/scalar-member.slang b/tests/language-server/scalar-member.slang
index 369bdc706..6b12ab897 100644
--- a/tests/language-server/scalar-member.slang
+++ b/tests/language-server/scalar-member.slang
@@ -1,4 +1,4 @@
-//DISABLE_TEST:LANG_SERVER(filecheck=CHECK):
+//TEST:LANG_SERVER(filecheck=CHECK):
 void f()
 {
     float v;
@@ -6,4 +6,4 @@ void f()
     v.
 }
 
-// CHECK: x
+// CHECK: x
\ No newline at end of file
diff --git a/tests/language-server/smoke.slang b/tests/language-server/smoke.slang
index 6222847eb..194902586 100644
--- a/tests/language-server/smoke.slang
+++ b/tests/language-server/smoke.slang
@@ -1,4 +1,4 @@
-//DISABLE_TEST(smoke):LANG_SERVER:
+//TEST(smoke):LANG_SERVER:
 //COMPLETE:31,21
 //HOVER:25,30
 //SIGNATURE:25,40
diff --git a/tests/language-server/this-type-hover.slang b/tests/language-server/this-type-hover.slang
index 230d8a59f..535e04e93 100644
--- a/tests/language-server/this-type-hover.slang
+++ b/tests/language-server/this-type-hover.slang
@@ -1,4 +1,4 @@
-//DISABLE_TEST:LANG_SERVER(filecheck=CHECK):
+//TEST:LANG_SERVER(filecheck=CHECK):
 
 struct G
 {}
diff --git a/tests/language-server/typename-enum-intval.slang b/tests/language-server/typename-enum-intval.slang
index 31e35d9a7..9eca71ae2 100644
--- a/tests/language-server/typename-enum-intval.slang
+++ b/tests/language-server/typename-enum-intval.slang
@@ -1,4 +1,4 @@
-//DISABLE_TEST:LANG_SERVER(filecheck=CHECK):
+//TEST:LANG_SERVER(filecheck=CHECK):
 
 namespace ns {
 enum Test : uint32_t
@@ -21,4 +21,4 @@ void f()
 }
 
 // CHECK: ns.Foo<ns.Test.A>
-// CHECK: ns.Foo<ns.Test(3)>
+// CHECK: ns.Foo<ns.Test(3)>
\ No newline at end of file
diff --git a/tests/language-server/vector-member.slang b/tests/language-server/vector-member.slang
index 78a8a884d..341544ac0 100644
--- a/tests/language-server/vector-member.slang
+++ b/tests/language-server/vector-member.slang
@@ -1,4 +1,4 @@
-//DISABLE_TEST:LANG_SERVER(filecheck=CHECK):
+//TEST:LANG_SERVER(filecheck=CHECK):
 void f()
 {
     float4 v;
@@ -9,4 +9,4 @@ void f()
 // CHECK: x
 // CHECK: y
 // CHECK: z
-// CHECK: w
+// CHECK: w
\ No newline at end of file
-- 
cgit v1.2.3