Merge branch 'linter'

.gitignore

@@ -1,3 +1,4 @@
 node_modules/
 out/
 *.vsix
+.vscode-test

.travis.yml

@@ -3,8 +3,20 @@ os: linux
 language: node_js
 node_js: 8
 
+before_install:
+- if [ $TRAVIS_OS_NAME == "linux" ]; then
+      export CXX="g++-4.9" CC="gcc-4.9" DISPLAY=:99.0;
+      sh -e /etc/init.d/xvfb start;
+      sleep 3;
+  fi
+
+install: 
+- npm install
+- npm run vscode:prepublish
+
 script:
 - npm ci;
+- npm test --silent;
 - ./node_modules/.bin/vsce package;
 
 deploy:

.vscode/launch.json

@@ -18,6 +18,20 @@
 				"${workspaceFolder}/out/**/*.js"
 			],
 			"preLaunchTask": "npm: watch"
+		},
+		{
+			"name": "Extension Tests",
+			"type": "extensionHost",
+			"request": "launch",
+			"runtimeExecutable": "${execPath}",
+			"args": [
+				"--extensionDevelopmentPath=${workspaceFolder}",
+				"--extensionTestsPath=${workspaceFolder}/out/test"
+			],
+			"outFiles": [
+				"${workspaceFolder}/out/test/**/*.js"
+			],
+			"preLaunchTask": "npm: watch"
 		}
 	]
 }

.vscode/settings.json

@@ -6,4 +6,5 @@
     "search.exclude": {
         "out": true // set this to false to include "out" folder in search results
     },
+    "typescript.tsc.autoDetect": "off"
 }

.vscodeignore

@@ -1,3 +1,11 @@
 .vscode/**
 .vscode-test/**
+out/test/**
+src/**
 .gitignore
+vsc-extension-quickstart.md
+**/tsconfig.json
+**/tslint.json
+**/*.map
+**/*.ts
+node_modules/**

README.md

@@ -14,3 +14,8 @@ The usual shortcuts are implemented to evaluate code fragments:
 - `ctrl+. ctrl+b` (feed file)
 - `ctrl+. ctrl+r` (feed selection)
 - `ctrl+alt+x` (feed paragraph)
+
+Linter
+------
+
+To use the linter included in this extension set `oz.enableLinter` to `true`. This linter will only show any error or warning when feeding code to the engine for the current file.

coverconfig.json

@@ -0,0 +1,9 @@
+{
+    "enabled": true,
+    "relativeSourcePath": "../src",
+    "relativeCoverageDir": "../../coverage",
+    "ignorePatterns": ["**/node_modules/**"],
+    "includePid": false,
+    "reports": ["json", "html", "lcov"],
+    "verbose": false
+}

package.json

@@ -3,7 +3,11 @@
     "displayName": "Oz",
     "description": "Mozart-Oz OPI for Visual Studio Code",
     "icon": "images/icon.png",
-    "version": "0.0.5",
+    "galleryBanner": {
+        "color": "#fcaf3e",
+        "theme": "light"
+    },
+    "version": "1.0.0",
     "engines": {
         "vscode": "^1.31.0"
     },
@@ -61,6 +65,16 @@
                     "type": "string",
                     "description": "Absolute path to the ozengine binary",
                     "default": "ozengine"
+                },
+                "oz.enableLinter": {
+                    "type": "boolean",
+                    "default": false,
+                    "description": "Enables the linting of Oz files"
+                },
+                "oz.showCompilerOutput": {
+                    "type": "boolean",
+                    "default": true,
+                    "description": "Shows the compiler output in the output tab"
                 }
             }
         },
@@ -165,13 +179,16 @@
         "vscode:prepublish": "npm run compile",
         "compile": "tsc -p ./",
         "watch": "tsc -watch -p ./",
-        "postinstall": "node ./node_modules/vscode/bin/install"
+        "postinstall": "node ./node_modules/vscode/bin/install",
+        "test": "npm run compile && node ./node_modules/vscode/bin/test"
     },
     "devDependencies": {
-        "@types/node": "^11.11.7",
-        "typescript": "^2.0.3",
+        "@types/node": "^11.13.4",
+        "@types/mocha": "^2.2.42",
+        "typescript": "^3.4.3",
         "vsce": "^1.59.0",
-        "vscode": "^1.1.33"
+        "vscode": "^1.1.33",
+        "tslint": "^5.12.1"
     },
     "dependencies": {}
 }