Skip to content

Commit

Permalink
[ gradle ] Upgrade tools, fixed some warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
ice1000 committed Nov 11, 2018
1 parent 44c3ba3 commit 12bd42c
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
4 changes: 2 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ version = pluginVersion

plugins {
java
id("org.jetbrains.intellij") version "0.3.11"
id("org.jetbrains.grammarkit") version "2018.2"
id("org.jetbrains.intellij") version "0.3.12"
id("org.jetbrains.grammarkit") version "2018.2.1"
kotlin("jvm") version "1.2.70"
}

Expand Down
2 changes: 2 additions & 0 deletions res/META-INF/change-notes.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
<li>Fix parser errors (#232)</li>
<li>Disable "convert to compact" annotation when function is very long
(and provided a config for that) (#216)</li>
<li>Colored output (#224)</li>
<li>Upgraded to Grammar-Kit 2018.2.1, IntelliJ Gradle plugin 0.3.12</li>
</ul>
0.3.1.1<br/>
<ul>
Expand Down
6 changes: 3 additions & 3 deletions src/org/ice1000/julia/lang/psi/impl/julia-psi-mixin.kt
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,13 @@ abstract class JuliaSingleComprehensionMixin(node: ASTNode) : JuliaDeclaration(n

abstract class JuliaTypedNamedVariableMixin(node: ASTNode) : JuliaDeclaration(node), JuliaTypedNamedVariable {
override var type: Type? = null
set(value) = Unit
set(_) = Unit

override fun getNameIdentifier() = firstChild as? JuliaSymbol
override val startPoint: PsiElement
get() = parent.parent.let {
when (it) {
is JuliaFunction -> it.statements ?: it
is JuliaFunction -> it.statements
is JuliaCompactFunction -> it.lastChild
else -> it
}
Expand All @@ -93,7 +93,7 @@ abstract class JuliaTypedNamedVariableMixin(node: ASTNode) : JuliaDeclaration(no
abstract class JuliaAssignOpMixin(node: ASTNode) : JuliaDeclaration(node), JuliaAssignOp {
override var type: Type?
get() = exprList.lastOrNull()?.type
set(value) {}
set(_) {}

override fun getNameIdentifier() = children
.firstOrNull { it is JuliaSymbol || it is JuliaSymbolLhs }
Expand Down

0 comments on commit 12bd42c

Please sign in to comment.