From 401cdef12239d114923e947dd2352ab381584b0f Mon Sep 17 00:00:00 2001 From: George Thomas Date: Wed, 26 May 2021 05:24:18 +0100 Subject: [PATCH] Avoid package-qualified import in Fourmolu plugin (#1848) * Avoid package-qualified import in Fourmolu plugin * Avoid package-qualified import in Ormolu plugin Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- plugins/hls-fourmolu-plugin/src/Ide/Plugin/Fourmolu.hs | 3 +-- plugins/hls-ormolu-plugin/src/Ide/Plugin/Ormolu.hs | 3 +-- 2 files changed, 2 insertions(+), 4 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 -- --------------------------------------------------------------------- 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) -- ---------------------------------------------------------------------