[ghc-9.2] Fix qualify-imported-names plugin (#2600)

* [ghc-9.2] Fix qualify-imported-names plugin * Drop default-true plugin flags from stack-9.2.1.yaml

Author: mxxun

.github/workflows/test.yml

@@ -226,7 +226,7 @@ jobs:
  name: Test hls-alternate-number-format-plugin test suite
  run: cabal test hls-alternate-number-format-plugin --test-options="$TEST_OPTS" || cabal test hls-alternate-number-format-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-alternate-number-format-plugin --test-options="$TEST_OPTS"
 
- - if: matrix.test && matrix.ghc != '9.2.1'
+ - if: matrix.test
  name: Test hls-qualify-imported-names-plugin test suite
  run: cabal test hls-qualify-imported-names-plugin --test-options="$TEST_OPTS" || cabal test hls-qualify-imported-names-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-qualify-imported-names-plugin --test-options="$TEST_OPTS"
 

cabal-ghc921.project

@@ -59,7 +59,6 @@ constraints:
  -eval
  -haddockComments
  -hlint
- -qualifyImportedNames
  -refineImports
  -retrie
  -splice

plugins/hls-qualify-imported-names-plugin/README.md

@@ -13,7 +13,9 @@
 - Names are qualified by the imported module's alias if it has one, otherwise by the imported module's name.
 - If the import declaration has an explicit import list then the plugin will qualify only names on the list.
 - If the import declaration has an explicit hiding list then the plugin will qualify names from the imported module that are not on the list.
- 
+
 ## Change log
+### 1.0.0.1
+- GHC 9.2.1 compatibility
 ### 1.0.0.0
 - Released...

plugins/hls-qualify-imported-names-plugin/hls-qualify-imported-names-plugin.cabal

@@ -1,6 +1,6 @@
 cabal-version: 2.2
 name: hls-qualify-imported-names-plugin
-version: 1.0.0.0
+version: 1.0.0.1
 synopsis: A Haskell Language Server plugin that qualifies imported names
 description:
  Please see the README on GitHub at <https://github.com/haskell/haskell-language-server#readme>

plugins/hls-qualify-imported-names-plugin/src/Ide/Plugin/QualifyImportedNames.hs

@@ -42,7 +42,7 @@ import Development.IDE.GHC.Compat (ContextInfo (Use),
  SrcSpan,
  TcGblEnv (tcg_rdr_env),
  emptyUFM, globalRdrEnvElts,
- gre_imp, gre_name,
+ gre_imp, gre_name, locA,
  lookupNameEnv,
  moduleNameString,
  nameOccName, occNameString,
@@ -96,8 +96,7 @@ findLImportDeclAt range parsedModule
  | ParsedModule {..} <- parsedModule
  , L _ hsModule <- pm_parsed_source
  , locatedImportDecls <- hsmodImports hsModule =
- find (\ (L srcSpan _) -> isRangeWithinSrcSpan range srcSpan) locatedImportDecls
- | otherwise = Nothing
+ find (\ (L (locA -> srcSpan) _) -> isRangeWithinSrcSpan range srcSpan) locatedImportDecls
 
 makeCodeActions :: Uri -> [TextEdit] -> [a |? CodeAction]
 makeCodeActions uri textEdits = [InR CodeAction {..} | not (null textEdits)]

stack-9.2.1.yaml

@@ -100,9 +100,7 @@ flags:
  haddockComments: false
  hlint: false
  importLens: false
- moduleName: true
  ormolu: false
- qualifyImportedNames: false
  refineImports: false
  retrie: false
  splice: false