Skip to content

Commit 4d23f2b

Browse files
Update pde config file (#177)
Signed-off-by: Jinbo Wang <[email protected]>
1 parent 078ead7 commit 4d23f2b

File tree

7 files changed

+53
-21
lines changed

7 files changed

+53
-21
lines changed

javaConfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"projects": [
3-
"./jdtls.ext/"
3+
"./jdtls.ext/com.microsoft.jdtls.ext.core"
44
],
55
"targetPlatform": "./jdtls.ext/target.target"
66
}

jdtls.ext/com.microsoft.jdtls.ext.core/.classpath

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
44
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
55
<classpathentry kind="src" path="src/"/>
6+
<classpathentry exported="true" kind="lib" path="lib/commons-io-2.5.jar"/>
67
<classpathentry kind="output" path="target/classes"/>
78
</classpath>

jdtls.ext/com.microsoft.jdtls.ext.core/.settings/org.eclipse.jdt.core.prefs

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,28 +109,32 @@ org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
109109
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
110110
org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false
111111
org.eclipse.jdt.core.formatter.align_with_spaces=false
112+
org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
112113
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
113114
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
114115
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
115116
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
116117
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
117118
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
118119
org.eclipse.jdt.core.formatter.alignment_for_assignment=0
119-
org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
120+
org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16
120121
org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
121122
org.eclipse.jdt.core.formatter.alignment_for_compact_loops=16
122123
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
123124
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
124125
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
125126
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
127+
org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
126128
org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
127129
org.eclipse.jdt.core.formatter.alignment_for_module_statements=16
128130
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
131+
org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
129132
org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
130133
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
131134
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
132135
org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
133136
org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
137+
org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16
134138
org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
135139
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
136140
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
@@ -222,11 +226,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
222226
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
223227
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
224228
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
229+
org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert
225230
org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
226231
org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
227232
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
228233
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
229-
org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
234+
org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
230235
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=do not insert
231236
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
232237
org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
@@ -257,6 +262,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
257262
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
258263
org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
259264
org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
265+
org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert
266+
org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert
260267
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
261268
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
262269
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
@@ -281,13 +288,17 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
281288
org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
282289
org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
283290
org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
291+
org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert
284292
org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
285293
org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
294+
org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert
295+
org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
286296
org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
297+
org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert
287298
org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
288299
org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
289300
org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
290-
org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
301+
org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
291302
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
292303
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
293304
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
@@ -335,6 +346,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do no
335346
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
336347
org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
337348
org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
349+
org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert
350+
org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert
338351
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
339352
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
340353
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
@@ -371,9 +384,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser
371384
org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
372385
org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
373386
org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
387+
org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert
374388
org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
375389
org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
376390
org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
391+
org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert
392+
org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert
377393
org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
378394
org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
379395
org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
@@ -412,9 +428,13 @@ org.eclipse.jdt.core.formatter.tabulation.char=space
412428
org.eclipse.jdt.core.formatter.tabulation.size=4
413429
org.eclipse.jdt.core.formatter.use_on_off_tags=false
414430
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=true
431+
org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
415432
org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
416-
org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
433+
org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
417434
org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
435+
org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
436+
org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true
418437
org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
438+
org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
419439
org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
420440
org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter

jdtls.ext/com.microsoft.jdtls.ext.core/META-INF/MANIFEST.MF

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ Import-Package: org.eclipse.jdt.core,
1212
Require-Bundle: org.eclipse.core.runtime,
1313
org.eclipse.jdt.ls.core,
1414
org.eclipse.jdt.core,
15-
org.eclipse.core.resources;bundle-version="3.12.0",
15+
org.eclipse.core.resources,
1616
org.eclipse.lsp4j.jsonrpc,
1717
org.eclipse.lsp4j,
18-
org.apache.commons.lang3;bundle-version="3.1.0",
19-
com.google.gson;bundle-version="2.7.0"
18+
org.apache.commons.lang3,
19+
com.google.gson
2020
Bundle-ClassPath: .,
2121
lib/commons-io-2.5.jar

jdtls.ext/javaConfig.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

jdtls.ext/pom.xml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@
8181
</build>
8282
<repositories>
8383
<repository>
84-
<id>photon</id>
85-
<layout>p2</layout>
86-
<url>http://download.eclipse.org/releases/photon</url>
84+
<id>201906</id>
85+
<layout>p2</layout>
86+
<url>http://download.eclipse.org/releases/2019-06/</url>
8787
</repository>
8888
<repository>
8989
<id>oss.sonatype.org</id>
@@ -105,7 +105,12 @@
105105
<repository>
106106
<id>JBOLL.TOOLS</id>
107107
<layout>p2</layout>
108-
<url>http://download.jboss.org/jbosstools/updates/m2e-extensions/m2e-apt/1.5.0-2018-05-16_00-46-30-H11</url>
108+
<url>http://download.jboss.org/jbosstools/updates/m2e-extensions/m2e-apt/1.5.2-2018-12-24_15-46-05-H18/</url>
109+
</repository>
110+
<repository>
111+
<id>orbit</id>
112+
<layout>p2</layout>
113+
<url>http://download.eclipse.org/tools/orbit/R-builds/R20170516192513/repository/</url>
109114
</repository>
110115
</repositories>
111116
</project>

jdtls.ext/target.target

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,14 @@
55
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
66
<unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
77
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
8-
<repository location="http://download.eclipse.org/releases/2018-12/"/>
8+
<unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
9+
<unit id="org.eclipse.equinox.core.sdk.feature.group" version="0.0.0"/>
10+
<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
11+
<unit id="org.eclipse.equinox.p2.core.feature.source.feature.group" version="0.0.0"/>
12+
<unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
13+
<unit id="org.eclipse.jdt.source.feature.group" version="0.0.0"/>
14+
<unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
15+
<repository location="http://download.eclipse.org/releases/2019-06/"/>
916
</location>
1017
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
1118
<unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
@@ -16,11 +23,16 @@
1623
<repository location="http://download.eclipse.org/jdtls/snapshots/repository/latest/"/>
1724
</location>
1825
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
19-
<unit id="org.jboss.tools.maven.apt.feature.feature.group" version="1.5.0.201805160042"/>
20-
<repository location="http://download.jboss.org/jbosstools/updates/m2e-extensions/m2e-apt/1.5.0-2018-05-16_00-46-30-H11"/>
26+
<unit id="org.jboss.tools.maven.apt.core" version="0.0.0"/>
27+
<repository location="http://download.jboss.org/jbosstools/updates/m2e-extensions/m2e-apt/1.5.2-2018-12-24_15-46-05-H18/"/>
2128
</location>
2229
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
30+
<unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
31+
<unit id="com.google.gson.source" version="2.7.0.v20170129-0911"/>
2332
<unit id="com.ibm.icu.base" version="58.2.0.v20170418-1837"/>
33+
<unit id="org.apache.commons.io" version="2.2.0.v201405211200"/>
34+
<unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/>
35+
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
2436
<repository location="http://download.eclipse.org/tools/orbit/R-builds/R20170516192513/repository"/>
2537
</location>
2638
</locations>

0 commit comments

Comments
 (0)