chore: remove ignored tests and disconnect test infrastructure

client/src/commands/lspCommands.ts

@@ -3,14 +3,6 @@ import { LanguageClient } from 'vscode-languageclient/node'
 import { EventEmitter } from 'events'
 import * as jobs from '../protocol/requests'
 
-/**
- * Request that the server should disconnect. Returns promise that will resolve when the server has been reconnected.
- * Used for testing purposes.
- */
-export function simulateDisconnect(client: LanguageClient) {
-  return () => client.sendNotification(jobs.Request.apiDisconnect)
-}
-
 export function makeHandleRunJob(client: LanguageClient, request: jobs.Request) {
   return function handler() {
     client.sendNotification(request)

client/src/extension.ts

@@ -17,7 +17,7 @@ import { setupProjectWatchers, setupSingleFileTracking, disposeWatchers } from '
 import { startSession } from './lsp/session'
 import { getUserConfiguration, getCheckCount } from './lsp/notifications'
 
-import { simulateDisconnect, showAst, allJobsFinished } from './commands/lspCommands'
+import { showAst, allJobsFinished } from './commands/lspCommands'
 import {
   runMain,
   cmdInit,
@@ -114,7 +114,6 @@ export async function activate(context: vscode.ExtensionContext, launchOptions:
   // Register commands for command palette
   registerCommand('flix.internalRestart', makeHandleRestartClient(context, { shouldUpdateFlix: false }))
   registerCommand('flix.internalDownloadLatest', makeHandleRestartClient(context, { shouldUpdateFlix: true }))
-  registerCommand('flix.simulateDisconnect', simulateDisconnect(client))
   registerCommand('flix.runMain', runMain(context, launchOptions))
 
   registerCommand('flix.cmdInit', cmdInit(context, launchOptions))

client/src/protocol/requests.ts

@@ -32,7 +32,6 @@ export enum Request {
   apiRemJar = 'api/remJar',
   apiVersion = 'api/version',
   apiShutdown = 'api/shutdown',
-  apiDisconnect = 'api/disconnect',
 
   lspCheck = 'lsp/check',
   lspCodelens = 'lsp/codelens',

server/src/engine/jobs.ts

@@ -32,7 +32,6 @@ export enum Request {
   apiRemJar = 'api/remJar',
   apiVersion = 'api/version',
   apiShutdown = 'api/shutdown',
-  apiDisconnect = 'api/disconnect',
 
   lspCheck = 'lsp/check',
   lspCodelens = 'lsp/codelens',

server/src/handlers/lifecycle.ts

@@ -113,15 +113,6 @@ export function handleExit() {
   engine.stop()
 }
 
-/**
- * Simulates the compiler disconnecting.
- * Used for testing.
- */
-export function handleDisconnect() {
-  const expectResponse = false
-  socket.sendMessage({ id: 'disconnect', request: jobs.Request.apiDisconnect }, expectResponse)
-}
-
 /**
  * Request a response to be sent when all jobs are finished.
  */

server/src/server.ts

@@ -19,8 +19,6 @@ connection.onInitialize(handlers.handleInitialize)
 // The user has changed something in the configuration
 connection.onNotification(jobs.Request.internalReplaceConfiguration, handlers.handleReplaceConfiguration)
 
-connection.onNotification(jobs.Request.apiDisconnect, handlers.handleDisconnect)
-
 // Event happens once after either startup or a restart - starts the engine
 connection.onNotification(jobs.Request.internalReady, handlers.handleReady)
 

test/src/implementation.test.ts

@@ -16,7 +16,7 @@
 
 import * as assert from 'assert'
 import * as vscode from 'vscode'
-import { getTestDocUri, init, normalizeLocation } from './util'
+import { getTestDocUri, init } from './util'
 
 suite('ImplementationProvider', () => {
   const dividableDocUri = getTestDocUri('src/Dividable.flix')
@@ -34,22 +34,4 @@ suite('ImplementationProvider', () => {
     )
     assert.deepStrictEqual(r, [])
   })
-
-  async function testImplementations(uri: vscode.Uri, position: vscode.Position, expectedLocations: vscode.Location[]) {
-    const r = await vscode.commands.executeCommand<(vscode.Location | vscode.LocationLink)[]>(
-      'vscode.executeImplementationProvider',
-      uri,
-      position,
-    )
-
-    const actualLocations = r.map(normalizeLocation)
-
-    assert.deepStrictEqual(new Set(actualLocations), new Set(expectedLocations))
-  }
-
-  test.skip('Should find Dividable trait implementation', async () => {
-    await testImplementations(dividableDocUri, new vscode.Position(1, 6), [
-      new vscode.Location(dividableDocUri, new vscode.Range(5, 9, 5, 18)),
-    ])
-  })
 })

test/src/rename.test.ts

@@ -37,18 +37,6 @@ suite('RenameProvider', () => {
     assert.strictEqual(ranges.length, 2)
   })
 
-  test.skip('Should rename function', async () => {
-    const position = await findMarkerPosition(mainDocUri, 'area1')
-    const ranges = await testRename(mainDocUri, position)
-    assert.strictEqual(ranges.length, 2)
-  })
-
-  test.skip('Should rename function-use', async () => {
-    const position = await findMarkerPosition(mainDocUri, 'area2')
-    const ranges = await testRename(mainDocUri, position)
-    assert.strictEqual(ranges.length, 2)
-  })
-
   async function testRename(uri: vscode.Uri, position: vscode.Position): Promise<vscode.Range[]> {
     await open(uri)
     const newName = 'NewName'

test/testWorkspaces/rename/src/Main.flix

@@ -7,12 +7,12 @@ enum Shape {
 
 /// Computes the area of the given shape using
 /// pattern matching and basic arithmetic.
-def area /*!area1*/(s /*!s1*/: Shape): Int32 = match s /*!s2*/ {
+def area(s /*!s1*/: Shape): Int32 = match s /*!s2*/ {
     case Shape.Circle(r)       => 3 * (r * r)
     case Shape.Square(w)       => w * w
     case Shape.Rectangle(h, w) => h * w
 }
 
 // Computes the area of a 2 by 4.
 def main(): Unit \ IO =
-    println(area /*!area2*/(Shape.Rectangle(2, 4)))
+    println(area(Shape.Rectangle(2, 4)))