feat: the extension now indicates when its workig on a slice etc. - #97

src/extension.ts

@@ -8,6 +8,7 @@ import type { FlowrSession } from './flowr/utils'
 import { selectionSlicer } from './selection-slicer'
 import { positionSlicers } from './position-slicer'
 import { flowrVersion } from '@eagleoutice/flowr-dev/util/version'
+import { Session } from 'inspector/promises'
 
 export const MINIMUM_R_MAJOR = 3
 export const BEST_R_MAJOR = 4
@@ -100,11 +101,17 @@ export function updateStatusBar() {
 		if(flowrSession.state === 'connected') {
 			tooltip.push(`R version ${flowrSession.rVersion}  \nflowR version ${flowrSession.flowrVersion}`)
 		}
+		if (flowrSession.working){
+			text.push(`$(loading~spin) Analyzing`)
+		}
 	} else if(flowrSession instanceof FlowrInternalSession) {
 		text.push(`$(console) flowR ${flowrSession.state}`)
 		if(flowrSession.state === 'active') {
 			tooltip.push(`R version ${flowrSession.rVersion}  \nflowR version ${flowrVersion().toString()}`)
 		}
+		if (flowrSession.working){
+			text.push(`$(loading~spin) Analyzing`)
+		}
 	}
 
 	const slicingTypes: string[] = []

src/flowr/internal-session.ts

@@ -17,6 +17,7 @@ export class FlowrInternalSession implements FlowrSession {
 
 	public state:    'inactive' | 'loading' | 'active' | 'failure'
 	public rVersion: string | undefined
+	public	working: boolean = false
 
 	private readonly outputChannel: vscode.OutputChannel
 	private shell:                  RShell | undefined
@@ -28,6 +29,11 @@ export class FlowrInternalSession implements FlowrSession {
 		updateStatusBar()
 	}
 
+	setWorking(working: boolean): void {
+		this.working = working
+		updateStatusBar()
+	}
+
 	async initialize() {
 		this.state = 'loading'
 		updateStatusBar()
@@ -91,7 +97,10 @@ export class FlowrInternalSession implements FlowrSession {
 			}
 		}
 		try {
-			return await this.extractSlice(this.shell, document, positions)
+			this.setWorking(true)
+			let result =  await this.extractSlice(this.shell, document, positions)
+			this.setWorking(false)
+			return result
 		} catch(e) {
 			this.outputChannel.appendLine('Error: ' + (e as Error)?.message);
 			(e as Error).stack?.split('\n').forEach(l => this.outputChannel.appendLine(l))
@@ -109,33 +118,43 @@ export class FlowrInternalSession implements FlowrSession {
 		if(!this.shell) {
 			return ''
 		}
+		this.setWorking(true)
 		const result = await new PipelineExecutor(DEFAULT_DATAFLOW_PIPELINE,{
 			shell:   this.shell,
 			request: requestFromInput(consolidateNewlines(document.getText()))
 		}).allRemainingSteps()
-		return dataflowGraphToMermaid(result.dataflow)
+		let dataflow = dataflowGraphToMermaid(result.dataflow)
+		this.setWorking(false)
+		return dataflow
+
 	}
 
 	async retrieveAstMermaid(document: vscode.TextDocument): Promise<string> {
 		if(!this.shell) {
 			return ''
 		}
+		this.setWorking(true)
 		const result = await new PipelineExecutor(DEFAULT_NORMALIZE_PIPELINE, {
 			shell:   this.shell,
 			request: requestFromInput(consolidateNewlines(document.getText()))
 		}).allRemainingSteps()
-		return normalizedAstToMermaid(result.normalize.ast)
+		let ast = normalizedAstToMermaid(result.normalize.ast)
+		this.setWorking(false)
+		return ast
 	}
 
 	async retrieveCfgMermaid(document: vscode.TextDocument): Promise<string> {
 		if(!this.shell) {
 			return ''
 		}
+		this.setWorking(true)
 		const result = await new PipelineExecutor(DEFAULT_NORMALIZE_PIPELINE, {
 			shell:   this.shell,
 			request: requestFromInput(consolidateNewlines(document.getText()))
 		}).allRemainingSteps()
-		return cfgToMermaid(extractCFG(result.normalize), result.normalize)
+		let cfg = cfgToMermaid(extractCFG(result.normalize), result.normalize)
+		this.setWorking(false)
+		return cfg
 	}
 
 	private async extractSlice(shell: RShell, document: vscode.TextDocument, positions: vscode.Position[]): Promise<SliceReturn> {

src/flowr/server-session.ts

@@ -27,6 +27,7 @@ export class FlowrServerSession implements FlowrSession {
 	public state:        'inactive' | 'connecting' | 'connected' | 'not connected'
 	public flowrVersion: string | undefined
 	public rVersion:     string | undefined
+	public working:	  	 boolean = false
 
 	private readonly outputChannel: vscode.OutputChannel
 	private connection:             Connection | undefined
@@ -122,6 +123,8 @@ export class FlowrServerSession implements FlowrSession {
 		}
 		this.onceOnLineReceived?.(message)
 		this.onceOnLineReceived = undefined
+		this.working = false
+		updateStatusBar()
 	}
 
 	private onceOnLineReceived: undefined | ((line: string) => void)
@@ -138,6 +141,8 @@ export class FlowrServerSession implements FlowrSession {
 	}
 
 	async sendCommandWithResponse<Target>(command: FlowrMessage): Promise<Target> {
+		this.working = true
+		updateStatusBar()
 		const response = this.awaitResponse()
 		this.sendCommand(command)
 		return JSON.parse(await response) as Target
@@ -174,6 +179,8 @@ export class FlowrServerSession implements FlowrSession {
 	async retrieveSlice(positions: vscode.Position[], document: vscode.TextDocument): Promise<SliceReturn> {
 		const criteria = makeSlicingCriteria(positions, document, isVerbose())
 
+
+
 		const response = await this.requestFileAnalysis(document)
 		// now we want to collect all ids from response in a map again (id -> location)
 		const idToLocation = new Map<NodeId, SourceRange>()