Skip to content

Commit b6a40fe

Browse files
committed
Use dockerfile grammar from tm4e
It's regularly updated there and widely available so let's have less "conflicting" grammars.
1 parent f054d7e commit b6a40fe

File tree

5 files changed

+5
-201
lines changed

5 files changed

+5
-201
lines changed

containers/org.eclipse.linuxtools.docker.editor.ls/META-INF/MANIFEST.MF

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Require-Bundle: org.eclipse.lsp4e;bundle-version="0.11.0",
1313
org.eclipse.tm4e.registry;bundle-version="0.1.0",
1414
org.eclipse.tm4e.ui;bundle-version="0.1.0",
1515
org.eclipse.core.runtime;bundle-version="3.13.0",
16-
org.eclipse.wildwebdeveloper.embedder.node
16+
org.eclipse.wildwebdeveloper.embedder.node,
17+
org.eclipse.tm4e.language_pack;bundle-version="0.14.1"
1718
Eclipse-BundleShape: dir
1819
Automatic-Module-Name: org.eclipse.linuxtools.docker.editor.ls

containers/org.eclipse.linuxtools.docker.editor.ls/build.properties

-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@ output.. = target/classes/
33
bin.includes = META-INF/,\
44
.,\
55
plugin.xml,\
6-
grammars/,\
76
language-server/,\
87
icons/

containers/org.eclipse.linuxtools.docker.editor.ls/grammars/Dockerfile.tmLanguage

-160
This file was deleted.

containers/org.eclipse.linuxtools.docker.editor.ls/plugin.xml

+2-39
Original file line numberDiff line numberDiff line change
@@ -9,50 +9,13 @@
99
label="Dockerfile Language Server">
1010
</server>
1111
<contentTypeMapping
12-
contentType="org.eclipse.linuxtools.docker.editor.ls"
12+
contentType="org.eclipse.tm4e.language_pack.dockerfile"
1313
languageId="Dockerfile"
1414
id="org.eclipse.linuxtools.docker.editor.ls.server">
1515
</contentTypeMapping>
1616
</extension>
17-
<extension
18-
point="org.eclipse.ui.editors">
19-
<editorContentTypeBinding
20-
contentTypeId="org.eclipse.linuxtools.docker.editor.ls"
21-
editorId="org.eclipse.ui.genericeditor.GenericEditor">
22-
</editorContentTypeBinding>
23-
</extension>
24-
<extension
25-
point="org.eclipse.core.contenttype.contentTypes">
26-
<content-type
27-
base-type="org.eclipse.core.runtime.text"
28-
file-extensions="Dockerfile,Containerfile,dockerfile"
29-
file-names="Dockerfile,Containerfile"
30-
file-patterns="Dockerfile.*,Containerfile.*"
31-
id="org.eclipse.linuxtools.docker.editor.ls"
32-
name="Dockerfile"
33-
priority="normal">
34-
</content-type>
35-
</extension>
36-
<extension
37-
point="org.eclipse.tm4e.registry.grammars">
38-
<grammar
39-
path="grammars/Dockerfile.tmLanguage"
40-
scopeName="source.dockerfile">
41-
</grammar>
42-
<scopeNameContentTypeBinding
43-
contentTypeId="org.eclipse.linuxtools.docker.editor.ls"
44-
scopeName="source.dockerfile">
45-
</scopeNameContentTypeBinding>
46-
</extension>
47-
<extension
48-
point="org.eclipse.ui.genericeditor.presentationReconcilers">
49-
<presentationReconciler
50-
class="org.eclipse.tm4e.ui.text.TMPresentationReconciler"
51-
contentType="org.eclipse.linuxtools.docker.editor.ls">
52-
</presentationReconciler>
53-
</extension>
5417
<extension point="org.eclipse.ui.genericeditor.icons">
55-
<icon contentType="org.eclipse.linuxtools.docker.editor.ls" icon="icons/dockerfile.png" />
18+
<icon contentType="org.eclipse.tm4e.language_pack.dockerfile" icon="icons/dockerfile.png" />
5619
</extension>
5720

5821
</plugin>

releng/org.eclipse.linuxtools.target/linuxtools-latest.target

+1
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
<unit id="org.eclipse.zest.feature.group" version="0.0.0"/>
6161
<unit id="org.eclipse.lsp4e" version="0.0.0"/>
6262
<unit id="org.eclipse.tm4e.feature.feature.group" version="0.0.0"/>
63+
<unit id="org.eclipse.tm4e.language_pack.feature.feature.group" version="0.0.0"/>
6364
<repository location="https://download.eclipse.org/releases/latest/"/>
6465
</location>
6566
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">

0 commit comments

Comments
 (0)