From ce1eacb74f247e31eaa64b81b518df55a797e197 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sat, 19 Dec 2020 00:01:16 -0500 Subject: [PATCH 1/2] Revert "Set complete flag in completions" This reverts commit edf43a473b18f5c185475aa39d227eeb94e3ea8e. This fixes performance regression of tab completion observerd in https://github.com/sbt/sbt/issues/6204 --- .../main/scala/sbt/internal/util/LineReader.scala | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/internal/util-complete/src/main/scala/sbt/internal/util/LineReader.scala b/internal/util-complete/src/main/scala/sbt/internal/util/LineReader.scala index aa022d3bb..3475bff1d 100644 --- a/internal/util-complete/src/main/scala/sbt/internal/util/LineReader.scala +++ b/internal/util-complete/src/main/scala/sbt/internal/util/LineReader.scala @@ -63,14 +63,11 @@ object LineReader { * `testOnly testOnly\ com.foo.FooSpec` instead of `testOnly com.foo.FooSpec`. */ if (c.append.nonEmpty) { - val comp = - if (!pl.line().endsWith(" ")) pl.line().split(" ").last + c.append else c.append - // tell jline to append a " " if the completion would be valid with a " " appended - // which can be the case for input tasks and some commands. We need to exclude - // the empty string and ";" which always seem to be present. - val complete = (Parser.completions(parser, comp + " ", 10).get.map(_.display) -- - Set(";", "")).nonEmpty - candidates.add(new Candidate(comp, comp, null, null, null, null, complete)) + if (!pl.line().endsWith(" ")) { + candidates.add(new Candidate(pl.line().split(" ").last + c.append)) + } else { + candidates.add(new Candidate(c.append)) + } } } } From d1305647dc06453c30f56039e16fe80da385519e Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sat, 19 Dec 2020 15:16:50 -0500 Subject: [PATCH 2/2] Update GitHub Actions configuration for 1.4.x branch --- .github/workflows/ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9a7c95ebf..07b62261d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,6 +6,7 @@ on: jobs: test: strategy: + fail-fast: false matrix: include: - os: ubuntu-latest @@ -37,19 +38,19 @@ jobs: uses: actions/checkout@v2 with: repository: sbt/io - ref: develop + ref: 1.4.x path: io - name: Checkout sbt/librarymanagement uses: actions/checkout@v2 with: repository: sbt/librarymanagement - ref: develop + ref: 1.4.x path: librarymanagement - name: Checkout sbt/zinc uses: actions/checkout@v2 with: repository: sbt/zinc - ref: develop + ref: 1.4.x path: zinc - name: Setup uses: olafurpg/setup-scala@v10