-
-
Notifications
You must be signed in to change notification settings - Fork 222
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #285 from BetterThanTomorrow/wip/custom-repl-conne…
…ct-sequence Bringing Custom repl connect sequences home to dev!
- Loading branch information
Showing
9 changed files
with
1,193 additions
and
647 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,229 @@ | ||
| import * as vscode from "vscode"; | ||
| import * as state from "../state"; | ||
| import * as projectTypes from './project-types'; | ||
| import * as utilities from '../utilities'; | ||
|
|
||
| enum ProjectTypes { | ||
| "Leiningen" = "Leiningen", | ||
| "Clojure CLI" = "Clojure CLI", | ||
| "shadow-cljs" = "shadow-cljs" | ||
| } | ||
|
|
||
| enum CljsTypes { | ||
| "Figwheel Main" = "Figwheel Main", | ||
| "lein-figwheel" = "lein-figwheel", | ||
| "shadow-cljs" = "shadow-cljs", | ||
| "Nashorn" = "Nashorn", | ||
| "User provided" = "User provided" | ||
| } | ||
|
|
||
| interface CljsTypeConfig { | ||
| name: string, | ||
| dependsOn?: CljsTypes, | ||
| isStarted: boolean, | ||
| startCode?: string, | ||
| buildsRequired?: boolean, | ||
| isReadyToStartRegExp?: string | RegExp, | ||
| openUrlRegExp?: string | RegExp, | ||
| shouldOpenUrl?: boolean, | ||
| connectCode: string | Object, | ||
| isConnectedRegExp?: string | RegExp, | ||
| printThisLineRegExp?: string | RegExp | ||
| } | ||
|
|
||
| interface MenuSelecions { | ||
| leinProfiles?: string[], | ||
| leinAlias?: string, | ||
| cljAliases?: string[], | ||
| cljsLaunchBuilds?: string[], | ||
| cljsDefaultBuild?: string | ||
| } | ||
|
|
||
| interface ReplConnectSequence { | ||
| name: string, | ||
| projectType: ProjectTypes, | ||
| afterCLJReplJackInCode?: string, | ||
| cljsType?: CljsTypes | CljsTypeConfig, | ||
| menuSelections?: MenuSelecions, | ||
| } | ||
|
|
||
| const leiningenDefaults: ReplConnectSequence[] = | ||
| [{ | ||
| name: "Leiningen", | ||
| projectType: ProjectTypes.Leiningen | ||
| }, | ||
| { | ||
| name: "Leiningen + Figwheel", | ||
| projectType: ProjectTypes.Leiningen, | ||
| cljsType: CljsTypes["lein-figwheel"] | ||
| }, | ||
| { | ||
| name: "Leiningen + Figwheel Main", | ||
| projectType: ProjectTypes.Leiningen, | ||
| cljsType: CljsTypes["Figwheel Main"] | ||
| }, | ||
| { | ||
| name: "Leiningen + Nashorn", | ||
| projectType: ProjectTypes.Leiningen, | ||
| cljsType: CljsTypes["Nashorn"] | ||
| }]; | ||
|
|
||
| const cljDefaults: ReplConnectSequence[] = | ||
| [{ | ||
| name: "Clojure CLI", | ||
| projectType: ProjectTypes["Clojure CLI"] | ||
| }, | ||
| { | ||
| name: "Clojure CLI + Figwheel", | ||
| projectType: ProjectTypes["Clojure CLI"], | ||
| cljsType: CljsTypes["lein-figwheel"] | ||
| }, | ||
| { | ||
| name: "Clojure CLI + Figwheel Main", | ||
| projectType: ProjectTypes["Clojure CLI"], | ||
| cljsType: CljsTypes["Figwheel Main"] | ||
| }, | ||
| { | ||
| name: "Clojure CLI + Nashorn", | ||
| projectType: ProjectTypes["Clojure CLI"], | ||
| cljsType: CljsTypes["Nashorn"] | ||
| }]; | ||
|
|
||
| const shadowCljsDefaults: ReplConnectSequence[] = [{ | ||
| name: "shadow-cljs", | ||
| projectType: ProjectTypes["shadow-cljs"], | ||
| cljsType: CljsTypes["shadow-cljs"] | ||
| }] | ||
|
|
||
| const defaultSequences = { | ||
| "lein": leiningenDefaults, | ||
| "clj": cljDefaults, | ||
| "shadow-cljs": shadowCljsDefaults | ||
| }; | ||
|
|
||
| const defaultCljsTypes: { [id: string]: CljsTypeConfig } = { | ||
| "Figwheel Main": { | ||
| name: "Figwheel Main", | ||
| buildsRequired: true, | ||
| isStarted: false, | ||
| startCode: `(do (require 'figwheel.main.api) (figwheel.main.api/start %BUILDS%))`, | ||
| isReadyToStartRegExp: /Prompt will show|Open(ing)? URL|already running/, | ||
| openUrlRegExp: /(Starting Server at|Open(ing)? URL) (?<url>\S+)/, | ||
| shouldOpenUrl: false, | ||
| connectCode: `(do (use 'figwheel.main.api) (figwheel.main.api/cljs-repl %BUILD%))`, | ||
| isConnectedRegExp: /To quit, type: :cljs\/quit/ | ||
| }, | ||
| "lein-figwheel": { | ||
| name: "lein-figwheel", | ||
| buildsRequired: false, | ||
| isStarted: false, | ||
| isReadyToStartRegExp: /Launching ClojureScript REPL for build/, | ||
| openUrlRegExp: /Figwheel: Starting server at (?<url>\S+)/, | ||
| // shouldOpenUrl: will be set at use-time of this config, | ||
| connectCode: "(do (use 'figwheel-sidecar.repl-api) (if (not (figwheel-sidecar.repl-api/figwheel-running?)) (figwheel-sidecar.repl-api/start-figwheel!)) (figwheel-sidecar.repl-api/cljs-repl))", | ||
| isConnectedRegExp: /To quit, type: :cljs\/quit/ | ||
| }, | ||
| "shadow-cljs": { | ||
| name: "shadow-cljs", | ||
| buildsRequired: true, | ||
| isStarted: true, | ||
| // isReadyToStartRegExp: /To quit, type: :cljs\/quit/, | ||
| connectCode: { | ||
| build: `(shadow.cljs.devtools.api/nrepl-select %BUILD%)`, | ||
| repl: `(shadow.cljs.devtools.api/%REPL%)` | ||
| }, | ||
| shouldOpenUrl: false, | ||
| isConnectedRegExp: /:selected/ | ||
| }, | ||
| "Nashorn": { | ||
| name: "Nashorn", | ||
| buildsRequired: false, | ||
| isStarted: true, | ||
| connectCode: "(do (require 'cljs.repl.nashorn) (cider.piggieback/cljs-repl (cljs.repl.nashorn/repl-env)))", | ||
| isConnectedRegExp: "To quit, type: :cljs/quit" | ||
| } | ||
| }; | ||
|
|
||
| /** Retrieve the replConnectSequences from the config */ | ||
| function getCustomConnectSequences(): ReplConnectSequence[] { | ||
| let sequences: ReplConnectSequence[] = state.config().replConnectSequences; | ||
|
|
||
| for (let sequence of sequences) { | ||
| if (sequence.name == undefined || | ||
| sequence.projectType == undefined) { | ||
|
|
||
| vscode.window.showWarningMessage("Check your calva.replConnectSequences. " + | ||
| "You need to supply name and projectType for every sequence. " + | ||
| "After fixing the customSequences can be used."); | ||
|
|
||
| return []; | ||
| } | ||
| } | ||
|
|
||
| return sequences; | ||
| } | ||
|
|
||
| /** | ||
| * Retrieve the replConnectSequences and returns only that if only one was defined. | ||
| * Otherwise the user defined will be combined with the defaults one to be returned. | ||
| * @param projectType what default Sequences would be used (leiningen, clj, shadow-cljs) | ||
| */ | ||
| function getConnectSequences(projectTypes: string[]): ReplConnectSequence[] { | ||
| let customSequences = getCustomConnectSequences(); | ||
|
|
||
| if (customSequences.length) { | ||
| return customSequences; | ||
| } else { | ||
| let result = []; | ||
| for (let pType of projectTypes) { | ||
| result = result.concat(defaultSequences[pType]); | ||
| } | ||
| return result; | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Returns the CLJS-Type description of one of the build-in. | ||
| * @param cljsType Build-in cljsType | ||
| */ | ||
| function getDefaultCljsType(cljsType: string): CljsTypeConfig { | ||
| // TODO: Find a less hacky way to get dynamic config for lein-figwheel | ||
| defaultCljsTypes["lein-figwheel"].shouldOpenUrl = state.config().openBrowserWhenFigwheelStarted; | ||
| return defaultCljsTypes[cljsType]; | ||
| } | ||
|
|
||
| async function askForConnectSequence(cljTypes: string[], saveAs: string, logLabel: string): Promise<ReplConnectSequence> { | ||
| // figure out what possible kinds of project we're in | ||
| if (cljTypes.length == 0) { | ||
| vscode.window.showErrorMessage("Cannot find project, no project.clj, deps.edn or shadow-cljs.edn."); | ||
| state.analytics().logEvent("REPL", logLabel, "FailedFindingProjectType").send(); | ||
| return; | ||
| } | ||
|
|
||
| const sequences = getConnectSequences(cljTypes); | ||
| if (sequences.length > 1) { | ||
| const projectConnectSequenceName = await utilities.quickPickSingle({ | ||
| values: sequences.map(s => { return s.name }), | ||
| placeHolder: "Please select a project type", | ||
| saveAs: `${state.getProjectRoot()}/${saveAs}`, | ||
| autoSelect: true | ||
| }); | ||
| if (!projectConnectSequenceName) { | ||
| state.analytics().logEvent("REPL", logLabel, "NoProjectTypePicked").send(); | ||
| return; | ||
| } | ||
|
|
||
| return sequences.find(seq => seq.name === projectConnectSequenceName); | ||
| } else { | ||
| return sequences[0]; | ||
| } | ||
| } | ||
|
|
||
| export { | ||
| askForConnectSequence, | ||
| getConnectSequences, | ||
| getDefaultCljsType, | ||
| CljsTypes, | ||
| ReplConnectSequence, | ||
| CljsTypeConfig | ||
| } |
Oops, something went wrong.