Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: display flowr version when using a local shell #88

Merged
merged 2 commits into from
Jun 25, 2024
Merged

feat: display flowr version when using a local shell #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0c3bc7
feat: display flowr version when using a local shell
Ellpeck Jun 24, 2024
a1064f4
missing space
Ellpeck Jun 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
112 changes: 63 additions & 49 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@
"generate-changelog": "git log ...$(git tag | tail -n 1) --pretty=format:'- %s' --reverse"
},
"dependencies": {
"@eagleoutice/flowr": "^2.0.5"
"@eagleoutice/flowr": "^2.0.9"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we should denote such dep updates somewhere in the changelog / have specifc dep prs just for this so that it is easier to track the related flowr version.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

True! There's still the annoying changelog detection issue (#82), so until then, the changelog is kinda useless tbh :(

},
"devDependencies": {
"@types/mocha": "^10.0.6",
Expand Down
11 changes: 7 additions & 4 deletions src/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { Settings } from './settings'
import { registerSliceCommands } from './slice'
import { registerDiagramCommands } from './diagram'
import type { FlowrSession } from './flowr/utils'
import { flowrVersion } from '@eagleoutice/flowr/util/version'

export const MINIMUM_R_MAJOR = 3
export const BEST_R_MAJOR = 4
Expand Down Expand Up @@ -91,13 +92,15 @@ export function updateStatusBar() {
flowrStatus.show()
flowrStatus.text = `$(cloud) flowR server ${flowrSession.state}`
flowrStatus.tooltip =
flowrSession.state === 'connected'
? `R version ${flowrSession.rVersion}\nflowR version ${flowrSession.flowrVersion}`
: undefined
flowrSession.state === 'connected' ?
`R version ${flowrSession.rVersion}\nflowR version ${flowrSession.flowrVersion}` :
undefined
} else if(flowrSession instanceof FlowrInternalSession) {
flowrStatus.show()
flowrStatus.text = `$(console) flowR shell ${flowrSession.state}`
flowrStatus.tooltip = flowrSession.state === 'active' ? `R version ${flowrSession.rVersion}` : undefined
flowrStatus.tooltip = flowrSession.state === 'active' ?
`R version ${flowrSession.rVersion}\nflowR version ${flowrVersion().toString()}` :
undefined
} else {
flowrStatus.hide()
}
Expand Down
Loading