From 9136fec3bd7ddb67aea5d704091691502740d362 Mon Sep 17 00:00:00 2001 From: jneira Date: Tue, 24 Sep 2019 14:43:51 +0200 Subject: [PATCH 1/2] Taking in account terms between backquote and single quote --- src/Haskell/Ide/Engine/Plugin/GhcMod.hs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Haskell/Ide/Engine/Plugin/GhcMod.hs b/src/Haskell/Ide/Engine/Plugin/GhcMod.hs index ab994f179..1afe2e6fb 100644 --- a/src/Haskell/Ide/Engine/Plugin/GhcMod.hs +++ b/src/Haskell/Ide/Engine/Plugin/GhcMod.hs @@ -310,9 +310,12 @@ extractRenamableTerms msg . T.lines singleSuggestions = T.splitOn "), " -- Each suggestion is comma delimited isKnownSymbol t = " (imported from" `T.isInfixOf` t || " (line " `T.isInfixOf` t - getEnclosed = T.dropWhile (== '‘') - . T.dropWhileEnd (== '’') - . T.dropAround (\c -> c /= '‘' && c /= '’') + getEnclosed' b e = T.dropWhile (== b) + . T.dropWhileEnd (== e) + . T.dropAround (\c -> c /= b && c /= e) + getEnclosed txt = case getEnclosed' '‘' '’' txt of + "" -> getEnclosed' '`' '\'' txt + enc -> enc extractRedundantImport :: T.Text -> Maybe T.Text extractRedundantImport msg = From 1e2383f5985b7aff0b4a661afc53881ae40be7be Mon Sep 17 00:00:00 2001 From: jneira Date: Tue, 24 Sep 2019 22:34:41 +0200 Subject: [PATCH 2/2] Add comment --- src/Haskell/Ide/Engine/Plugin/GhcMod.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Haskell/Ide/Engine/Plugin/GhcMod.hs b/src/Haskell/Ide/Engine/Plugin/GhcMod.hs index 1afe2e6fb..057b1af22 100644 --- a/src/Haskell/Ide/Engine/Plugin/GhcMod.hs +++ b/src/Haskell/Ide/Engine/Plugin/GhcMod.hs @@ -314,7 +314,7 @@ extractRenamableTerms msg . T.dropWhileEnd (== e) . T.dropAround (\c -> c /= b && c /= e) getEnclosed txt = case getEnclosed' '‘' '’' txt of - "" -> getEnclosed' '`' '\'' txt + "" -> getEnclosed' '`' '\'' txt -- Needed for windows enc -> enc extractRedundantImport :: T.Text -> Maybe T.Text