[2201.5.x] Fix Issues in Code Modifier with GraphQL Imports

[ThisaruGuruge]

Purpose

$Subject

Fixes: #4364
Fixes: #4379

Examples

Checklist

• Linked to an issue
• Updated the changelog
• Added tests
• Updated the spec
• Checked native-image compatibility

[codecov]

Codecov Report

❗ No coverage uploaded for pull request base (2201.5.x@b021379). Click here to learn what that means.
Patch has no changes to coverable lines.

Additional details and impacted files

@@             Coverage Diff             @@
##             2201.5.x    #1382   +/-   ##
===========================================
  Coverage            ?   87.13%           
  Complexity          ?      513           
===========================================
  Files               ?      112           
  Lines               ?     7818           
  Branches            ?     3198           
===========================================
  Hits                ?     6812           
  Misses              ?      822           
  Partials            ?      184           

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.