Upgraded dependencies

Author: vknabel

CHANGELOG.md

@@ -2,7 +2,12 @@
 
 ## Unreleased
 
+-
+
+## 2.12.0
+
 - Better and more helpful error messages on first start
+- Upgraded dependencies
 
 ## 2.11.2
 

README.md

@@ -63,14 +63,14 @@ Though in most cases sourcekit-lsp and sourcekite should produce better results
 ## Configuration
 
 | Config                             | Type       | Default                           | Description                                                                                                                                                                |
-| ---------------------------------- | ---------- | --------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| ---------------------------------- | ---------- | --------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------- |
 | `sourcekit-lsp.serverPath`         | `string`   |                                   | The path of the sourcekit-lsp executable. In SDE: defaults to the toolchain's sourcekit-lsp.                                                                               |
-| `sourcekit-lsp.toolchainPath`      | `string`   |                                   | The path of the swift toolchain. In SDE: defaults to Xcode's default toolchain.                                                                                           |
+| `sourcekit-lsp.toolchainPath`      | `string`   |                                   | The path of the swift toolchain. In SDE: defaults to Xcode's default toolchain.                                                                                            |
 | `swift.languageServerPath`         | `string`   | `/usr/local/bin/langserver-swift` | [DEPRECATED] The fully qualified path to the Swift Language Server executable.                                                                                             |
 | `swift.path.sourcekite`            | `string`   |                                   | The fully path to the sourcekite(SDE's LS backend).                                                                                                                        |
 | `swift.path.swift_driver_bin`      | `string`   | `/usr/bin/swift`                  | The fully path to the swift driver binary.                                                                                                                                 |
 | `swift.path.shell`                 | `string`   | `/bin/sh`                         | The fully path to the shell binary.                                                                                                                                        |
-| `sde.sourcekit.compilerOptions`    | `string[]` | `[]`                              | Optional compiler options like the target or search paths. Will only be used as default. `(debug|release).yaml` builds will override these settings.                       |
+| `sde.sourcekit.compilerOptions`    | `string[]` | `[]`                              | Optional compiler options like the target or search paths. Will only be used as default. `(debug                                                                           | release).yaml` builds will override these settings. |
 | `swift.targets`                    | `object[]` | `[]`                              | If SDE cannot reliably detect all targets, you can manually configure them.                                                                                                |
 | `sde.enable`                       | `boolean`  | `true`                            | Enable SDE functionality                                                                                                                                                   |
 | `sde.languageServerMode`           | `string`   | `sourcekite`                      | Decides which language server should be used. `sourcekite` is the default LSP for SDE, `sourcekit-lsp` is Apple's official one and `langserver` is RLovelett's Langserver. |

package.json

@@ -8,7 +8,7 @@
     "url": "https://github.com/vknabel"
   },
   "license": "Apache-2.0",
