Skip to content

Commit

Permalink
Revert "feat: show Metals' release notes if server version was updated (
Browse files Browse the repository at this point in the history
scalameta#1009)"

This reverts commit 3ebbea7.
  • Loading branch information
tgodzik committed Jun 13, 2022
1 parent c83520b commit 6c66438
Show file tree
Hide file tree
Showing 8 changed files with 6 additions and 385 deletions.
5 changes: 1 addition & 4 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,7 @@ module.exports = {
{ ignoreRestArgs: true },
],
"no-unused-vars": "off",
"@typescript-eslint/no-unused-vars": [
"error",
{ varsIgnorePattern: "_" },
],
"@typescript-eslint/no-unused-vars": ["error"],
"@typescript-eslint/no-non-null-assertion": "error",
"guard-for-in": "error",
"no-var": "error",
Expand Down
8 changes: 0 additions & 8 deletions media/styles.css

This file was deleted.

16 changes: 1 addition & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -415,11 +415,6 @@
"category": "Metals",
"title": "Run doctor"
},
{
"command": "metals.show-release-notes",
"category": "Metals",
"title": "Show release notes"
},
{
"command": "metals.scalafix-run",
"category": "Metals",
Expand Down Expand Up @@ -665,10 +660,6 @@
"command": "metals.doctor-run",
"when": "metals:enabled"
},
{
"command": "metals.show-release-notes",
"when": "metals:enabled"
},
{
"command": "metals.scalafix-run",
"when": "metals:enabled"
Expand Down Expand Up @@ -908,11 +899,10 @@
"scripts": {
"vscode:prepublish": "yarn compile",
"compile": "tsc -p ./",
"clean": "rimraf out/",
"watch": "tsc -watch -p ./",
"test": "ts-mocha src/test/unit/*.test.ts",
"test-extension": "rimraf out/ && tsc -p ./ && node out/test/extension/runTest.js",
"build": "yarn clean && vsce package --yarn",
"build": "vsce package --yarn",
"vscode:publish": "vsce publish --yarn",
"ovsx:publish": "ovsx publish",
"lint": "eslint . --ext .ts --fix && yarn format",
Expand All @@ -923,8 +913,6 @@
"@types/glob": "^7.2.0",
"@types/mocha": "^9.1.1",
"@types/node": "17.0.27",
"@types/remarkable": "^2.0.3",
"@types/semver": "^7.3.9",
"@types/vscode": "1.59.0",
"@typescript-eslint/eslint-plugin": "^5.27.1",
"@typescript-eslint/parser": "^5.27.1",
Expand All @@ -946,8 +934,6 @@
"ansicolor": "^1.1.100",
"metals-languageclient": "0.5.15",
"promisify-child-process": "4.1.1",
"remarkable": "^2.0.1",
"semver": "^7.3.7",
"vscode-languageclient": "7.0.0"
},
"extensionPack": [
Expand Down
26 changes: 4 additions & 22 deletions src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ import * as workbenchCommands from "./workbenchCommands";
import { getServerVersion } from "./getServerVersion";
import { getCoursierMirrorPath } from "./mirrors";
import { DoctorProvider } from "./doctor";
import { showReleaseNotes } from "./releaseNotesProvider";

const outputChannel = window.createOutputChannel("Metals");
const openSettingsAction = "Open settings";
Expand Down Expand Up @@ -131,13 +130,7 @@ export async function activate(context: ExtensionContext): Promise<void> {
commands.executeCommand("setContext", "metals:enabled", true);
try {
const javaHome = await getJavaHome(getJavaHomeFromConfig());
await fetchAndLaunchMetals(context, javaHome, serverVersion);
await showReleaseNotes(
"onExtensionStart",
context,
serverVersion,
outputChannel
);
return fetchAndLaunchMetals(context, javaHome, serverVersion);
} catch (err) {
outputChannel.appendLine(`${err}`);
showMissingJavaMessage();
Expand Down Expand Up @@ -269,8 +262,7 @@ function fetchAndLaunchMetals(
context,
classpath,
serverProperties,
javaConfig,
serverVersion
javaConfig
);
},
(reason) => {
Expand Down Expand Up @@ -328,8 +320,7 @@ function launchMetals(
context: ExtensionContext,
metalsClasspath: string,
serverProperties: string[],
javaConfig: JavaConfig,
serverVersion: string
javaConfig: JavaConfig
) {
// Make editing Scala docstrings slightly nicer.
enableScaladocIndentation();
Expand Down Expand Up @@ -516,16 +507,7 @@ function launchMetals(
)
);

registerCommand(
"metals.show-release-notes",
async () =>
await showReleaseNotes(
"onUserDemand",
context,
serverVersion,
outputChannel
)
);
context.subscriptions.push(client.start());

return client.onReady().then(
() => {
Expand Down
254 changes: 0 additions & 254 deletions src/releaseNotesProvider.ts

This file was deleted.

Loading

0 comments on commit 6c66438

Please sign in to comment.