ilyakooo0/intellij-haskell
1
0
Fork 0
mirror of https://github.com/ilyakooo0/intellij-haskell.git synced 2024-09-11 06:45:25 +03:00
Code Issues Projects Releases Wiki Activity

Update sbt, scala and IntelliJ.

Browse Source
This commit is contained in:
Rik van der Kleij 2017-11-06 21:12:37 +01:00
parent 48534e2992
commit d1936a9125
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.sbt
View File

@ -1,6 +1,6 @@
lazy val commonSettings = Seq(
version := "1.0.0-beta12",
scalaVersion := "2.12.3"
scalaVersion := "2.12.4"
)
val guava = "com.google.guava" % "guava" % "21.0"
@ -23,4 +23,4 @@ lazy val intellijHaskell = (project in file(".")).
unmanagedJars in Compile += baseDirectory.value / "idea"
)
ideaBuild in ThisBuild := "173.2941.3"
ideaBuild in ThisBuild := "173.3531.6"

2
project/build.properties
View File

@ -1 +1 @@
sbt.version=1.0.1
sbt.version=1.0.3

2
src/main/scala/intellij/haskell/HaskellParserDefinition.scala
View File

@ -63,7 +63,7 @@ class HaskellParserDefinition extends ParserDefinition {
}
@NotNull
def getWhitespaceTokens: TokenSet = {
override def getWhitespaceTokens: TokenSet = {
HaskellParserDefinition.WhiteSpaces
}

2
src/main/scala/intellij/haskell/cabal/highlighting/CabalSyntaxHighlighter.scala
View File

@ -29,7 +29,7 @@ class CabalSyntaxHighlighter extends SyntaxHighlighterBase {
case CabalTypes.CONFIG => pack(CabalSyntaxHighlighter.CONFIG)
case CabalTypes.CONDITIONAL => pack(CabalSyntaxHighlighter.CONDITIONAL)
case CabalTypes.LBRACE | CabalTypes.RBRACE => pack(CabalSyntaxHighlighter.BRACES)
case _ => EMPTY
case _ => new Array[TextAttributesKey](0)
}
}
}