Fix vscode issue with missing OutputConsole (#69)

* Fix vscode issue with missing OutputConsole

Signed-off-by: m-g-k <mgk@uk.ibm.com>

* Fix tests in Travis

Signed-off-by: m-g-k <mgk@uk.ibm.com>

client/.gitignore

@@ -12,4 +12,7 @@
 out
 server
 node_modules
-*.vsix
+*.vsix
+.nyc_output
+.vscode-test
+coverage

client/.vscode/tasks.json

@@ -46,6 +46,21 @@
 				"reveal": "never"
 			},
 			"problemMatcher": []
+		},
+		{
+			"type": "npm",
+			"script": "lint",
+			"problemMatcher": [
+				"$tsc"
+			]
+		},
+		{
+			"type": "npm",
+			"script": "lint",
+			"path": "server/",
+			"problemMatcher": [
+				"$tsc"
+			]
 		}
 	]
 }

client/package.json

@@ -309,7 +309,9 @@
     "exact_paths": [
       "node_modules",
       "out",
-      "server"
+      "server",
+      ".vscode-test",
+      "coverage"
     ],
     "file_type_method": "EXCLUDE",
     "file_types": [

client/src/extension.ts

@@ -18,13 +18,13 @@ import * as fs from 'fs';
 import * as os from 'os';
 import { spawn } from 'child_process';
 
-import { workspace, commands, Disposable, ExtensionContext, window, WorkspaceConfiguration, TextDocumentChangeEvent, TextDocumentContentChangeEvent, Range, Position, Uri, TextDocumentShowOptions, ViewColumn, extensions } from 'vscode';
+import { workspace, commands, Disposable, ExtensionContext, OutputChannel, window, WorkspaceConfiguration, TextDocumentChangeEvent, TextDocumentContentChangeEvent, Range, Position, Uri, TextDocumentShowOptions, ViewColumn, extensions } from 'vscode';
 import { LanguageClient, LanguageClientOptions, SettingMonitor, ServerOptions, TransportKind, NotificationType, Code2ProtocolConverter, DidChangeTextDocumentParams } from 'vscode-languageclient';
 
 let client: LanguageClient = null;
 
 export function activate(context: ExtensionContext) {
-  // console.log('CLIENT activate!!!');
+   // console.log('CLIENT activate!!!');
 
   const disposable3 = workspace.onDidChangeConfiguration((params) => {
     // console.log(`CLIENT onDidChangeConfiguration ${JSON.stringify(params)}`); //debug
@@ -33,7 +33,8 @@ export function activate(context: ExtensionContext) {
   context.subscriptions.push(disposable3);
 
   // The server is implemented in node
-  const serverModule = context.asAbsolutePath(path.join('server', 'server.js'));
+  const serverModule = context.asAbsolutePath(path.join('server/src', 'server.js'));
+  const outputChannel: OutputChannel = window.createOutputChannel('Hyperledger Composer');
 
   // The debug options for the server
   const debugOptions = { execArgv: ['--nolazy', '--inspect=6009'] };
@@ -54,7 +55,8 @@ export function activate(context: ExtensionContext) {
       configurationSection: 'composer',
       // Notify the server about file changes to '.clientrc files contain in the workspace
       // fileEvents: workspace.createFileSystemWatcher('**/.clientrc')
-    }
+    },
+    outputChannel: outputChannel
   };
 
   // Create the language client and start the client.

client/test/extension.test.ts

@@ -30,21 +30,21 @@ suite('Extension Tests', () => {
     const uri = vscode.Uri.file(path.join(rootPath, '../test/data/valid/cto/test.cto'));
 
     workspace.openTextDocument(uri).then((document) => {
-    const text = document.getText();
-    assert.equal(document.languageId, 'composer');
-    assert.ok(document.lineCount === 41);
+      const text = document.getText();
+      assert.equal(document.languageId, 'composer');
+      assert.ok(document.lineCount === 41);
 
     });
   });
 
   test('activate should return an acl file when open an acl file', () => {
 
-   const uri = vscode.Uri.file(path.join(rootPath, '../test/data/valid/acl/permissions.acl'));
+    const uri = vscode.Uri.file(path.join(rootPath, '../test/data/valid/acl/permissions.acl'));
 
-   workspace.openTextDocument(uri).then((document) => {
-    const text = document.getText();
-    assert.equal(document.languageId, 'composer-acl');
-    assert.ok(document.lineCount === 34);
+    workspace.openTextDocument(uri).then((document) => {
+      const text = document.getText();
+      assert.equal(document.languageId, 'composer-acl');
+      assert.ok(document.lineCount === 48);
     });
   });
 });

server/.gitignore

@@ -11,4 +11,6 @@
 # limitations under the License.
 
 out
-node_modules
+node_modules
+.nyc_output
+coverage

server/package.json

@@ -13,21 +13,22 @@
     "url": "https://github.com/hyperledger/composer-vscode-plugin"
   },
   "dependencies": {
-    "composer-common": "latest",
+    "composer-common": "0.19.1",
     "vscode-languageserver": "3.3.0",
     "vscode-uri": "1.0.1"
   },
   "devDependencies": {
     "@types/mocha": "^2.2.33",
-    "@types/node": "^6.0.52",
+    "@types/node": "^6.0.106",
     "chai": "^4.1.2",
-    "mocha": "^5.0.0",
+    "mocha": "^5.1.0",
     "nyc": "^11.4.1",
     "source-map-support": "^0.5.3",
     "ts-node": "^4.1.0",
     "tslint": "^5.9.1",
     "tslint-loader": "^3.5.3",
-    "typescript": "^2.6.2"
+    "typescript": "^2.6.2",
+    "license-check-and-add": "^2.3.1"
   },
   "scripts": {
     "install:server": "installServerIntoExtension ../client ./package.json ./tsconfig.json",