Skip to content

Capitalization of "Replace" #4509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 1, 2025
Merged

Capitalization of "Replace" #4509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ba3cd1
code actions: consistent spelling of "Replace"
dschrempf Mar 1, 2025
f951a52
Ignore dir-locals.el (Emacs)
dschrempf Feb 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ cabal.project.local

.tasty-rerun-log

# emacs
/.dir-locals.el

# shake build information
_build/

Expand Down
2 changes: 1 addition & 1 deletion ghcide/test/exe/ResolveTests.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import qualified Language.LSP.Protocol.Lens as JL
import Language.LSP.Protocol.Message (SomeMethod (..))
import qualified Language.LSP.Protocol.Message as LSP
import Language.LSP.Protocol.Types
import Language.LSP.Test
import Language.LSP.Test hiding (resolveCompletion)
import Test.Hls (IdeState, SMethod (..), liftIO,
mkPluginTestDescriptor,
someMethodToMethodString,
Expand Down
2 changes: 1 addition & 1 deletion plugins/hls-refactor-plugin/src/Development/IDE/Plugin/CodeAction.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -947,7 +947,7 @@ suggestModuleTypo Diagnostic{_range=_range,..}
| "Could not find module" `T.isInfixOf` _message =
case T.splitOn "Perhaps you meant" _message of
[_, stuff] ->
[ ("replace with " <> modul, TextEdit _range modul)
[ ("Replace with " <> modul, TextEdit _range modul)
| modul <- mapMaybe extractModule (T.lines stuff)
]
_ -> []
Expand Down
2 changes: 1 addition & 1 deletion plugins/hls-refactor-plugin/src/Development/IDE/Plugin/Plugins/FillHole.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ suggestFillHole Diagnostic{_range=_range,..}
Just (firstChr, _) ->
let isInfixOperator = firstChr == '('
name' = getOperatorNotation isInfixHole isInfixOperator name in
( "replace " <> holeName <> " with " <> name
( "Replace " <> holeName <> " with " <> name
, TextEdit _range (if parenthise then addParens name' else name')
)
getOperatorNotation True False name = addBackticks name
Expand Down
36 changes: 18 additions & 18 deletions plugins/hls-refactor-plugin/test/Main.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1661,7 +1661,7 @@ fixModuleImportTypoTests = testGroup "fix module import typo"
[ testSession "works when single module suggested" $ do
doc <- createDoc "A.hs" "haskell" "import Data.Cha"
_ <- waitForDiagnostics
action <- pickActionWithTitle "replace with Data.Char" =<< getCodeActions doc (R 0 0 0 10)
action <- pickActionWithTitle "Replace with Data.Char" =<< getCodeActions doc (R 0 0 0 10)
executeCodeAction action
contentAfterAction <- documentContents doc
liftIO $ contentAfterAction @?= "import Data.Char"
Expand All @@ -1670,11 +1670,11 @@ fixModuleImportTypoTests = testGroup "fix module import typo"
_ <- waitForDiagnostics
actions <- getCodeActions doc (R 0 0 0 10)
traverse_ (assertActionWithTitle actions)
[ "replace with Data.Eq"
, "replace with Data.Int"
, "replace with Data.Ix"
[ "Replace with Data.Eq"
, "Replace with Data.Int"
, "Replace with Data.Ix"
]
replaceWithDataEq <- pickActionWithTitle "replace with Data.Eq" actions
replaceWithDataEq <- pickActionWithTitle "Replace with Data.Eq" actions
executeCodeAction replaceWithDataEq
contentAfterAction <- documentContents doc
liftIO $ contentAfterAction @?= "import Data.Eq"
Expand Down Expand Up @@ -2640,7 +2640,7 @@ importRenameActionTests = testGroup "import rename actions" $
where
check modname = checkCodeAction
("Data.Mape -> Data." <> T.unpack modname)
("replace with Data." <> modname)
("Replace with Data." <> modname)
(T.unlines
[ "module Testing where"
, "import Data.Mape"
Expand Down Expand Up @@ -2686,33 +2686,33 @@ fillTypedHoleTests = let
liftIO $ expectedCode @=? modifiedCode
in
testGroup "fill typed holes"
[ check "replace _ with show"
[ check "Replace _ with show"
"_" "n" "n"
"show" "n" "n"

, check "replace _ with globalConvert"
, check "Replace _ with globalConvert"
"_" "n" "n"
"globalConvert" "n" "n"

, check "replace _convertme with localConvert"
, check "Replace _convertme with localConvert"
"_convertme" "n" "n"
"localConvert" "n" "n"

, check "replace _b with globalInt"
, check "Replace _b with globalInt"
"_a" "_b" "_c"
"_a" "globalInt" "_c"

, check "replace _c with globalInt"
, check "Replace _c with globalInt"
"_a" "_b" "_c"
"_a" "_b" "globalInt"

, check "replace _c with parameterInt"
, check "Replace _c with parameterInt"
"_a" "_b" "_c"
"_a" "_b" "parameterInt"
, check "replace _ with foo _"
, check "Replace _ with foo _"
"_" "n" "n"
"(foo _)" "n" "n"
, testSession "replace _toException with E.toException" $ do
, testSession "Replace _toException with E.toException" $ do
let mkDoc x = T.unlines
[ "module Testing where"
, "import qualified Control.Exception as E"
Expand All @@ -2721,7 +2721,7 @@ fillTypedHoleTests = let
doc <- createDoc "Test.hs" "haskell" $ mkDoc "_toException"
_ <- waitForDiagnostics
actions <- getCodeActions doc (Range (Position 3 0) (Position 3 maxBound))
chosen <- pickActionWithTitle "replace _toException with E.toException" actions
chosen <- pickActionWithTitle "Replace _toException with E.toException" actions
executeCodeAction chosen
modifiedCode <- documentContents doc
liftIO $ mkDoc "E.toException" @=? modifiedCode
Expand All @@ -2737,7 +2737,7 @@ fillTypedHoleTests = let
doc <- createDoc "Test.hs" "haskell" $ mkDoc "`_`"
_ <- waitForDiagnostics
actions <- getCodeActions doc (Range (Position 5 16) (Position 5 19))
chosen <- pickActionWithTitle "replace _ with foo" actions
chosen <- pickActionWithTitle "Replace _ with foo" actions
executeCodeAction chosen
modifiedCode <- documentContents doc
liftIO $ mkDoc "`foo`" @=? modifiedCode
Expand All @@ -2750,7 +2750,7 @@ fillTypedHoleTests = let
doc <- createDoc "Test.hs" "haskell" $ mkDoc "_"
_ <- waitForDiagnostics
actions <- getCodeActions doc (Range (Position 2 13) (Position 2 14))
chosen <- pickActionWithTitle "replace _ with (<$>)" actions
chosen <- pickActionWithTitle "Replace _ with (<$>)" actions
executeCodeAction chosen
modifiedCode <- documentContents doc
liftIO $ mkDoc "(<$>)" @=? modifiedCode
Expand All @@ -2763,7 +2763,7 @@ fillTypedHoleTests = let
doc <- createDoc "Test.hs" "haskell" $ mkDoc "`_`"
_ <- waitForDiagnostics
actions <- getCodeActions doc (Range (Position 2 16) (Position 2 19))
chosen <- pickActionWithTitle "replace _ with (<$>)" actions
chosen <- pickActionWithTitle "Replace _ with (<$>)" actions
executeCodeAction chosen
modifiedCode <- documentContents doc
liftIO $ mkDoc "<$>" @=? modifiedCode
Expand Down
Loading