Skip to content

Commit c7f134d

Browse files
authored
[#381] use only system dependent line separator as seprator (#382)
* [#381] use only system dependent line separator as seprator ...for clangd options. And no spaces anymore, because they lead to trouble when file path used in options contains spaces. - fix invalid repo path in target as well fixes #381
1 parent 2f47abc commit c7f134d

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

bundles/org.eclipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/clangd/internal/config/ClangdPreferredOptions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public List<String> additionalOptions() {
7272
if (options.isBlank()) {
7373
return new ArrayList<>();
7474
}
75-
return Arrays.asList(options.split("\\s+")); //$NON-NLS-1$
75+
return Arrays.asList(options.split(System.lineSeparator()));
7676
}
7777

7878
private String stringValue(PreferenceMetadata<?> meta) {

bundles/org.eclipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/clangd/internal/ui/LspEditorUiMessages.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ LspEditorPreferencePage_pretty_print=Pretty-print JSON output
2121
LspEditorPreferencePage_drivers=Drivers
2222
LspEditorPreferencePage_drivers_description=Comma separated list of globs for white-listing gcc-compatible drivers that are safe to execute
2323
LspEditorPreferencePage_additional=Additional
24-
LspEditorPreferencePage_additional_description=Newline or space separated list of additional options for clangd
24+
LspEditorPreferencePage_additional_description=Newline separated list of additional options for clangd
2525
LspEditorPreferencePage_browse_button=Browse...
2626
LspEditorPreferencePage_clangd_options_label=clangd options
2727
LspEditorPreferencePage_enable_project_specific=Enable project-specific settings

releng/org.eclipse.cdt.lsp.target/org.eclipse.cdt.lsp.target.target

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<unit id="org.eclipse.license.feature.group" version="0.0.0" />
88
</location>
99
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
10-
<repository location="https://download.eclipse.org/eclipse/updates/4.34-I-builds/" />
10+
<repository location="https://download.eclipse.org/eclipse/updates/4.33/" />
1111
<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0" />
1212
<unit id="org.eclipse.jdt.annotation" version="0.0.0" />
1313
<unit id="org.eclipse.sdk.feature.group" version="0.0.0" />

0 commit comments

Comments
 (0)