Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
gargantext-ihaskell
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gargantext
gargantext-ihaskell
Commits
3c8b6348
Commit
3c8b6348
authored
Mar 17, 2015
by
Andrew Gibiansky
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upgrading to v5 and making completion work
parent
9cd9cfb1
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
6 deletions
+8
-6
Parser.hs
ipython-kernel/src/IHaskell/IPython/Message/Parser.hs
+1
-3
Writer.hs
ipython-kernel/src/IHaskell/IPython/Message/Writer.hs
+1
-1
Types.hs
ipython-kernel/src/IHaskell/IPython/Types.hs
+1
-0
Completion.hs
src/IHaskell/Eval/Completion.hs
+4
-1
Flags.hs
src/IHaskell/Flags.hs
+1
-1
No files found.
ipython-kernel/src/IHaskell/IPython/Message/Parser.hs
View file @
3c8b6348
...
...
@@ -15,8 +15,6 @@ import Data.Text (Text)
import
qualified
Data.ByteString.Lazy
as
Lazy
import
IHaskell.IPython.Types
import
Debug.Trace
(
traceShow
)
type
LByteString
=
Lazy
.
ByteString
----- External interface -----
...
...
@@ -120,7 +118,7 @@ executeRequestParser content =
requestParser
parser
content
=
parsed
where
Success
parsed
=
traceShow
decoded
$
parse
parser
decoded
Success
parsed
=
parse
parser
decoded
Just
decoded
=
decode
content
historyRequestParser
::
LByteString
->
Message
...
...
ipython-kernel/src/IHaskell/IPython/Message/Writer.hs
View file @
3c8b6348
...
...
@@ -20,7 +20,7 @@ import IHaskell.IPython.Types
-- Convert message bodies into JSON.
instance
ToJSON
Message
where
toJSON
KernelInfoReply
{
versionList
=
vers
,
language
=
language
}
=
object
[
"protocol_version"
.=
ints
[
4
,
0
]
,
-- current protocol version, major and minor
"protocol_version"
.=
string
"5.0"
,
-- current protocol version, major and minor
"language_version"
.=
vers
,
"language"
.=
language
]
...
...
ipython-kernel/src/IHaskell/IPython/Types.hs
View file @
3c8b6348
...
...
@@ -144,6 +144,7 @@ instance ToJSON MessageHeader where
"msg_id"
.=
messageId
header
,
"session"
.=
sessionId
header
,
"username"
.=
username
header
,
"version"
.=
(
"5.0"
::
String
),
"msg_type"
.=
showMessageType
(
msgType
header
)
]
...
...
src/IHaskell/Eval/Completion.hs
View file @
3c8b6348
...
...
@@ -217,7 +217,10 @@ completionType line loc target
|
otherwise
=
last
target
dots
=
intercalate
"."
.
init
isModName
=
all
isCapitalized
(
init
target
)
isCapitalized
=
isUpper
.
head
isCapitalized
[]
=
False
isCapitalized
(
x
:
_
)
=
isUpper
x
lineUpToCursor
=
take
loc
line
fileComplete
filePath
=
case
parseShell
lineUpToCursor
of
Right
xs
->
filePath
lineUpToCursor
$
...
...
src/IHaskell/Flags.hs
View file @
3c8b6348
...
...
@@ -65,7 +65,7 @@ parseFlags flags =
-- Treat no mode as 'console'.
if
"--help"
`
elem
`
flags
then
Left
$
pack
(
showText
(
Wrap
100
)
$
helpText
[]
HelpFormatAll
ihaskellArgs
)
else
process
ihaskellArgs
$
"console"
:
flags
else
process
ihaskellArgs
flags
Just
0
->
process
ihaskellArgs
flags
Just
idx
->
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment