Merge branch 'main' into worksofliam/issue361

Signed-off-by: worksofliam <mrliamallan@live.co.uk>

Author: worksofliam

extension/client/package-lock.json

@@ -12,7 +12,7 @@
 		"vscode-languageclient": "^7.0.0"
 	},
 	"devDependencies": {
-		"@halcyontech/vscode-ibmi-types": "^2.11.0",
+		"@halcyontech/vscode-ibmi-types": "^2.15.3",
 		"@types/vscode": "^1.63.0",
 		"@vscode/test-electron": "^2.1.2"
 	}

extension/client/package.json

@@ -1,9 +1,21 @@
 import { CodeForIBMi } from "@halcyontech/vscode-ibmi-types";
-import Instance from "@halcyontech/vscode-ibmi-types/api/Instance";
-import { Extension, extensions } from "vscode";
+import Instance from "@halcyontech/vscode-ibmi-types/Instance";
+import { ConfigurationChangeEvent, Extension, extensions, workspace } from "vscode";
 
 let baseExtension: Extension<CodeForIBMi>|undefined;
 
+export async function checkAndWait() {
+  baseExtension = extensions.getExtension(`halcyontechltd.code-for-ibmi`);
+
+  if (baseExtension) {
+    if (!baseExtension.isActive) {
+      await baseExtension.activate();
+    }
+  }
+
+  return getInstance();
+}
+
 /**
  * This should be used on your extension activation.
  */
@@ -21,4 +33,14 @@ export function loadBase(): CodeForIBMi|undefined {
 export function getInstance(): Instance|undefined {
   const base = loadBase();
   return (base ? base.instance : undefined);
+}
+
+// Stolen directly from vscode-ibmi
+export function onCodeForIBMiConfigurationChange<T>(props: string | string[], todo: (value: ConfigurationChangeEvent) => void) {
+  const keys = (Array.isArray(props) ? props : Array.of(props)).map(key => `code-for-ibmi.${key}`);
+  return workspace.onDidChangeConfiguration(async event => {
+    if (keys.some(key => event.affectsConfiguration(key))) {
+      todo(event);
+    }
+  })
 }

extension/client/src/base.ts

@@ -0,0 +1,11 @@
+import { commands, ExtensionContext, window } from "vscode";
+import { clearTableCache } from "./requests";
+import { LanguageClient } from "vscode-languageclient/node";
+
+export function registerCommands(context: ExtensionContext, client: LanguageClient) {
+  context.subscriptions.push(
+    commands.registerCommand(`vscode-rpgle.server.reloadCache`, () => {
+      clearTableCache(client);
+    })
+  )
+}

extension/client/src/commands.ts

@@ -4,7 +4,7 @@
  * ------------------------------------------------------------------------------------------ */
 
 import * as path from 'path';
-import { workspace, ExtensionContext, Uri, commands, RelativePattern } from 'vscode';
+import { workspace, ExtensionContext } from 'vscode';
 
 import * as Linter from "./linter";
 import * as columnAssist from "./language/columnAssist";
@@ -18,8 +18,11 @@ import {
 } from 'vscode-languageclient/node';
 
 import { projectFilesGlob } from './configuration';
-import buildRequestHandlers from './requests';
+import { clearTableCache, buildRequestHandlers } from './requests';
 import { getServerImplementationProvider, getServerSymbolProvider } from './language/serverReferences';
+import { checkAndWait, loadBase, onCodeForIBMiConfigurationChange } from './base';
+import { registerCommands } from './commands';
+import { setLanguageSettings } from './language/config';
 
 let client: LanguageClient;
 
@@ -43,6 +46,8 @@ export function activate(context: ExtensionContext) {
 		}
 	};
 
