Changed sbtserver to just work off of the address variable

11 files changed, 3 insertions, 35 deletions

diff --git a/test/command_callback/test_scala_sbtserver.vader b/test/command_callback/test_scala_sbtserver.vader
index 40aacaf4..1b708bd9 100644
--- a/test/command_callback/test_scala_sbtserver.vader
+++ b/test/command_callback/test_scala_sbtserver.vader
@@ -5,21 +5,15 @@ Before:
   call ale#assert#SetUpLinterTest('scala', 'sbtserver')
 After:
   call ale#assert#TearDownLinterTest()
-Execute(should set sbtserver for sbt project with active.json):
+Execute(should set sbtserver for sbt project with build.sbt):
   call ale#test#SetFilename('../scala_fixtures/valid_sbt_project/Main.scala')
   AssertLSPLanguage 'scala'
   AssertLSPOptions {}
   AssertLSPProject ale#path#Simplify(g:dir . 'command_callback/../scala_fixtures/valid_sbt_project')
-  AssertLSPAddress '127.0.0.1:5211'
-Execute(should not set sbtserver for sbt project without active.json):
-  call ale#test#SetFilename('../scala_fixtures/no_active_sbt_project/Main.scala')
-  AssertLSPLanguage 'scala'
-  AssertLSPOptions {}
-  AssertLSPProject ale#path#Simplify(g:dir . 'command_callback/../scala_fixtures/no_active_sbt_project')
-  AssertLSPAddress ''
+  AssertLSPAddress '127.0.0.1:4273'
 Execute(should not set sbtserver for sbt project without build.sbt):
   call ale#test#SetFilename('../scala_fixtures/invalid_sbt_project/Main.scala')
   AssertLSPLanguage 'scala'
   AssertLSPOptions {}
   AssertLSPProject ''
-  AssertLSPAddress ''
+  AssertLSPAddress '127.0.0.1:4273'
diff --git a/test/scala_fixtures/invalid_sbt_project/Main.scala b/test/scala_fixtures/invalid_sbt_project/Main.scala
index 8431ac25..e69de29b 100644
--- a/test/scala_fixtures/invalid_sbt_project/Main.scala
+++ b/test/scala_fixtures/invalid_sbt_project/Main.scala
@@ -1,5 +0,0 @@
-object HelloAle {
-  def main(args: Array[String]): Int = {
-    println("Hello, ale!")
-  }
-}
diff --git a/test/scala_fixtures/invalid_sbt_project/project/build.properties b/test/scala_fixtures/invalid_sbt_project/project/build.properties
deleted file mode 100644
index 5620cc50..00000000
--- a/test/scala_fixtures/invalid_sbt_project/project/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-sbt.version=1.2.1
diff --git a/test/scala_fixtures/invalid_sbt_project/project/target/active.json b/test/scala_fixtures/invalid_sbt_project/project/target/active.json
deleted file mode 100644
index 0ecdb533..00000000
--- a/test/scala_fixtures/invalid_sbt_project/project/target/active.json
+++ /dev/null
@@ -1 +0,0 @@
-{"uri":"tcp://127.0.0.1:5211"}
diff --git a/test/scala_fixtures/no_active_sbt_project/Main.scala b/test/scala_fixtures/no_active_sbt_project/Main.scala
deleted file mode 100644
index 8431ac25..00000000
--- a/test/scala_fixtures/no_active_sbt_project/Main.scala
+++ /dev/null
@@ -1,5 +0,0 @@
-object HelloAle {
-  def main(args: Array[String]): Int = {
-    println("Hello, ale!")
-  }
-}
diff --git a/test/scala_fixtures/no_active_sbt_project/build.sbt b/test/scala_fixtures/no_active_sbt_project/build.sbt
deleted file mode 100644
index f50b72d2..00000000
--- a/test/scala_fixtures/no_active_sbt_project/build.sbt
+++ /dev/null
@@ -1,3 +0,0 @@
-name := "ale-scala-valid"
-version := "1.0"
-scalaVersion := "2.12.6"
diff --git a/test/scala_fixtures/no_active_sbt_project/project/build.properties b/test/scala_fixtures/no_active_sbt_project/project/build.properties
deleted file mode 100644
index 5620cc50..00000000
--- a/test/scala_fixtures/no_active_sbt_project/project/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-sbt.version=1.2.1
diff --git a/test/scala_fixtures/valid_sbt_project/Main.scala b/test/scala_fixtures/valid_sbt_project/Main.scala
index 8431ac25..e69de29b 100644
--- a/test/scala_fixtures/valid_sbt_project/Main.scala
+++ b/test/scala_fixtures/valid_sbt_project/Main.scala
@@ -1,5 +0,0 @@
-object HelloAle {
-  def main(args: Array[String]): Int = {
-    println("Hello, ale!")
-  }
-}
diff --git a/test/scala_fixtures/valid_sbt_project/build.sbt b/test/scala_fixtures/valid_sbt_project/build.sbt
index f50b72d2..e69de29b 100644
--- a/test/scala_fixtures/valid_sbt_project/build.sbt
+++ b/test/scala_fixtures/valid_sbt_project/build.sbt
@@ -1,3 +0,0 @@
-name := "ale-scala-valid"
-version := "1.0"
-scalaVersion := "2.12.6"
diff --git a/test/scala_fixtures/valid_sbt_project/project/build.properties b/test/scala_fixtures/valid_sbt_project/project/build.properties
deleted file mode 100644
index 5620cc50..00000000
--- a/test/scala_fixtures/valid_sbt_project/project/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-sbt.version=1.2.1
diff --git a/test/scala_fixtures/valid_sbt_project/project/target/active.json b/test/scala_fixtures/valid_sbt_project/project/target/active.json
deleted file mode 100644
index 0ecdb533..00000000
--- a/test/scala_fixtures/valid_sbt_project/project/target/active.json
+++ /dev/null
@@ -1 +0,0 @@
-{"uri":"tcp://127.0.0.1:5211"}