digital-asset/daml
1
1
Fork 0
mirror of https://github.com/digital-asset/daml.git synced 2024-08-16 08:10:52 +03:00
Code Issues Projects Releases Wiki Activity

Fix VSCode extension and remove silly warnings (#2042)

Browse Source
This commit is contained in:
Moritz Kiefer 2019-07-08 21:47:38 +02:00 committed by mergify[bot]
parent b6daa2defa
commit 4f55cb3bda
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
azure-cron.yml
View File

@ -178,6 +178,8 @@ jobs:
git checkout $GITHUB
cd compiler/daml-extension
yarn
# This produces out/src/extension.js
yarn run compile
vsce publish ${GITHUB#v} -p $MARKETPLACE_TOKEN
else
if [[ "${GITHUB#v}" == "$MARKET" ]]; then

2
compiler/damlc/daml-ide/src/DA/Service/Daml/LanguageServer.hs
View File

@ -55,7 +55,7 @@ setHandlersVirtualResource = PartialHandlers $ \WithMessage{..} x -> return x
{LSP.didOpenTextDocumentNotificationHandler = withNotification (LSP.didOpenTextDocumentNotificationHandler x) $
\_ ide (DidOpenTextDocumentParams TextDocumentItem{_uri}) ->
withUriDaml _uri $ \vr -> do
logInfo (ideLogger ide) $ "Opened virtual resource NEIL: " <> textShow vr
logInfo (ideLogger ide) $ "Opened virtual resource: " <> textShow vr
modifyOpenVirtualResources ide (S.insert vr)
,LSP.didCloseTextDocumentNotificationHandler = withNotification (LSP.didCloseTextDocumentNotificationHandler x) $

15
compiler/hie-core/src/Development/IDE/LSP/Notifications.hs
View File

@ -18,25 +18,24 @@ import Development.IDE.Types.Logger
import Development.IDE.Core.Service
import Development.IDE.Types.Location
import Control.Monad.Extra
import qualified Data.Set as S
import Development.IDE.Core.FileStore
import Development.IDE.Core.OfInterest
whenUriFile :: IdeState -> Uri -> (NormalizedFilePath -> IO ()) -> IO ()
whenUriFile ide uri act = case LSP.uriToFilePath uri of
Just file -> act $ toNormalizedFilePath file
Nothing -> logWarning (ideLogger ide) $ "Unknown scheme in URI: " <> getUri uri
whenUriFile :: Uri -> (NormalizedFilePath -> IO ()) -> IO ()
whenUriFile uri act = whenJust (LSP.uriToFilePath uri) $ act . toNormalizedFilePath
setHandlersNotifications :: PartialHandlers
setHandlersNotifications = PartialHandlers $ \WithMessage{..} x -> return x
{LSP.didOpenTextDocumentNotificationHandler = withNotification (LSP.didOpenTextDocumentNotificationHandler x) $
\_ ide (DidOpenTextDocumentParams TextDocumentItem{_uri}) -> do
setSomethingModified ide
whenUriFile ide _uri $ \file ->
whenUriFile _uri $ \file -> do
modifyFilesOfInterest ide (S.insert file)
logInfo (ideLogger ide) $ "Opened text document: " <> getUri _uri
logInfo (ideLogger ide) $ "Opened text document: " <> getUri _uri
,LSP.didChangeTextDocumentNotificationHandler = withNotification (LSP.didChangeTextDocumentNotificationHandler x) $
\_ ide (DidChangeTextDocumentParams VersionedTextDocumentIdentifier{_uri} _) -> do
@ -51,7 +50,7 @@ setHandlersNotifications = PartialHandlers $ \WithMessage{..} x -> return x
,LSP.didCloseTextDocumentNotificationHandler = withNotification (LSP.didCloseTextDocumentNotificationHandler x) $
\_ ide (DidCloseTextDocumentParams TextDocumentIdentifier{_uri}) -> do
setSomethingModified ide
whenUriFile ide _uri $ \file ->
whenUriFile _uri $ \file -> do
modifyFilesOfInterest ide (S.delete file)
logInfo (ideLogger ide) $ "Closed text document: " <> getUri _uri
logInfo (ideLogger ide) $ "Closed text document: " <> getUri _uri
}