bug fixes

Author: iSorp

.vscode/extensions.json

@@ -1,14 +1,9 @@
-.vscode/**
+.vscode/**/*
 **/*.ts
 **/*.map
 .gitignore
 **/tsconfig.json
 **/tsconfig.base.json
 contributing.md
 .travis.yml
-client/node_modules/**
-!client/node_modules/vscode-jsonrpc/**
-!client/node_modules/vscode-languageclient/**
-!client/node_modules/vscode-languageserver-protocol/**
-!client/node_modules/vscode-languageserver-types/**
-!client/node_modules/semver/**
+

.vscodeignore

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) Microsoft
+Copyright (c) Simon Wälti
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

LICENSE.md

@@ -7,8 +7,11 @@ Fanuc Macro Executor syntax highlighting and project building
 ## Features
 
 * Compiling and linking of fanuc macro executor projects.
-* Syntax highlighting
 * Problem matcher
+* Syntax highlighting
+* Syntax validation
+* Symbol provider
+
 
 
 ### Compile

README.md

@@ -13,7 +13,8 @@
 		"vscode": "^1.43.0"
 	},
 	"dependencies": {
-		"vscode-languageclient": "^6.1.3"
+		"vscode-languageclient": "^6.1.3",
+		"rxjs": "^6.5.2"
 	},
 	"devDependencies": {
 		"@types/vscode": "1.43.0",

client/package-lock.json

@@ -20,6 +20,8 @@ let client: LanguageClient;
 
 export function activate(context: ExtensionContext) {
 
+	console.log('adsgsdg');
+
 	// The server is implemented in node
 	let serverModule = context.asAbsolutePath(
 		path.join('server', 'out', 'server.js')

client/package.json

@@ -2,7 +2,7 @@
 	"name": "macro-executor",
 	"displayName": "Macro Executor Language",
 	"description": "Fanuc Macro-Executor Programming Language",
-	"version": "0.0.5",
+	"version": "0.1.0",
 	"author": "iSorp",
 	"publisher": "iSorp",
 	"license": "MIT",
@@ -113,23 +113,6 @@
 			"type": "object",
 			"title": "MacroExecutor Configuration",
 			"properties": {
-				"macroLanguageServer.maxNumberOfProblems": {
-					"scope": "resource",
-					"type": "number",
-					"default": 100,
-					"description": "Controls the maximum number of problems produced by the server."
-				},
-				"macroLanguageServer.trace.server": {
-					"scope": "window",
-					"type": "string",
-					"enum": [
-						"off",
-						"messages",
-						"verbose"
-					],
-					"default": "off",
-					"description": "Traces the communication between VS Code and the language server."
-				},
 				"macroLanguageServer.validate": {
 					"scope": "resource",
 					"type": "boolean",
@@ -199,11 +182,15 @@
 		]
 	},
 	"scripts": {
-		"vscode:prepublish": "cd client && npm run update-vscode && cd .. && npm run compile",
 		"compile": "tsc -b",
+		"compile:client": "tsc -b ./client/tsconfig.json",
+		"compile:server": "tsc -b ./server/tsconfig.json",
 		"watch": "tsc -b -w",
-		"postinstall": "cd client && npm install && cd ../server && npm install && cd ..",
-		"test": "sh ./scripts/e2e.sh"
+		"lint": "npm run lint:client && npm run lint:server",
+		"lint:client": "eslint --config ./client/.eslintrc.json ./client/src/*.ts",
+		"lint:server": "eslint --config ./server/.eslintrc.json ./server/src/*.ts",
+		"clean": "rimraf client/out && rimraf server/out",
+		"postinstall": "cd client && npm install && cd ../server && npm install && cd .."
 	},
 	"devDependencies": {
 		"@types/glob": "^7.1.1",
@@ -212,8 +199,6 @@
 		"@typescript-eslint/parser": "^2.3.0",
 		"mocha": "^7.0.1",
 		"typescript": "^3.8.3",
-		"eslint": "^6.4.0",
-		"vscode-nls": "^4.1.1",
-		"vscode-uri": "^2.1.1"
+		"eslint": "^6.4.0"
 	}
 }

client/src/extension.ts

@@ -14,7 +14,10 @@
 	},
 	"dependencies": {
 		"vscode-languageserver": "^6.1.1",
-		"vscode-languageserver-textdocument": "^1.0.1"
+		"vscode-languageserver-textdocument": "^1.0.1",
+		"vscode-nls": "^4.1.1",
+		"vscode-uri": "^2.1.1",
+		"glob": "^7.1.6"
 	},
 	"scripts": {}
 }

package-lock.json

@@ -47,7 +47,7 @@ export function getMacroLanguageService(options?: LanguageServiceOptions): Langu
 
 	return createFacade(
 		new Parser(options && options.fileProvider),
-		new MacroHover(options && options.clientCapabilities, options && options.fileProvider),
+		new MacroHover(options && options.fileProvider),
 		new MacroNavigation(options && options.fileProvider),
 		new MacroValidation(options && options.fileProvider)
 	);

package.json

@@ -13,7 +13,7 @@ export * from 'vscode-languageserver-types';
 
 
 export interface LanguageSettings {
-	lint?: boolean;
+	validate?: boolean;
 }
 
 export interface DocumentContext {
@@ -24,66 +24,9 @@ export interface FindDocumentLinks {
 	resolveReference(ref: string, base?: string): string;
 }
 
-/**
- * Describes what LSP capabilities the client supports
- */
-export interface ClientCapabilities {
-	/**
-	 * The text document client capabilities
-	 */
-	textDocument?: {
-		/**
-		 * Capabilities specific to completions.
-		 */
-		completion?: {
-			/**
-			 * The client supports the following `CompletionItem` specific
-			 * capabilities.
-			 */
-			completionItem?: {
-				/**
-				 * Client supports the follow content formats for the documentation
-				 * property. The order describes the preferred format of the client.
-				 */
-				documentationFormat?: MarkupKind[];
-			};
-
-		};
-		/**
-		 * Capabilities specific to hovers.
-		 */
-		hover?: {
-			/**
-			 * Client supports the follow content formats for the content
-			 * property. The order describes the preferred format of the client.
-			 */
-			contentFormat?: MarkupKind[];
-		};
-	};
-}
-
-export namespace ClientCapabilities {
-	export const LATEST: ClientCapabilities = {
-		textDocument: {
-			completion: {
-				completionItem: {
-					documentationFormat: [MarkupKind.Markdown, MarkupKind.PlainText]
-				}
-			},
-			hover: {
-				contentFormat: [MarkupKind.Markdown, MarkupKind.PlainText]
-			}
-		}
-	};
-}
-
 export interface LanguageServiceOptions {
 
 	fileProvider?: MacroFileProvider;
-	/**
-	 * Describes the LSP capabilities the client supports.
-	 */
-	clientCapabilities?: ClientCapabilities;
 }
 
 export interface MacroFileType {