From 67fe4d8b60680acf112c6e67fad01221ecbe76b6 Mon Sep 17 00:00:00 2001 From: Martin Aeschlimann Date: Mon, 6 Jun 2016 17:32:06 +0200 Subject: [PATCH] [json] rename server to jsonServerMain --- extensions/json/client/src/jsonMain.ts | 2 +- extensions/json/server/src/{server.ts => jsonServerMain.ts} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename extensions/json/server/src/{server.ts => jsonServerMain.ts} (100%) diff --git a/extensions/json/client/src/jsonMain.ts b/extensions/json/client/src/jsonMain.ts index 98c256c04fd..790b12f086b 100644 --- a/extensions/json/client/src/jsonMain.ts +++ b/extensions/json/client/src/jsonMain.ts @@ -37,7 +37,7 @@ export function activate(context: ExtensionContext) { languages.getLanguages().then(languageIds => { // The server is implemented in node - let serverModule = context.asAbsolutePath(path.join('server', 'out', 'server.js')); + let serverModule = context.asAbsolutePath(path.join('server', 'out', 'jsonServerMain.js')); // The debug options for the server let debugOptions = { execArgv: ['--nolazy', '--debug=6004'] }; diff --git a/extensions/json/server/src/server.ts b/extensions/json/server/src/jsonServerMain.ts similarity index 100% rename from extensions/json/server/src/server.ts rename to extensions/json/server/src/jsonServerMain.ts