+	loadBase();
+
 	// Options to control the language client
 	const clientOptions: LanguageClientOptions = {
 		// Register the server for plain text documents
@@ -66,8 +71,25 @@ export function activate(context: ExtensionContext) {
 		clientOptions
 	);
 
-	client.onReady().then(() => {
+	client.onReady().then(async () => {
 		buildRequestHandlers(client);
+
+		const instance = await checkAndWait();
+
+		// We need to clear table caches when the connection changes
+		if (instance) {
+			// When the connection is established
+			instance.subscribe(context, "connected", "vscode-rpgle", () => {
+				clearTableCache(client);
+			});
+
+			// When the library list changes
+			context.subscriptions.push(
+				onCodeForIBMiConfigurationChange("connectionSettings", async () => {
+					clearTableCache(client);
+				}),
+			);
+		}
 	});
 
 	// Start the client. This will also launch the server
@@ -76,11 +98,14 @@ export function activate(context: ExtensionContext) {
 	Linter.initialise(context);
 	columnAssist.registerColumnAssist(context);
 
+	registerCommands(context, client);
+	
 	context.subscriptions.push(getServerSymbolProvider());
 	context.subscriptions.push(getServerImplementationProvider());
-
+	context.subscriptions.push(setLanguageSettings());
 	// context.subscriptions.push(...initBuilder(client));
 
+
 	console.log(`started`);
 }
 

extension/client/src/extension.ts

@@ -1,5 +1,5 @@
 
-import { commands, DecorationOptions, ExtensionContext, Range, ThemeColor, window } from 'vscode';
+import { commands, DecorationOptions, ExtensionContext, Range, Selection, TextDocument, ThemeColor, window } from 'vscode';
 import * as Configuration from "../configuration";
 import { loadBase } from '../base';
 
@@ -42,6 +42,15 @@ const getAreasForLine = (line: string, index: number) => {
   }
 }
 
+function documentIsFree(document: TextDocument) {
+  if (document.languageId === `rpgle`) {
+    const line = document.getText(new Range(0, 0, 0, 6)).toUpperCase();
+    return line === `**FREE`;
+  }
+  
+  return false;
+}
+
 export function registerColumnAssist(context: ExtensionContext) {
   context.subscriptions.push(
     commands.registerCommand(`vscode-rpgle.assist.launchUI`, async () => {
@@ -50,7 +59,7 @@ export function registerColumnAssist(context: ExtensionContext) {
         const document = editor.document;
 
         if (document.languageId === `rpgle`) {
-          if (document.getText(new Range(0, 0, 0, 6)).toUpperCase() !== `**FREE`) { 
+          if (!documentIsFree(document)) { 
             const lineNumber = editor.selection.start.line;
             const positionIndex = editor.selection.start.character;
 
@@ -81,6 +90,13 @@ export function registerColumnAssist(context: ExtensionContext) {
       }
     }),
 
+    commands.registerCommand(`vscode-rpgle.assist.moveLeft`, () => {
+      moveFromPosition(`left`);
+    }),
+    commands.registerCommand(`vscode-rpgle.assist.moveRight`, () => {
+      moveFromPosition(`right`);
+    }),
+
     window.onDidChangeTextEditorSelection(e => {
       const editor = e.textEditor;
       if (rulerEnabled) {
@@ -92,13 +108,43 @@ export function registerColumnAssist(context: ExtensionContext) {
   )
 }
 
+function moveFromPosition(direction: "left"|"right", editor = window.activeTextEditor) {
+  if (editor && editor.document.languageId === `rpgle` && !documentIsFree(editor.document)) {
+    const document = editor.document;
+    const lineNumber = editor.selection.start.line;
+    const positionIndex = editor.selection.start.character;
+
+    const positionsData = getAreasForLine(
+      document.getText(new Range(lineNumber, 0, lineNumber, 100)), 
+      positionIndex
+    );
+
+    if (positionsData) {
+      let newIndex: number|undefined;
+      if (direction === `left`) {
+        newIndex = positionsData.active - 1;
+      } else
+      if (direction === `right`) {
+        newIndex = positionsData.active + 1;
+      }
+
+      if (newIndex !== undefined && newIndex >= 0 && newIndex < positionsData.specification.length) {
+        const box = positionsData.specification[newIndex];
+        if (box) {
+          editor.selection = new Selection(lineNumber, box.start, lineNumber, box.start);
+        }
+      }
+    }
+  }
+}
+
 function updateRuler(editor = window.activeTextEditor) {
   let clear = true;
 
   if (editor) {
     const document = editor.document;
     if (document.languageId === `rpgle`) {
-      if (document.getText(new Range(0, 0, 0, 6)).toUpperCase() !== `**FREE`) {
+      if (!documentIsFree(document)) {
         const lineNumber = editor.selection.start.line;
         const positionIndex = editor.selection.start.character;
 

extension/client/src/language/columnAssist.ts

@@ -0,0 +1,7 @@
+import { languages } from "vscode";
+
+export function setLanguageSettings() {
+  return languages.setLanguageConfiguration(`rpgle`, {
+    wordPattern: /(-?\d*\.\d\w*)|([^\`\~\!\%\^\&\*\(\)\-\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\?\s]+)/g
+  });
+}

extension/client/src/language/config.ts

@@ -1,8 +1,7 @@
 import { commands, Definition, DocumentSymbol, languages, Location, ProgressLocation, Range, SymbolInformation, SymbolKind, TextDocument, Uri, window, workspace } from "vscode";
 import { getInstance } from "../base";
 import IBMi from "@halcyontech/vscode-ibmi-types/api/IBMi";
-import { ConnectionConfiguration } from "@halcyontech/vscode-ibmi-types/api/Configuration";
-import { IBMiMember } from "@halcyontech/vscode-ibmi-types";
+import { ConnectionConfig, IBMiMember } from "@halcyontech/vscode-ibmi-types";
 
 export function getServerSymbolProvider() {
   let latestFetch: ExportInfo[]|undefined;
@@ -68,11 +67,11 @@ export function getServerImplementationProvider() {
   return languages.registerImplementationProvider({language: `rpgle`, scheme: `member`}, {
     async provideImplementation(document, position, token): Promise<Definition|undefined> {
       const instance = getInstance();
+      const connection = instance?.getConnection();
 
-      if (instance && instance.getConnection()) {
+      if (connection) {
         const word = document.getText(document.getWordRangeAtPosition(position));
-        const connection = instance.getConnection();
-        const config = connection.config! //TODO in vscode-ibmi 3.0.0 - change to getConfig()
+        const config = connection.getConfig() //TODO in vscode-ibmi 3.0.0 - change to getConfig()
 
         const uriPath = document.uri.path;
         const member = connection.parserMemberPath(uriPath);
@@ -117,7 +116,7 @@ async function getSymbolFromDocument(docUri: Uri, name: string): Promise<Documen
   return;
 }
 
-function getLibraryList(config: ConnectionConfiguration.Parameters, member?: IBMiMember): string[] {
+function getLibraryList(config: ConnectionConfig, member?: IBMiMember): string[] {
   let libraryList = [config.currentLibrary, ...config.libraryList];
 
   if (member) {