From f86b9d1ca9247fe2f966cf0cb50874e18b472f43 Mon Sep 17 00:00:00 2001
From: aniket-engg <aniketengg.225@gmail.com>
Date: Mon, 4 Sep 2023 14:23:42 +0530
Subject: [PATCH] refactoring

---
 .../src/lib/providers/codeActionProvider.ts   | 21 +++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/libs/remix-ui/editor/src/lib/providers/codeActionProvider.ts b/libs/remix-ui/editor/src/lib/providers/codeActionProvider.ts
index e9cd42d8b4..ed21db9a4d 100644
--- a/libs/remix-ui/editor/src/lib/providers/codeActionProvider.ts
+++ b/libs/remix-ui/editor/src/lib/providers/codeActionProvider.ts
@@ -29,10 +29,7 @@ export class RemixCodeActionProvider implements monaco.languages.CodeActionProvi
           lineNumber: error.startLineNumber,
           column: error.startColumn
         })
-        console.log('cursorPosition------>', cursorPosition)
         const nodeAtPosition = await this.props.plugin.call('codeParser', 'definitionAtPosition', cursorPosition)
-        console.log('nodeAtPosition------>', nodeAtPosition)
-        console.log('error------>', error)
         // Check if a function is hovered
         if (nodeAtPosition && nodeAtPosition.nodeType === 'FunctionDefinition') {
           // Identify type of AST node
@@ -49,18 +46,9 @@ export class RemixCodeActionProvider implements monaco.languages.CodeActionProvi
               text: msg
             })
           }
-        } else if (nodeAtPosition && nodeAtPosition.nodeType === 'ContractDefinition') {
-          for (const fix of fixes) {
-            const lineContent: string = model.getValueInRange(error)
-            this.addQuickFix(actions, error, model.uri, {
-              title: fix.title,
-              range: error,
-              text: fix.message + lineContent
-            })
-          }
         } else {
           for (const fix of fixes) {
-            if (fix && nodeAtPosition && fix.nodeType !== nodeAtPosition.nodeType) continue
+            if (fix && nodeAtPosition && fix.nodeType && fix.nodeType !== nodeAtPosition.nodeType) continue
             if (fix.id === 2) {
               // To add specific pragma based on error
               const startIndex = error.message.indexOf('pragma')
@@ -71,6 +59,13 @@ export class RemixCodeActionProvider implements monaco.languages.CodeActionProvi
                 range: fix.range,
                 text: msg
               })
+            } else if (fix.id === 6) {
+              const lineContent: string = model.getValueInRange(error)
+              this.addQuickFix(actions, error, model.uri, {
+                title: fix.title,
+                range: error,
+                text: fix.message + lineContent
+              })
             } else if (fix.id === 7) {
               // To update pragma same as selected compiler version
               const startIndex = error.message.indexOf('is')