Convert to ghc-9.2.1 #1247

shayne-fletcher · 2021-05-14T08:36:54Z

This is a complete port of HLint to the ghc-9.2.1 parse tree. All tests pass.

shayne-fletcher · 2021-05-14T08:55:25Z

Cc @alanz All done mate.

ndmitchell · 2021-05-16T17:47:32Z

Awesome work!

ndmitchell · 2021-10-30T14:47:12Z

GHC 9.2.1 is now out. Thoughts on this?

shayne-fletcher · 2021-10-30T14:53:29Z

GHC 9.2.1 is now out. Thoughts on this?

Got it. Time to move on it then. Leave it with me for now and I'll keep you posted.

alanz · 2021-10-30T14:56:09Z

For the apply-refact part it will need me to complete my current ghc-exactprint update. Which is getting close.

ndmitchell · 2021-10-30T15:13:08Z

I'm in no tearing rush - a leisurely upgrade is fine :)

shayne-fletcher · 2021-10-31T23:15:30Z

i rebased this branch on master today (oct 30, 2021).

the tests all pass but this one in 'Extensions.hs':

{-# LANGUAGE DeriveGeneric, TypeFamilies #-} \
data family Bar a; data instance Bar Foo = Foo deriving Generic

which produces the apparently unexpected output

Note: Extension DeriveGeneric is not used

(using the 9.2.1 release candidate ghc-lib-parser-9.2.1.20210509.tar.gz that the stack.yaml on this branch arranges to use)

this test was introduced only recently in #1277. @zliu41 as the author of that test might i trouble you to take a look? i removed the test for the moment.

this puts us in a good place for the next step: upgrade this branch to the ghc-lib-parser and ghc-lib-parser-ex newly released 9.2.1 official versions.

zliu41 · 2021-11-04T05:02:05Z

@shayne-fletcher Removing that test for now is good. Once you make cabal build work for this patch, I can look into it - otherwise it's difficult for me to investigate.

LeventErkok · 2021-11-11T16:18:30Z

@shayne-fletcher Maybe it's good to go now for GHC 9.2.1?

shayne-fletcher · 2021-11-11T16:54:23Z

@shayne-fletcher Maybe it's good to go now for GHC 9.2.1?

yep, it's high priority with us too. don't worry @LeventErkok , we got you! little patience please 😉

shayne-fletcher · 2021-11-15T18:19:19Z

@ndmitchell i believe this is ready to merge. all 813 tests pass locally. please note that minimum build compiler is now 8.10.1.

shayne-fletcher · 2021-11-15T18:22:02Z

p.s. locally my testing was with refactor-0.9.2.0 cc @alanz

shayne-fletcher · 2021-11-15T18:58:01Z

@shayne-fletcher Removing that test for now is good. Once you make cabal build work for this patch, I can look into it - otherwise it's difficult for me to investigate.

@zliu41 cabal v2-build on this branch works as you'd hope for now!

src/Hint/Extensions.hs

ndmitchell · 2021-11-22T22:18:15Z

Thanks! @shayne-fletcher - can you add a CI for GHC 9.2 and remove it for GHC 8.8 (see the .github/workflows).

It seems the Windows and Mac CI are both bust installing apply-refact. Any idea why?

I'll take a peek through the code now

ndmitchell

Nice work!

src/GHC/Util/SrcLoc.hs

shayne-fletcher · 2021-11-22T22:23:58Z

Thanks! @shayne-fletcher - can you add a CI for GHC 9.2 and remove it for GHC 8.8 (see the .github/workflows).

pushed

It seems the Windows and Mac CI are both bust installing apply-refact. Any idea why?

no idea about that sorry.

I'll take a peek through the code now

alanz · 2021-11-22T22:24:02Z

It seems the Windows and Mac CI are both bust installing apply-refact. Any idea why?

It depends on ghc-exactprint, the release on hackage does not compile with GHC 9.2.1 as released.

I will be making a new release tomorrow, just need to clean up a few tests

ndmitchell · 2021-11-23T13:22:05Z

Thanks @alanz - my plan is to hold this PR in limbo a few days, merge nothing else to the repo in the intervening time, and wait for ghc-exactprint, then pull the trigger on this.

alanz · 2021-11-23T23:23:55Z

I just published ghc-exactprint-1.3.0

arjunkathuria · 2021-11-25T16:19:59Z

hi, if all's good can we merge and publish this ? looking forward : )

unclechu · 2021-12-08T11:40:22Z

stack.yaml

+#  hlint:
+#    ghc-lib: true
+#  ghc-lib-parser-ex:
+#    auto: false
+#    no-ghc-lib: false


This re-indentation doesn’t seem like a reasonable change. There must be at least 1 space after # (see flags). But after hlint there are two, which means the indentation is 1 but ghc-lib has 2 for indentation.

Suggested change

# hlint:

# ghc-lib: true

# ghc-lib-parser-ex:

# auto: false

# no-ghc-lib: false

# hlint:

# ghc-lib: true

# ghc-lib-parser-ex:

# auto: false

# no-ghc-lib: false

unclechu · 2021-12-08T11:42:37Z

src/Main.hs

+     args <- getArgs
+     errs <- hlint args
+     unless (null errs) $
+         exitWith $ ExitFailure 1


5 spaces for indentation? But still the exitWith has 4.

Suggested change

args <- getArgs

errs <- hlint args

unless (null errs) $

exitWith $ ExitFailure 1

args <- getArgs

errs <- hlint args

unless (null errs) $

exitWith $ ExitFailure 1

unclechu · 2021-12-08T11:43:50Z

src/Hint/Restrict.hs

+        IEName      n   -> fromId (unLoc n)
+        IEPattern _ n -> ("pattern " ++) <$> fromId (unLoc n)
+        IEType    _ n-> ("type " ++) <$> fromId (unLoc n)


Broken alignment:

Suggested change

IEName n -> fromId (unLoc n)

IEPattern _ n -> ("pattern " ++) <$> fromId (unLoc n)

IEType _ n-> ("type " ++) <$> fromId (unLoc n)

IEName n -> fromId (unLoc n)

IEPattern _ n -> ("pattern " ++) <$> fromId (unLoc n)

IEType _ n -> ("type " ++) <$> fromId (unLoc n)

unclechu · 2021-12-08T11:50:09Z

src/GHC/Util/Scope.hs

+    res = [x | x <- hsmodImports xs
+              , pkg x /= Just (StringLiteral NoSourceText (fsLit "hint") Nothing)
+            ]


Suggested change

res = [x | x <- hsmodImports xs

, pkg x /= Just (StringLiteral NoSourceText (fsLit "hint") Nothing)

]

res = [x | x <- hsmodImports xs, pkg x /= Just (StringLiteral NoSourceText (fsLit "hint") Nothing)]

unclechu · 2021-12-08T12:01:20Z

src/Apply.hs

+        adjustMessage x =
+          "Parse error: " ++
+          dropBrackets (
+            case stripInfix "parse error " x of
+              Nothing -> x
+              Just (prefix, _) ->
+                dropPrefix (prefix ++ "parse error ") x
+          )


Suggested change

adjustMessage x =

"Parse error: " ++

dropBrackets (

case stripInfix "parse error " x of

Nothing -> x

Just (prefix, _) ->

dropPrefix (prefix ++ "parse error ") x

)

adjustMessage x =

"Parse error: " ++ dropBrackets errMsg

where

errMsg = maybe x (\(pfx, _) -> dropPrefix (pfx ++ subStr) x) (stripInfix subStr x)

subStr = "parse error "

ndmitchell · 2021-12-12T17:07:06Z

It's got to the stage where we need to move, so landing, and will fix forward if we need to.

ndmitchell · 2021-12-12T19:39:09Z

Merged, but all the CI is red on GHC 9.2 because apply-refact is not yet GHC 9.2 compatiblehttps://github.com/mpickering/apply-refact/issues/114

alanz · 2021-12-23T14:47:34Z

I am working on the failing tests for apply-refact, and came across Bracket7, which has

yes = if (f x) then y else z

and a corresponding apply-refact refactoring of

[("tests/examples/Bracket7.hs:1:10-14: Suggestion: Redundant bracket\nFound:\n  if (f x) then y else z\nPerhaps:\n  if f x then y else z\n"
,[Replace
  { rtype = Expr
  , pos = SrcSpan {startLine = 1, startCol = 10, endLine = 1, endCol = 15}
  , subts = [("x",SrcSpan {startLine = 1, startCol = 11, endLine = 1, endCol = 14})]
  , orig = "x"}])]

I presume that only the positions are meaningful, as in "substitute 1:10-15 with 1:11-14", and the reference to "x" can be ignored?

ndmitchell · 2021-12-24T12:04:54Z

@alanz - @zliu41 is the expert here. I think (but am most definitely not sure) that the code is saying:

Due to pos Operate on 1:10-15, i.e. (f x)
Due to subts bind $x to 1:11-14, i.e. f x
Replace the whole thing with orig definition of $x so replace (f x) with f x

But that's just a guess on what I think it's doing.

alanz · 2021-12-24T14:16:49Z

That seems to make sense. So the "x" is a "hlint variable", rather than a quote of existing source code.

zliu41 · 2022-01-02T06:17:27Z

@alanz Yeah "x" is a template variable. In this case it happens to be the entire template (orig), but in general that's not the case.

alanz · 2022-02-01T23:26:21Z

mpickering/apply-refact#116 is ready for review, should hopefully unblock this

shayne-fletcher force-pushed the wip/ghc-9.2.1 branch 2 times, most recently from f34254c to 918a74e Compare May 14, 2021 09:35

shayne-fletcher force-pushed the wip/ghc-9.2.1 branch from 918a74e to 6a65c5e Compare October 31, 2021 23:01

LeventErkok mentioned this pull request Nov 11, 2021

GHC 9.2. release LeventErkok/sbv#606

Closed

shayne-fletcher force-pushed the wip/ghc-9.2.1 branch 2 times, most recently from a077cc4 to cc81186 Compare November 15, 2021 18:15

shayne-fletcher marked this pull request as ready for review November 15, 2021 18:18

shayne-fletcher force-pushed the wip/ghc-9.2.1 branch 2 times, most recently from b11504e to a9617d0 Compare November 15, 2021 18:56

zliu41 reviewed Nov 15, 2021

View reviewed changes

src/Hint/Extensions.hs Outdated Show resolved Hide resolved

shayne-fletcher force-pushed the wip/ghc-9.2.1 branch from a9617d0 to 1e615c0 Compare November 15, 2021 23:11

ndmitchell reviewed Nov 22, 2021

View reviewed changes

src/GHC/Util/SrcLoc.hs Outdated Show resolved Hide resolved

shayne-fletcher force-pushed the wip/ghc-9.2.1 branch from 1e615c0 to 288694b Compare November 22, 2021 22:22

Convert to ghc-9.2.1

738c8c9

shayne-fletcher force-pushed the wip/ghc-9.2.1 branch from 288694b to 738c8c9 Compare November 22, 2021 22:36

bergmark mentioned this pull request Nov 28, 2021

Initial GHC 9.2 bounds commercialhaskell/stackage#6318

Merged

unclechu reviewed Dec 8, 2021

View reviewed changes

ndmitchell merged commit e6a6df4 into ndmitchell:master Dec 12, 2021

shayne-fletcher deleted the wip/ghc-9.2.1 branch December 12, 2021 18:55

LeventErkok mentioned this pull request Jan 20, 2022

Can't compile with GHC 9.2.1 #1314

Closed

shayne-fletcher mentioned this pull request Jul 17, 2022

Feature request: Support NoFieldSelectors #1401

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Convert to ghc-9.2.1 #1247

Convert to ghc-9.2.1 #1247

shayne-fletcher commented May 14, 2021

shayne-fletcher commented May 14, 2021

ndmitchell commented May 16, 2021

ndmitchell commented Oct 30, 2021

shayne-fletcher commented Oct 30, 2021

alanz commented Oct 30, 2021

ndmitchell commented Oct 30, 2021

shayne-fletcher commented Oct 31, 2021

zliu41 commented Nov 4, 2021

LeventErkok commented Nov 11, 2021

shayne-fletcher commented Nov 11, 2021

shayne-fletcher commented Nov 15, 2021

shayne-fletcher commented Nov 15, 2021 •

edited

Loading

shayne-fletcher commented Nov 15, 2021

ndmitchell commented Nov 22, 2021

ndmitchell left a comment

shayne-fletcher commented Nov 22, 2021

alanz commented Nov 22, 2021

ndmitchell commented Nov 23, 2021

alanz commented Nov 23, 2021

arjunkathuria commented Nov 25, 2021 •

edited

Loading

unclechu Dec 8, 2021 •

edited

Loading

unclechu Dec 8, 2021

unclechu Dec 8, 2021

unclechu Dec 8, 2021

unclechu Dec 8, 2021

ndmitchell commented Dec 12, 2021

ndmitchell commented Dec 12, 2021

alanz commented Dec 23, 2021

ndmitchell commented Dec 24, 2021

alanz commented Dec 24, 2021

zliu41 commented Jan 2, 2022

alanz commented Feb 1, 2022

Convert to ghc-9.2.1 #1247

Convert to ghc-9.2.1 #1247

Conversation

shayne-fletcher commented May 14, 2021

shayne-fletcher commented May 14, 2021

ndmitchell commented May 16, 2021

ndmitchell commented Oct 30, 2021

shayne-fletcher commented Oct 30, 2021

alanz commented Oct 30, 2021

ndmitchell commented Oct 30, 2021

shayne-fletcher commented Oct 31, 2021

zliu41 commented Nov 4, 2021

LeventErkok commented Nov 11, 2021

shayne-fletcher commented Nov 11, 2021

shayne-fletcher commented Nov 15, 2021

shayne-fletcher commented Nov 15, 2021 • edited Loading

shayne-fletcher commented Nov 15, 2021

ndmitchell commented Nov 22, 2021

ndmitchell left a comment

Choose a reason for hiding this comment

shayne-fletcher commented Nov 22, 2021

alanz commented Nov 22, 2021

ndmitchell commented Nov 23, 2021

alanz commented Nov 23, 2021

arjunkathuria commented Nov 25, 2021 • edited Loading

unclechu Dec 8, 2021 • edited Loading

Choose a reason for hiding this comment

unclechu Dec 8, 2021

Choose a reason for hiding this comment

unclechu Dec 8, 2021

Choose a reason for hiding this comment

unclechu Dec 8, 2021

Choose a reason for hiding this comment

unclechu Dec 8, 2021

Choose a reason for hiding this comment

ndmitchell commented Dec 12, 2021

ndmitchell commented Dec 12, 2021

alanz commented Dec 23, 2021

ndmitchell commented Dec 24, 2021

alanz commented Dec 24, 2021

zliu41 commented Jan 2, 2022

alanz commented Feb 1, 2022

shayne-fletcher commented Nov 15, 2021 •

edited

Loading

arjunkathuria commented Nov 25, 2021 •

edited

Loading

unclechu Dec 8, 2021 •

edited

Loading