Commitd8e1d7a

authored

Work with the newest rescript package (#106)

Need to find the new package's name for the formatter.Fixes#104

1 parentaa1712b commitd8e1d7aCopy full SHA for d8e1d7a

File tree

+13

-4

lines changed

+13

-4

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,12 @@ export let bscExePartialPath = path.join(`
`9`	`9`	`process.platform,`
`10`	`10`	`"bsc.exe"`
`11`	`11`	`);`
	`12`	`+exportletbscExeReScriptPartialPath=path.join(`
	`13`	`+"node_modules",`
	`14`	`+"rescript",`
	`15`	`+process.platform,`
	`16`	`+"bsc.exe"`
	`17`	`+);`
`12`	`18`
`13`	`19`	`// can't use the native bsb since we might need the watcher -w flag, which is only in the js wrapper`
`14`	`20`	`// export let bsbPartialPath = path.join('node_modules', 'bs-platform', process.platform, 'bsb.exe');`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -428,7 +428,7 @@ function onMessage(msg: m.Message) {`
`428`	`428`	`if(bscExeDir===null){`
`429`	`429`	`letparams:p.ShowMessageParams={`
`430`	`430`	`type:p.MessageType.Error,`
`431`		-message:`Cannot find a nearby${c.bscExePartialPath}. It's needed for formatting.`,
	`431`	+message:`Cannot find a nearbybsc.exe in bs-platform or rescript. It's needed for formatting.`,
`432`	`432`	`};`
`433`	`433`	`letresponse:m.NotificationMessage={`
`434`	`434`	`jsonrpc:c.jsonrpcVersion,`
`@@ -438,7 +438,9 @@ function onMessage(msg: m.Message) {`
`438`	`438`	`send(fakeSuccessResponse);`
`439`	`439`	`send(response);`
`440`	`440`	`}else{`
`441`		`-letresolvedBscExePath=path.join(bscExeDir,c.bscExePartialPath);`
	`441`	`+letbscExePath1=path.join(bscExeDir,c.bscExeReScriptPartialPath);`
	`442`	`+letbscExePath2=path.join(bscExeDir,c.bscExePartialPath);`
	`443`	`+letresolvedBscExePath=fs.existsSync(bscExePath1) ?bscExePath1 :bscExePath2;`
`442`	`444`	`// code will always be defined here, even though technically it can be undefined`
`443`	`445`	`letcode=getOpenedFileContent(params.textDocument.uri);`
`444`	`446`	`letformattedResult=utils.formatUsingValidBscExePath(`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,9 @@ export let findBscExeDirOfFile = (`
`47`	`47`	`source:p.DocumentUri`
`48`	`48`	`):null\|p.DocumentUri=>{`
`49`	`49`	`letdir=path.dirname(source);`
`50`		`-letbscPath=path.join(dir,c.bscExePartialPath);`
`51`		`-if(fs.existsSync(bscPath)){`
	`50`	`+letbscExePath1=path.join(dir,c.bscExeReScriptPartialPath);`
	`51`	`+letbscExePath2=path.join(dir,c.bscExePartialPath);`
	`52`	`+if(fs.existsSync(bscExePath1)\|\|fs.existsSync(bscExePath2)){`
`52`	`53`	`returndir;`
`53`	`54`	`}else{`
`54`	`55`	`if(dir===source){`

Comments

(0)