Skip to content

Commit

Permalink
Merge pull request #2364 from ckipp01/atom
Browse files Browse the repository at this point in the history
  • Loading branch information
ckipp01 committed Jan 4, 2021
2 parents e729533 + b5fb327 commit 9350c17
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 98 deletions.
2 changes: 0 additions & 2 deletions README.md
Expand Up @@ -47,8 +47,6 @@ case classes remain.
- [IntelliJ IDEA](https://www.jetbrains.com/help/idea/discover-intellij-idea-for-scala.html):
the most widely used IDE for Scala using a re-implementation of the Scala
typechecker.
- [Scala IDE](http://scala-ide.org/): Eclipse-based IDE using the Scala
Presentation Compiler.

## Why Metals?

Expand Down
2 changes: 1 addition & 1 deletion bin/merged_prs.sc
Expand Up @@ -144,7 +144,7 @@ def template(
|For full details: https://github.com/scalameta/metals/milestone/<num>?closed=1
|
|Metals is a language server for Scala that works with VS Code, Vim, Emacs,
|Sublime Text, Atom and Eclipse. Metals is developed at the
|Sublime Text and Eclipse. Metals is developed at the
|[Scala Center](https://scala.epfl.ch/) and [VirtusLab](https://virtuslab.com)
|with the help from [Lunatech](https://lunatech.com) along with contributors from
|the community.
Expand Down
54 changes: 0 additions & 54 deletions docs/editors/atom.md

This file was deleted.

25 changes: 0 additions & 25 deletions docs/editors/overview.md
Expand Up @@ -24,7 +24,6 @@ functionality.
<tr>
<td />
<td align="center">Visual Studio Code</td>
<td align="center">Atom</td>
<td align="center">Vim</td>
<td align="center">Sublime Text 3</td>
<td align="center">Emacs</td>
Expand All @@ -37,7 +36,6 @@ functionality.
<td align="center">Single click</td>
<td align="center">Single click</td>
<td align="center">Single click</td>
<td align="center">Single click</td>
<td align="center">Few steps</td>
<td align="center">Few steps</td>
</tr>
Expand All @@ -47,7 +45,6 @@ functionality.
<td align="center">✅</td>
<td align="center">✅</td>
<td align="center">✅</td>
<td align="center">✅</td>
<td align="center">Requires browser</td>
</tr>
<tr>
Expand All @@ -57,7 +54,6 @@ functionality.
<td align="center">✅</td>
<td align="center">✅</td>
<td align="center">✅</td>
<td align="center">✅</td>
</tr>
<tr>
<td>Goto definition</td>
Expand All @@ -66,13 +62,11 @@ functionality.
<td align="center">✅</td>
<td align="center">✅</td>
<td align="center">✅</td>
<td align="center">✅</td>
</tr>
<tr>
<td>Completions</td>
<td align="center">✅</td>
<td align="center">✅*</td>
<td align="center">✅*</td>
<td align="center">✅</td>
<td align="center">✅</td>
<td align="center">✅</td>
Expand All @@ -84,12 +78,10 @@ functionality.
<td align="center">✅</td>
<td align="center">✅</td>
<td align="center">✅</td>
<td align="center">✅</td>
</tr>
<tr>
<td>Parameter hints</td>
<td align="center">✅</td>
<td align="center"></td>
<td align="center">✅</td>
<td align="center">✅</td>
<td align="center">✅</td>
Expand All @@ -102,14 +94,12 @@ functionality.
<td align="center">✅</td>
<td align="center">✅</td>
<td align="center">✅</td>
<td align="center">✅</td>
</tr>
<tr>
<td>Run/Debug</td>
<td align="center">✅</td>
<td align="center"></td>
<td align="center"></td>
<td align="center"></td>
<td align="center">✅</td>
<td align="center"></td>
</tr>
Expand All @@ -120,7 +110,6 @@ functionality.
<td align="center">✅</td>
<td align="center">✅</td>
<td align="center">✅</td>
<td align="center">✅</td>
</tr>
<tr>
<td>Rename symbol</td>
Expand All @@ -129,7 +118,6 @@ functionality.
<td align="center">✅</td>
<td align="center">✅</td>
<td align="center">✅</td>
<td align="center">✅</td>
</tr>
<tr>
<td>Code actions</td>
Expand All @@ -138,13 +126,11 @@ functionality.
<td align="center">✅</td>
<td align="center">✅</td>
<td align="center">✅</td>
<td align="center">✅</td>
</tr>
</tr>
<tr>
<td>Worksheets</td>
<td align="center">✅</td>
<td align="center">Comments</td>
<td align="center">✅</td>
<td align="center">Comments</td>
<td align="center">Comments</td>
Expand All @@ -153,7 +139,6 @@ functionality.
<tr>
<td>Document symbols</td>
<td align="center">✅</td>
<td align="center">✅</td>
<td align="center">Flat</td>
<td align="center">Flat</td>
<td align="center">✅</td>
Expand All @@ -162,7 +147,6 @@ functionality.
<tr>
<td>Workspace symbols</td>
<td align="center">✅</td>
<td align="center"></td>
<td align="center">✅</td>
<td align="center">✅</td>
<td align="center">✅</td>
Expand All @@ -174,13 +158,11 @@ functionality.
<td align="center">✅</td>
<td align="center">✅</td>
<td align="center">✅</td>
<td align="center">✅</td>
<td align="center">✅*</td>
</tr>
<tr>
<td>Folding</td>
<td align="center">✅</td>
<td align="center"> </td>
<td align="center">✅</td>
<td align="center"> </td>
<td align="center">✅</td>
Expand All @@ -193,12 +175,10 @@ functionality.
<td align="center">✅</td>
<td align="center">✅</td>
<td align="center">✅</td>
<td align="center">✅</td>
</tr>
<tr>
<td>Metals Extensions</td>
<td align="center">✅</td>
<td align="center">Status bar</td>
<td align="center">✅</td>
<td align="center">Status bar, Input box</td>
<td align="center">Status bar</td>
Expand All @@ -207,7 +187,6 @@ functionality.
<tr>
<td>Organize imports</td>
<td align="center">✅</td>
<td align="center"></td>
<td align="center">✅</td>
<td align="center"></td>
<td align="center">✅</td>
Expand All @@ -218,7 +197,6 @@ functionality.
<td align="center">✅</td>
<td align="center">Shown in hover</td>
<td align="center">Shown in hover</td>
<td align="center">Shown in hover</td>
<td align="center">✅</td>
<td align="center">Shown in hover</td>
</tr>
Expand Down Expand Up @@ -279,9 +257,6 @@ buffer.

## Completions

**✅ Atom**: no auto-import and string interpolator completions produce invalid
code.

**✅ Vim**: auto-import and snippets require
[coc.nvim](https://github.com/neoclide/coc.nvim) client.

Expand Down
7 changes: 2 additions & 5 deletions docs/integrations/new-editor.md
Expand Up @@ -118,7 +118,7 @@ The currently available settings for `InitializationOptions` are listed below.
"doctorProvider": "json" | "html",
"executeClientCommandProvider": boolean,
"globSyntax": "vscode" | "uri"
"icons": "octicons" | "vscode" | "unicode" | "atom",
"icons": "octicons" | "vscode" | "unicode",
"inlineDecorationProvider": boolean,
"inputBoxProvider": boolean,
"isExitOnShutdown" : boolean,
Expand Down Expand Up @@ -219,7 +219,7 @@ multiline textEdits such as the "implement all methods" completion.
Possible values:

- `on`: (default): the client automatically adds in the indentation. This is the
case for VS Code, Atom, Sublime, and coc.nvim.
case for VS Code, Sublime, and coc.nvim.
- `off`: the client does not add any indentation when receiving a multi-line
textEdit

Expand Down Expand Up @@ -295,9 +295,6 @@ Possible values:
- `vscode`: use [Octicons](https://octicons.github.com) such as `$(rocket)` for
status bar messages, as supported by th
[VS Code status bar](https://code.visualstudio.com/docs/extensionAPI/vscode-api#StatusBarItem).
- `atom`: use HTML-formatted [Octicons](https://octicons.github.com) such as
`<span class='icon icon-rocket'></span>` for status bar messages, as supported
by the Atom status bar.
- `unicode`: use unicode emojis like 🚀 for status bar messages.

##### `inputBoxProvider`
Expand Down
6 changes: 0 additions & 6 deletions metals-docs/src/main/scala/docs/Image.scala
Expand Up @@ -8,12 +8,6 @@ object Image {
"importCommand" -> "https://i.imgur.com/QHLKt8u.png",
"runDoctor" -> "https://i.imgur.com/K02g0UM.png"
),
"atom" -> Map(
"importBuild" -> "https://i.imgur.com/WxfhMFz.png",
"importChanges" -> "https://i.imgur.com/xDb9oJU.png",
"importCommand" -> "https://i.imgur.com/EGVO5Yb.png",
"runDoctor" -> "https://i.imgur.com/8ODqcUj.png"
),
"vim" -> Map(
"importBuild" -> "https://i.imgur.com/1EyQPTC.png",
"importChanges" -> "https://i.imgur.com/iocTVb6.png"
Expand Down
1 change: 0 additions & 1 deletion website/core/Footer.js
Expand Up @@ -41,7 +41,6 @@ class Footer extends React.Component {
<div>
<h5>Editors</h5>
<a href={`${docsUrl}editors/vscode.html`}>Visual Studio Code</a>
<a href={`${docsUrl}editors/atom.html`}>Atom</a>
<a href={`${docsUrl}editors/vim.html`}>Vim</a>
<a href={`${docsUrl}editors/sublime.html`}>Sublime Text</a>
<a href={`${docsUrl}editors/emacs.html`}>Emacs</a>
Expand Down
14 changes: 11 additions & 3 deletions website/i18n/en.json
Expand Up @@ -48,9 +48,6 @@
"contributors/updating-website": {
"title": "Contributing to the website"
},
"editors/atom": {
"title": "Atom"
},
"editors/debug-adapter-protocol": {
"title": "Debug Adapter Protocol",
"sidebar_label": "Debug Adapter Protocol"
Expand Down Expand Up @@ -104,6 +101,17 @@
"integrations/tree-view-protocol": {
"title": "Tree View Protocol"
},
"lsp-extensions/debug-adapter-protocol": {
"title": "Debug Adapter Protocol",
"sidebar_label": "Debug Adapter Protocol"
},
"lsp-extensions/decoration-protocol": {
"title": "Decoration Protocol v0.2.0",
"sidebar_label": "Decoration Protocol"
},
"lsp-extensions/tree-view-protocol": {
"title": "Tree View Protocol"
},
"troubleshooting/faq": {
"title": "Frequently asked questions"
},
Expand Down
1 change: 0 additions & 1 deletion website/sidebars.json
Expand Up @@ -3,7 +3,6 @@
"Text Editors": [
"editors/overview",
"editors/vscode",
"editors/atom",
"editors/vim",
"editors/sublime",
"editors/emacs",
Expand Down

0 comments on commit 9350c17

Please sign in to comment.