From 7ca46cd74364b309918d47e15811dfe6118e0623 Mon Sep 17 00:00:00 2001 From: George Thomas Date: Thu, 20 May 2021 13:48:54 +0100 Subject: [PATCH 1/2] Avoid package-qualified import in Fourmolu plugin --- plugins/hls-fourmolu-plugin/src/Ide/Plugin/Fourmolu.hs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/hls-fourmolu-plugin/src/Ide/Plugin/Fourmolu.hs b/plugins/hls-fourmolu-plugin/src/Ide/Plugin/Fourmolu.hs index cb9d766d06..5b443dfd9b 100644 --- a/plugins/hls-fourmolu-plugin/src/Ide/Plugin/Fourmolu.hs +++ b/plugins/hls-fourmolu-plugin/src/Ide/Plugin/Fourmolu.hs @@ -1,7 +1,6 @@ {-# LANGUAGE DisambiguateRecordFields #-} {-# LANGUAGE LambdaCase #-} {-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE PackageImports #-} {-# LANGUAGE TypeApplications #-} module Ide.Plugin.Fourmolu ( @@ -25,7 +24,7 @@ import Ide.Types import Language.LSP.Server hiding (defaultConfig) import Language.LSP.Types import Language.LSP.Types.Lens -import "fourmolu" Ormolu +import Ormolu import System.FilePath -- --------------------------------------------------------------------- From 7bb5a9c5d2f3d20148952f85d2ccb132d06967e9 Mon Sep 17 00:00:00 2001 From: George Thomas Date: Tue, 25 May 2021 23:25:39 +0100 Subject: [PATCH 2/2] Avoid package-qualified import in Ormolu plugin --- plugins/hls-ormolu-plugin/src/Ide/Plugin/Ormolu.hs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/hls-ormolu-plugin/src/Ide/Plugin/Ormolu.hs b/plugins/hls-ormolu-plugin/src/Ide/Plugin/Ormolu.hs index 6e4ae91c7c..4a19566f87 100644 --- a/plugins/hls-ormolu-plugin/src/Ide/Plugin/Ormolu.hs +++ b/plugins/hls-ormolu-plugin/src/Ide/Plugin/Ormolu.hs @@ -1,5 +1,4 @@ {-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE PackageImports #-} {-# LANGUAGE TypeApplications #-} module Ide.Plugin.Ormolu @@ -21,7 +20,7 @@ import Ide.PluginUtils import Ide.Types import Language.LSP.Server hiding (defaultConfig) import Language.LSP.Types -import "ormolu" Ormolu +import Ormolu import System.FilePath (takeFileName) -- ---------------------------------------------------------------------