Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import sbtcrossproject.CrossPlugin.autoImport.{crossProject, CrossType}

val useScalaVersion = "2.13.14"
val releaseVersion = "1.1.3"
val releaseVersion = "1.1.4"

val sharedSettings = Seq(
scalaVersion := useScalaVersion,
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

{
"name": "tigerpython-parser",
"version": "1.1.3",
"version": "1.1.4",
"description": "Enhanced error recognition in Python ",
"main": "release/tigerpython-parser.mjs",
"types": "tpParser/js/types/index.d.ts",
Expand Down
1,986 changes: 993 additions & 993 deletions release/tigerpython-parser.js

Large diffs are not rendered by default.

3,930 changes: 1,968 additions & 1,962 deletions release/tigerpython-parser.mjs

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ case class CompleterInfoItem(name: String,
def this(name: String) =
this(name, null, "variable", null, null)

def this(dataType: DataType) =
this(dataType.name, dataType.docString, dataType.getTypeName, dataType.getParams, dataType.getSignature)
def this(dataType: DataType, overrideName: String = null) =
this(if (overrideName != null) overrideName else dataType.name, dataType.docString, dataType.getTypeName, dataType.getParams, dataType.getSignature)
}
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,9 @@ abstract class DefaultNameFilter extends NameFilter {
case Some(_: Instance) =>
new CompleterInfoItem(name)
case Some(dt) =>
new CompleterInfoItem(dt)
// Overloaded function types end up with an abstract type named <any> so we must
// override the name to avoid ending up with a list of completions named <any>:
new CompleterInfoItem(dt, name)
case None =>
new CompleterInfoItem(name)
}
Expand Down
3 changes: 3 additions & 0 deletions tpParser/shared/src/test/scala/TestCompleter.scala
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,9 @@ class TestCompleter extends FunSuite {
val completer = new Completer(fileName, text, pos)
val suggestions = completer.getNameFilter.getNameList("").mkString(";")
assert(suggestions == expected_result)
// Should be the same output if we ask for the names from getExtInfoList:
val extSuggestions = completer.getNameFilter.getExtInfoList.map(info => info.name).filter(name => !name.startsWith("_")).mkString(";")
assert(extSuggestions == expected_result)
}

for (fileName <- listAllFiles("completer_params"))
Expand Down
Loading