Skip to content

Commit 442e077

Browse files
authored
fix(openedge_ls): update configuration #3623
* Changed Jar file name * New 'debug' attribute * Send 'init_options' object to language server
1 parent d3ad666 commit 442e077

3 files changed

Lines changed: 56 additions & 30 deletions

File tree

doc/configs.md

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7691,17 +7691,29 @@ Default config:
76917691

76927692
[Language server](https://github.com/vscode-abl/vscode-abl) for Progress OpenEdge ABL.
76937693

7694-
For manual installation, download abl-lsp.jar from the [VSCode
7695-
extension](https://github.com/vscode-abl/vscode-abl/releases/latest).
7694+
For manual installation, download abl-lsda.jar from the [VSCode extension](https://github.com/vscode-abl/vscode-abl/releases/latest).
76967695

76977696
Configuration
76987697

76997698
```lua
7700-
require('lspconfig').['openedge_ls'].setup {
7701-
oe_jar_path = '/path/to/abl-lsp.jar',
7702-
dlc = '12.2:/path/to/dlc-12.2', -- Version number and OpenEdge root directory (colon separator)
7699+
require('lspconfig').openedge_ls.setup {
7700+
oe_jar_path = '/path/to/abl-lsda.jar',
77037701
debug = false, -- Set to true for debug logging
7704-
trace = false -- Set to true for trace logging (REALLY verbose)
7702+
trace = false, -- Set to true for trace logging (REALLY verbose)
7703+
init_options = {
7704+
abl = {
7705+
configuration = {
7706+
runtimes = {
7707+
{ name = '12.8', path = '/opt/progress/dlc' }
7708+
},
7709+
maxThreads = 1
7710+
},
7711+
completion = {
7712+
upperCase = false
7713+
},
7714+
buildMode = 1 -- Build all
7715+
}
7716+
}
77057717
}
77067718
```
77077719

doc/configs.txt

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7128,17 +7128,29 @@ openedge_ls
71287128

71297129
[Language server](https://github.com/vscode-abl/vscode-abl) for Progress OpenEdge ABL.
71307130

7131-
For manual installation, download abl-lsp.jar from the [VSCode
7132-
extension](https://github.com/vscode-abl/vscode-abl/releases/latest).
7131+
For manual installation, download abl-lsda.jar from the [VSCode extension](https://github.com/vscode-abl/vscode-abl/releases/latest).
71337132

71347133
Configuration
71357134

71367135
```lua
7137-
require('lspconfig').['openedge_ls'].setup {
7138-
oe_jar_path = '/path/to/abl-lsp.jar',
7139-
dlc = '12.2:/path/to/dlc-12.2', -- Version number and OpenEdge root directory (colon separator)
7136+
require('lspconfig').openedge_ls.setup {
7137+
oe_jar_path = '/path/to/abl-lsda.jar',
71407138
debug = false, -- Set to true for debug logging
7141-
trace = false -- Set to true for trace logging (REALLY verbose)
7139+
trace = false, -- Set to true for trace logging (REALLY verbose)
7140+
init_options = {
7141+
abl = {
7142+
configuration = {
7143+
runtimes = {
7144+
{ name = '12.8', path = '/opt/progress/dlc' }
7145+
},
7146+
maxThreads = 1
7147+
},
7148+
completion = {
7149+
upperCase = false
7150+
},
7151+
buildMode = 1 -- Build all
7152+
}
7153+
}
71427154
}
71437155
```
71447156

lua/lspconfig/configs/openedge_ls.lua

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,11 @@ return {
88
if not config.cmd and config.oe_jar_path then
99
config.cmd = {
1010
'java',
11-
'--add-opens=java.base/java.lang=ALL-UNNAMED',
12-
'--add-opens=java.base/java.math=ALL-UNNAMED',
13-
'--add-opens=java.base/java.util=ALL-UNNAMED',
14-
'--add-opens=java.base/java.util.concurrent=ALL-UNNAMED',
15-
'--add-opens=java.base/java.net=ALL-UNNAMED',
16-
'--add-opens=java.base/java.text=ALL-UNNAMED',
1711
}
18-
if config.debug then
19-
config.cmd[#config.cmd + 1] = '-Dorg.slf4j.simpleLogger.defaultLogLevel=DEBUG'
20-
end
2112
config.cmd[#config.cmd + 1] = '-jar'
2213
config.cmd[#config.cmd + 1] = config.oe_jar_path
23-
if config.dlc then
24-
config.cmd[#config.cmd + 1] = '--dlc'
25-
config.cmd[#config.cmd + 1] = config.dlc
14+
if config.debug then
15+
config.cmd[#config.cmd + 1] = '--debug'
2616
end
2717
if config.trace then
2818
config.cmd[#config.cmd + 1] = '--trace'
@@ -34,17 +24,29 @@ return {
3424
description = [[
3525
[Language server](https://github.com/vscode-abl/vscode-abl) for Progress OpenEdge ABL.
3626
37-
For manual installation, download abl-lsp.jar from the [VSCode
38-
extension](https://github.com/vscode-abl/vscode-abl/releases/latest).
27+
For manual installation, download abl-lsda.jar from the [VSCode extension](https://github.com/vscode-abl/vscode-abl/releases/latest).
3928
4029
Configuration
4130
4231
```lua
43-
require('lspconfig').['openedge_ls'].setup {
44-
oe_jar_path = '/path/to/abl-lsp.jar',
45-
dlc = '12.2:/path/to/dlc-12.2', -- Version number and OpenEdge root directory (colon separator)
32+
require('lspconfig').openedge_ls.setup {
33+
oe_jar_path = '/path/to/abl-lsda.jar',
4634
debug = false, -- Set to true for debug logging
47-
trace = false -- Set to true for trace logging (REALLY verbose)
35+
trace = false, -- Set to true for trace logging (REALLY verbose)
36+
init_options = {
37+
abl = {
38+
configuration = {
39+
runtimes = {
40+
{ name = '12.8', path = '/opt/progress/dlc' }
41+
},
42+
maxThreads = 1
43+
},
44+
completion = {
45+
upperCase = false
46+
},
47+
buildMode = 1 -- Build all
48+
}
49+
}
4850
}
4951
```
5052
]],

0 commit comments

Comments
 (0)