Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 2 additions & 12 deletions client/package-lock.json

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

9 changes: 7 additions & 2 deletions client/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "viper",
"displayName": "Viper",
"version": "5.2.0",
"version": "5.3.0",
"publisher": "viper-admin",
"description": "This extension provides interactive IDE features for verifying programs in Viper (Verification Infrastructure for Permission-based Reasoning).",
"license": "SEE LICENSE IN LICENSE.txt",
Expand Down Expand Up @@ -320,14 +320,19 @@
},
"viper.viperServer.customArguments": {
"type": "string",
"default": "--serverMode LSP --singleClient $backendSpecificCache$ --logLevel $logLevel$ --logFile $logFile$",
"default": "--serverMode LSP --singleClient $backendSpecificCache$ $beginnerMode$ --logLevel $logLevel$ --logFile $logFile$",
"description": "The command line arguments used for starting the Viper Server."
},
"viper.viperServer.backendSpecificCache": {
"type": "boolean",
"default": true,
"markdownDescription": "Use a separate cache for both backends, the option `$backendSpecificCache$` turns into `\"--backendSpecificCache\"` or `\"\"`, depending on this setting."
},
"viper.viperServer.beginnerMode": {
"type": "boolean",
"default": true,
"markdownDescription": "Disable some advanced features that can be confusing for beginners. The option `$beginnerMode$` turns into `\"--beginnerMode\"` or `\"\"`, depending on this setting."
},
"viper.viperServer.disableCaching": {
"type": "boolean",
"default": false,
Expand Down
2 changes: 1 addition & 1 deletion client/src/ExtensionState.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import { ProjectManager, ProjectRoot } from './ProjectManager';

export class State {
public static get MIN_SERVER_VERSION(): string {
return "3.0.0"; // has to be a valid semver
return "3.1.0"; // has to be a valid semver
}
public static serverVersion: string;

Expand Down
2 changes: 2 additions & 0 deletions client/src/Settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -942,8 +942,10 @@ export class Settings {

const configuredArgString = Settings.getConfiguration("viperServer").customArguments;
const useBackendSpecificCache = Settings.getConfiguration("viperServer").backendSpecificCache === true;
const beginnerMode = Settings.getConfiguration("viperServer").beginnerMode === true;
return configuredArgString
.replace("$backendSpecificCache$", useBackendSpecificCache ? "--backendSpecificCache" : "")
.replace("$beginnerMode$", beginnerMode ? "--beginnerMode" : "")
.replace("$logLevel$", convertLogLevel(logLevel))
// note that we use functions as 2nd argument since we do not want that
// the special replacement patterns kick in
Expand Down
2 changes: 2 additions & 0 deletions client/src/ViperProtocol.ts
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,8 @@ export interface ViperServerSettings {
customArguments: string;
//it set to false, cached errors are reused across backends
backendSpecificCache: boolean;
//if set to true, some advanced features are disabled that can be confusing for beginners
beginnerMode: boolean;
//disable the caching mechanism
disableCaching: boolean;
//After timeout ms the startup of the viperServer is expected to have failed and thus aborted
Expand Down
Loading