bump flowr (#367)

* wip: bump flowr

* fixed static slice

* update linter and subsequent errors

* fixed various issues causing tests not to run and then fail

* what

* various additional test fixes

* don't re-activate since example tests don't do it either

* fixed hover values keeping a dead session alive

Author: Ellpeck

.github/workflows/test.yml

@@ -27,4 +27,4 @@ jobs:
         # (https://code.visualstudio.com/api/working-with-extensions/continuous-integration#github-actions)
         uses: coactions/setup-xvfb@v1
         with:
-          run: npm run test
+          run: npm run test -- --forbid-only

package-lock.json

@@ -783,7 +783,7 @@
     "watch-web": "webpack --watch"
   },
   "dependencies": {
-    "@eagleoutice/flowr": "^2.9.10",
+    "@eagleoutice/flowr": "^2.10.1",
     "assert": "^2.1.0",
     "browserify-zlib": "^0.2.0",
     "constants-browserify": "^1.0.0",
@@ -798,18 +798,18 @@
     "util": "^0.12.5"
   },
   "devDependencies": {
-    "@eagleoutice/eslint-config-flowr": "^1.0.19",
-    "@eslint/eslintrc": "^3.2.0",
-    "@eslint/js": "^9.20.0",
-    "@types/mocha": "^10.0.6",
+    "@eagleoutice/eslint-config-flowr": "^1.0.36",
+    "@eslint/eslintrc": "^3.3.3",
+    "@eslint/js": "^9.39.2",
+    "@types/mocha": "^10.0.10",
     "@types/node": "22.x",
     "@types/semver": "^7.5.8",
     "@types/vscode": "^1.92.0",
     "@types/webpack-env": "^1.16.0",
     "@types/ws": "^8.5.10",
-    "@vscode/test-cli": "^0.0.6",
-    "@vscode/test-electron": "^2.3.9",
-    "@vscode/test-web": "^0.0.78",
+    "@vscode/test-cli": "^0.0.12",
+    "@vscode/test-electron": "^2.5.2",
+    "@vscode/test-web": "^0.0.80",
     "copy-webpack-plugin": "^12.0.2",
     "ifdef-loader": "^2.3.2",
     "ts-essentials": "^10.1.1",

package.json

@@ -1,6 +1,6 @@
 import type { AsyncOrSync } from 'ts-essentials';
 import type { RefresherConfigKeys } from './settings';
-import { Settings , getConfig } from './settings';
+import { Settings, getConfig } from './settings';
 import * as vscode from 'vscode';
 
 
@@ -13,7 +13,7 @@ export interface ConfigurableRefresherConstructor {
 	name: string;
 	/**
 	 * The keys that are used to configure the refresher by the user,
-    * or to fix the values to be used
+	 * or to fix the values to be used
 	 */
 	keys:              RefresherConfigKeys & { type?: undefined } | {
 		type:          'fixed';
@@ -22,7 +22,7 @@ export interface ConfigurableRefresherConstructor {
 		interval:      number;
 	}
 	/**
-	 * The function that should be called, when the content should be updated 
+	 * The function that should be called, when the content should be updated
 	 * according to the policy configured by the config
 	 */
 	refreshCallback:        Callback<void>;
@@ -32,7 +32,7 @@ export interface ConfigurableRefresherConstructor {
 	configChangedCallback?: Callback<void>;
 	/**
 	 * (optional) The function that should be called, when the user opens a non supported file
-	 * (i.e. not an R file), and the content should be cleared 
+	 * (i.e. not an R file), and the content should be cleared
 	 */
 	clearCallback?:         Callback<void>;
 	/**
@@ -47,7 +47,7 @@ export interface ConfigurableRefresherConstructor {
 }
 
 export const enum RefreshType {
-	Never = 'never', 
+	Never = 'never',
 	Interval = 'interval',
 	Adaptive = 'adaptive',
 	OnSave = 'on save',
@@ -75,7 +75,7 @@ export class ConfigurableRefresher {
 
 	constructor(c: ConfigurableRefresherConstructor) {
 		this.spec = c;
-        
+
 		this.disposables.push(vscode.workspace.onDidChangeConfiguration(e => {
 			if(!e.affectsConfiguration(Settings.Category)) {
 				return;
@@ -108,7 +108,7 @@ export class ConfigurableRefresher {
 
 	/**
 	 * Gets called immediatly before running the refreshCallback to avoid unnecessary updates.
-	 * Can be overriden by @see ConfigurableRefresherConstructor.shouldUpdateHook
+	 * Can be overriden by {@link ConfigurableRefresherConstructor.shouldUpdateHook}
 	 */
 	private shouldUpdate(): boolean {
 		if(!vscode.window.activeTextEditor) {
@@ -167,7 +167,7 @@ export class ConfigurableRefresher {
 	private static registerRefresherForOnChanged(refresher: ConfigurableRefresher) {
 		if(!ConfigurableRefresher.documentChangedDisposable) {
 			ConfigurableRefresher.documentChangedDisposable = vscode.workspace.onDidChangeTextDocument((e) => {
-				ConfigurableRefresher.onTextDocumentChanged(e); 
+				ConfigurableRefresher.onTextDocumentChanged(e);
 			});
 		}
 
@@ -176,7 +176,7 @@ export class ConfigurableRefresher {
 
 	private update() {
 		this.spec.output.append(`[${this.spec.name}] Updating Configuration`);
-	
+
 		if(this.activeInterval) {
 			clearInterval(this.activeInterval);
 			this.activeInterval = undefined;
@@ -204,11 +204,11 @@ export class ConfigurableRefresher {
 						}
 					});
 				} else {
-					this.activeDisposable = vscode.workspace.onDidChangeTextDocument(e => {	
+					this.activeDisposable = vscode.workspace.onDidChangeTextDocument(e => {
 						if(isChangeRelevant(e)) {
 							this.runRefreshCallback();
 						}
-						
+
 						if(getActiveEditorCharLength() > breakOff) {
 							this.update();
 						}
@@ -233,13 +233,16 @@ function getActiveEditorCharLength() {
 }
 
 function isChangeRelevant(e: vscode.TextDocumentChangeEvent): boolean {
-	return e.contentChanges.length > 0 
+	return e.contentChanges.length > 0
 		   && isRTypeLanguage(vscode.window.activeTextEditor?.document)
-		   && e.document === vscode.window.activeTextEditor?.document 
+		   && e.document === vscode.window.activeTextEditor?.document
 		   && e.document.version >= (vscode.window.activeTextEditor?.document.version ?? 0);
 }
 
 
+/**
+ *
+ */
 export function isRTypeLanguage(doc?: vscode.TextDocument): doc is vscode.TextDocument {
 	return !!doc && TriggerOnLanguageIds.indexOf(doc.languageId) !== -1;
-}
+}

src/configurable-refresher.ts

@@ -10,12 +10,12 @@ import { rangeToVscodeRange, type SliceReturn } from './flowr/utils';
 import type { DecoTypes } from './slice';
 import { displaySlice, makeSliceDecorationTypes } from './slice';
 import { positionSlicers } from './position-slicer';
-import { Settings , getConfig } from './settings';
+import { Settings, getConfig } from './settings';
 import type { SlicingCriteria } from '@eagleoutice/flowr/slicing/criterion/parse';
 import type { NormalizedAst } from '@eagleoutice/flowr/r-bridge/lang-4.x/ast/model/processing/decorate';
 import type { NodeId } from '@eagleoutice/flowr/r-bridge/lang-4.x/ast/model/processing/node-id';
 import type { DataflowInformation } from '@eagleoutice/flowr/dataflow/info';
-import { SliceDirection } from '@eagleoutice/flowr/core/steps/all/static-slicing/00-slice';
+import { SliceDirection } from '@eagleoutice/flowr/util/slice-direction';
 
 
 const criteriaSlicerAuthority = 'criteria-slicer';
@@ -24,6 +24,9 @@ const criteriaSlicerPath = 'Dependency Slice';
 
 // currently only one instance is used and never disposed
 let criteriaSlicer: CriteriaSlicer | undefined;
+/**
+ *
+ */
 export function getCriteriaSlicer(): CriteriaSlicer {
 	if(criteriaSlicer) {
 		criteriaSlicer.disposeCurrent();

src/criteria-slicer.ts

@@ -46,6 +46,9 @@ export class ReconstructionContentProvider implements vscode.TextDocumentContent
 	}
 }
 
+/**
+ *
+ */
 export function makeUri(authority: string, path: string){
 	if(authority && path && !path.startsWith('/')){
 		path = '/' + path;
@@ -58,6 +61,9 @@ export function makeUri(authority: string, path: string){
 	return uri;
 }
 
+/**
+ *
+ */
 export async function showUri(uri: vscode.Uri, language: string = 'r', viewColumn: vscode.ViewColumn = vscode.ViewColumn.Beside): Promise<Thenable<vscode.TextEditor>> {
 	for(const editor of vscode.window.visibleTextEditors){
 		if(editor.document.uri.toString() === uri.toString()){
@@ -79,11 +85,14 @@ export async function showUri(uri: vscode.Uri, language: string = 'r', viewColum
 	setTimeout(() => {
 		editor.revealRange(lastLine.range, vscode.TextEditorRevealType.Default);
 	}, 50);
-	
+
 	return editor;
 }
 
 let reconstructionContentProvider: ReconstructionContentProvider | undefined;
+/**
+ *
+ */
 export function getReconstructionContentProvider(): ReconstructionContentProvider {
 	if(!reconstructionContentProvider) {
 		reconstructionContentProvider = new ReconstructionContentProvider();