-  "version": "2.11.2",
+  "version": "2.12.0",
   "publisher": "vknabel",
   "icon": "icons/icon.png",
   "galleryBanner": {
@@ -20,7 +20,7 @@
     "url": "https://github.com/vknabel/vscode-swift-development-environment"
   },
   "engines": {
-    "vscode": "^1.30.0"
+    "vscode": "^1.54.0"
   },
   "categories": [
     "Programming Languages"
@@ -264,25 +264,26 @@
   },
   "devDependencies": {
     "@types/bunyan": "^1.8.4",
-    "@types/glob": "^5.0.35",
-    "@types/jest": "^24.0.18",
-    "@types/js-yaml": "^3.11.1",
-    "@types/node": "^12.19.7",
-    "@types/vscode": "1.30.0",
+    "@types/glob": "^7.1.3",
+    "@types/jest": "^26.0.20",
+    "@types/js-yaml": "^4.0.0",
+    "@types/node": "^14.14.33",
+    "@types/vscode": "1.54.0",
     "@types/xml-js": "^1.0.0",
-    "jest": "^24.9.0",
-    "prettier": "^1.18.2",
-    "ts-jest": "^24.0.2",
+    "jest": "^26.6.3",
+    "prettier": "^2.2.1",
+    "ts-jest": "^26.5.3",
     "tsc": "^1.20150623.0",
-    "typescript": "^4.1.2"
+    "typescript": "^4.2.3"
   },
   "dependencies": {
     "bunyan": "^1.8.5",
-    "fs-promise": "^1.0.0",
+    "fs-promise": "^2.0.3",
     "glob": "^7.1.4",
-    "js-yaml": "^3.13.1",
-    "vscode-languageclient": "^5.2.1",
-    "vscode-languageserver": "^5.2.1",
+    "js-yaml": "^4.0.0",
+    "vscode-languageclient": "^7.0.0",
+    "vscode-languageserver": "^7.0.0",
+    "vscode-languageserver-textdocument": "^1.0.1",
     "xml-js": "^1.6.11"
   },
   "jest": {

src/clientMain.ts

@@ -43,7 +43,7 @@ export async function activate(context: ExtensionContext) {
     commands.registerCommand("sde.commands.selectRun", () => {
       window
         .showInputBox({ prompt: "Run which target?", value: mostRecentRunTarget })
-        .then(target => {
+        .then((target) => {
           if (!target) {
             return;
           }
@@ -60,7 +60,7 @@ export async function activate(context: ExtensionContext) {
   );
 
   workspace.onDidSaveTextDocument(
-    document => {
+    (document) => {
       if (tools.shouldBuildOnSave() && document.languageId === "swift") {
         toolchain.build();
       }
@@ -70,7 +70,7 @@ export async function activate(context: ExtensionContext) {
   );
 
   // respond to settings changes
-  workspace.onDidChangeConfiguration(async event => {
+  workspace.onDidChangeConfiguration(async (event) => {
     if (
       event.affectsConfiguration("sde") ||
       event.affectsConfiguration("swift") ||

src/sourcekites-server/packages/available-packages.ts

@@ -5,7 +5,7 @@ import { debugYamlPackage } from "./debug-yaml-package";
 import { configPackage } from "./config-package";
 import { flatteningTargetsWithUniqueSources } from "./package-helpers";
 
-export const availablePackages: Package = async fromPath => {
+export const availablePackages: Package = async (fromPath) => {
   const [
     configTargets,
     debugYamlTargets,

src/sourcekites-server/packages/config-package.ts

@@ -4,13 +4,13 @@ import { Current } from "../current";
 import { Package } from "../package";
 import { expandingSourceGlob } from "../path-helpers";
 
-export const configPackage: Package = async fromPath => {
+export const configPackage: Package = async (fromPath) => {
   const targets = Current.config.targets
     .filter(
       ({ path: targetPath }) =>
         path.isAbsolute(targetPath) || fs.existsSync(path.resolve(fromPath, targetPath))
     )
-    .map(async configTarget => {
+    .map(async (configTarget) => {
       const targetPath = path.normalize(path.resolve(fromPath, configTarget.path));
       const expandedSources = (configTarget.sources || ["**/*.swift"]).map(
         expandingSourceGlob(fromPath, targetPath)

src/sourcekites-server/packages/debug-yaml-package.ts

@@ -23,7 +23,7 @@ interface LLCommand {
   "other-args"?: string[];
 }
 
-export const debugYamlPackage: Package = async fromPath => {
+export const debugYamlPackage: Package = async (fromPath) => {
   let debugContents: string;
   try {
     debugContents = await contentsOfDebugOrReleaseYaml(fromPath);
@@ -41,7 +41,7 @@ export const debugYamlPackage: Package = async fromPath => {
       name: command["module-name"] || name,
       path: fromPath, // actually a subfolder, but all paths are absolute
       sources: new Set(
-        command.sources.map(toSource => path.normalize(path.resolve(fromPath, toSource)))
+        command.sources.map((toSource) => path.normalize(path.resolve(fromPath, toSource)))
       ),
       compilerArguments: compilerArgumentsForCommand(command),
     });

src/sourcekites-server/packages/description-package.ts

@@ -12,7 +12,7 @@ interface TargetDescription {
   sources: string[];
 }
 
-export const descriptionPackage: Package = async fromPath => {
+export const descriptionPackage: Package = async (fromPath) => {
   try {
     const data = await Current.swift(fromPath, `package describe --type json`);
     const packageDescription = JSON.parse(data) as PackageDescription;

src/sourcekites-server/packages/package-helpers.spec.ts

@@ -58,7 +58,7 @@ describe("package helpers", () => {
         path: "./",
         sources: new Set(
           Array(uniqueTarget.sources.values()).map(
-            sourceFile => `${uniqueTarget.path}/${sourceFile}`
+            (sourceFile) => `${uniqueTarget.path}/${sourceFile}`
           )
         ),
       };

src/sourcekites-server/packages/package-helpers.ts

@@ -12,10 +12,11 @@ export function flatteningTargetsWithUniqueSources(...targets: Target[][]): Targ
 }
 
 export function removingDuplicateSources(fromTargets: Target[], uniqueTargets: Target[]): Target[] {
-  return fromTargets.map(target => {
+  return fromTargets.map((target) => {
     const swiftFilesWithoutTargets = Array.from(target.sources).filter(
-      source =>
-        uniqueTargets.findIndex(desc => desc.sources.has(path.resolve(target.path, source))) === -1
+      (source) =>
+        uniqueTargets.findIndex((desc) => desc.sources.has(path.resolve(target.path, source))) ===
+        -1
     );
     return { ...target, sources: new Set(swiftFilesWithoutTargets) };
   });
@@ -24,9 +25,9 @@ export function removingDuplicateSources(fromTargets: Target[], uniqueTargets: T
 function normalizedTarget(target: Target): Target {
   return {
     ...target,
-    sources: mapSet(target.sources, source => path.resolve(target.path, source)),
+    sources: mapSet(target.sources, (source) => path.resolve(target.path, source)),
   };
 }
 function mapSet<T, R>(set: Set<T>, transform: (element: T) => R): Set<R> {
-  return new Set(Array.from(set.values()).map(element => transform(element)));
+  return new Set(Array.from(set.values()).map((element) => transform(element)));
 }