remove Const:: prefix

Author: Deep Furiya

src/autocomplete/IntrinsicFunctionArgumentCompletionProvider.ts

@@ -277,10 +277,9 @@ export class IntrinsicFunctionArgumentCompletionProvider implements CompletionPr
                       : String(constant.value);
 
             completionItems.push(
-                createCompletionItem(`Const::${constantName}`, CompletionItemKind.Constant, {
+                createCompletionItem(constantName, CompletionItemKind.Constant, {
                     detail: `Constant`,
                     documentation: `Value: ${valuePreview}`,
-                    insertText: `Const::${constantName}`,
                 }),
             );
         }

tst/resources/templates/constants.json

@@ -3,7 +3,7 @@
   "Transform": "AWS::LanguageExtensions",
   "Constants": {
     "foo": "bar",
-    "sub": "${Const::foo}-abc-${AWS::AccountId}",
+    "sub": "${foo}-abc-${AWS::AccountId}",
     "obj": {
       "TestObject": {
         "A": "b"
@@ -15,21 +15,21 @@
       "Type": "AWS::S3::Bucket",
       "Metadata": {
         "Test": {
-          "Fn::Sub": "${Const::sub}-xyz"
+          "Fn::Sub": "${sub}-xyz"
         },
         "TestObj": {
-          "Ref": "Const::obj"
+          "Ref": "obj"
         }
       },
       "Properties": {
         "BucketName": {
-          "Fn::Sub": "${Const::foo}"
+          "Fn::Sub": "${foo}"
         },
         "Tags": [
           {
             "Key": "Environment",
             "Value": {
-              "Ref": "Const::foo"
+              "Ref": "foo"
             }
           }
         ]

tst/resources/templates/constants.yaml

@@ -3,7 +3,7 @@ Transform: AWS::LanguageExtensions
 
 Constants:
   foo: bar
-  sub: "${Const::foo}-abc-${AWS::AccountId}"
+  sub: "${foo}-abc-${AWS::AccountId}"
   obj:
     TestObject:
       A: b
@@ -12,16 +12,15 @@ Resources:
   Bucket:
     Type: AWS::S3::Bucket
     Metadata:
-      Test: !Sub ${Const::sub}-xyz
-      TestObj: !Ref Const::obj
+      Test: !Sub ${sub}-xyz
+      TestObj: !Ref obj
     Properties:
-      BucketName: !Sub ${Const::foo}
+      BucketName: !Sub ${foo}
       Tags:
         - Key: Environment
-          Value: !Ref Const::foo
+          Value: !Ref foo
 
   PersonalS3:
     Type: AWS::S3::Bucket
     Properties:
       BucketName: my-personal-bucket
-

tst/unit/autocomplete/IntrinsicFunctionArgumentCompletionProvider.Constants.test.ts

@@ -47,7 +47,7 @@ describe('IntrinsicFunctionArgumentCompletionProvider - Constants', () => {
         constantsMap.set('foo', fooContext);
 
         // String constant with interpolation
-        const subConstant = new Constant('sub', '${Const::foo}-abc-${AWS::AccountId}');
+        const subConstant = new Constant('sub', '${foo}-abc-${AWS::AccountId}');
         const subContext = createMockContext(TopLevelSection.Constants, 'sub', { text: '' });
         Object.defineProperty(subContext, 'entity', { value: subConstant, writable: false });
         constantsMap.set('sub', subContext);
@@ -92,12 +92,12 @@ describe('IntrinsicFunctionArgumentCompletionProvider - Constants', () => {
                 const result = provider.getCompletions(context, createTestParams());
 
                 expect(result).toBeDefined();
-                const constantItems = result!.filter((item) => item.label.startsWith('Const::'));
+                const constantItems = result!.filter((item) => item.kind === CompletionItemKind.Constant);
 
                 expect(constantItems.length).toBe(3);
-                expect(constantItems.find((item) => item.label === 'Const::foo')).toBeDefined();
-                expect(constantItems.find((item) => item.label === 'Const::sub')).toBeDefined();
-                expect(constantItems.find((item) => item.label === 'Const::obj')).toBeDefined();
+                expect(constantItems.find((item) => item.label === 'foo')).toBeDefined();
+                expect(constantItems.find((item) => item.label === 'sub')).toBeDefined();
+                expect(constantItems.find((item) => item.label === 'obj')).toBeDefined();
             });
 
             it('should show Constants with correct CompletionItemKind', () => {
@@ -114,7 +114,7 @@ describe('IntrinsicFunctionArgumentCompletionProvider - Constants', () => {
 
                 const result = provider.getCompletions(context, createTestParams());
 
-                const constantItems = result!.filter((item) => item.label.startsWith('Const::'));
+                const constantItems = result!.filter((item) => item.kind === CompletionItemKind.Constant);
                 for (const item of constantItems) {
                     expect(item.kind).toBe(CompletionItemKind.Constant);
                     expect(item.detail).toBe('Constant');
@@ -138,13 +138,13 @@ describe('IntrinsicFunctionArgumentCompletionProvider - Constants', () => {
                 const result = provider.getCompletions(context, createTestParams());
 
                 expect(result).toBeDefined();
-                const constantItems = result!.filter((item) => item.label.startsWith('Const::'));
+                const constantItems = result!.filter((item) => item.kind === CompletionItemKind.Constant);
 
                 // Should only have string constants (foo and sub), not obj
                 expect(constantItems.length).toBe(2);
-                expect(constantItems.find((item) => item.label === 'Const::foo')).toBeDefined();
-                expect(constantItems.find((item) => item.label === 'Const::sub')).toBeDefined();
-                expect(constantItems.find((item) => item.label === 'Const::obj')).toBeUndefined();
+                expect(constantItems.find((item) => item.label === 'foo')).toBeDefined();
+                expect(constantItems.find((item) => item.label === 'sub')).toBeDefined();
+                expect(constantItems.find((item) => item.label === 'obj')).toBeUndefined();
             });
 
             it('should show string Constants with value preview in documentation', () => {
@@ -161,7 +161,7 @@ describe('IntrinsicFunctionArgumentCompletionProvider - Constants', () => {
 
                 const result = provider.getCompletions(context, createTestParams());
 
-                const fooItem = result!.find((item) => item.label === 'Const::foo');
+                const fooItem = result!.find((item) => item.label === 'foo');
                 expect(fooItem).toBeDefined();
                 expect(fooItem!.documentation).toContain('Value: bar');
             });
@@ -199,7 +199,7 @@ describe('IntrinsicFunctionArgumentCompletionProvider - Constants', () => {
                 const result = provider.getCompletions(context, createTestParams());
 
                 expect(result).toBeDefined();
-                const constantItems = result!.filter((item) => item.label.startsWith('Const::'));
+                const constantItems = result!.filter((item) => item.kind === CompletionItemKind.Constant);
 
                 expect(constantItems.length).toBe(0);
             });
@@ -221,7 +221,7 @@ describe('IntrinsicFunctionArgumentCompletionProvider - Constants', () => {
                 const result = provider.getCompletions(context, createTestParams());
 
                 expect(result).toBeDefined();
-                const constantItems = result!.filter((item) => item.label.startsWith('Const::'));
+                const constantItems = result!.filter((item) => item.kind === CompletionItemKind.Constant);
 
                 expect(constantItems.length).toBe(0);
             });

tst/unit/context/Context.test.ts

@@ -876,7 +876,7 @@ Resources:
 
                 const constant = entity as Constant;
                 expect(constant.name).toBe('sub');
-                expect(constant.value).toContain('${Const::foo}');
+                expect(constant.value).toContain('${foo}');
                 expect(constant.value).toContain('${AWS::AccountId}');
             });