build - Prepare for 0.24.0 (#847)

.github/workflows/windows.yml

@@ -30,6 +30,9 @@ jobs:
     - name: Install VSCE
       run: npm install -g @vscode/vsce
 
+    - name: Lint
+      run: npm run tslint
+
     - name: Build OSGi bundle
       run: npm run build-server
 

CHANGELOG.md

@@ -4,6 +4,9 @@ All notable changes to the "vscode-java-dependency" extension will be documented
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## 0.24.0
+* feat - Support adding new package from file explorer by @jdneo in https://github.com/microsoft/vscode-java-dependency/pull/845
+
 ## 0.23.7
 * fix - Creates file watcher with trailing slash causes problems for other extensions by @testforstephen in https://github.com/microsoft/vscode-java-dependency/pull/829
 * fix - Micronaut® Launch extension renamed. by @dbalek in https://github.com/microsoft/vscode-java-dependency/pull/831

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

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: JDTLS EXT Core
 Bundle-SymbolicName: com.microsoft.jdtls.ext.core;singleton:=true
-Bundle-Version: 0.23.7
+Bundle-Version: 0.24.0
 Bundle-Activator: com.microsoft.jdtls.ext.core.JdtlsExtActivator
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy

jdtls.ext/com.microsoft.jdtls.ext.core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.microsoft.jdtls.ext</groupId>
         <artifactId>jdtls-ext-parent</artifactId>
-        <version>0.23.7</version>
+        <version>0.24.0</version>
     </parent>
     <artifactId>com.microsoft.jdtls.ext.core</artifactId>
     <packaging>eclipse-plugin</packaging>

jdtls.ext/com.microsoft.jdtls.ext.target/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.microsoft.jdtls.ext</groupId>
 		<artifactId>jdtls-ext-parent</artifactId>
-		<version>0.23.7</version>
+		<version>0.24.0</version>
 	</parent>
 	<artifactId>com.microsoft.jdtls.ext.tp</artifactId>
 	<name>${base.name} :: Target Platform</name>

jdtls.ext/pom.xml

@@ -4,7 +4,7 @@
     <groupId>com.microsoft.jdtls.ext</groupId>
     <artifactId>jdtls-ext-parent</artifactId>
     <name>${base.name} :: Parent</name>
-    <version>0.23.7</version>
+    <version>0.24.0</version>
     <packaging>pom</packaging>
     <properties>
         <base.name>Java Project Manager</base.name>

package.json

@@ -2,7 +2,7 @@
   "name": "vscode-java-dependency",
   "displayName": "Project Manager for Java",
   "description": "%description%",
-  "version": "0.23.7",
+  "version": "0.24.0",
   "publisher": "vscjava",
   "preview": false,
   "aiKey": "5c642b22-e845-4400-badb-3f8509a70777",
@@ -46,7 +46,7 @@
   "main": "./main.js",
   "contributes": {
     "javaExtensions": [
-      "./server/com.microsoft.jdtls.ext.core-0.23.7.jar"
+      "./server/com.microsoft.jdtls.ext.core-0.24.0.jar"
     ],
     "commands": [
       {

src/explorerCommands/new.ts

@@ -321,7 +321,7 @@ async function inferPackageFsPath(): Promise<string> {
         return getPackageFsPathFromActiveEditor();
     }
 
-    let sourcePaths: string[] | undefined = (await getSourceRoots())?.data?.map((sourcePath) => sourcePath.path);
+    const sourcePaths: string[] | undefined = (await getSourceRoots())?.data?.map((sourcePath) => sourcePath.path);
 
     if (!window.activeTextEditor) {
         if (sourcePaths?.length === 1) {
@@ -412,7 +412,7 @@ async function resolvePackageName(filePath: string): Promise<string> {
         return guessPackageName(filePath);
     }
 
-    let sourcePaths: string[] = (await getSourceRoots())?.data?.map(
+    const sourcePaths: string[] = (await getSourceRoots())?.data?.map(
             (sourcePath) => sourcePath.path).sort((a, b) => b.length - a.length) ?? [];
 
     if (!sourcePaths?.length) {
@@ -515,8 +515,9 @@ export async function newPackage(node: DataNode | Uri | undefined): Promise<void
         "triggernewpackagefrom": isUri ? "fileExplorer" : "javaProjectExplorer",
     });
 
-    let {defaultValue, packageRootPath} = (isUri ? await getPackageInformationFromUri(node)
+    const {defaultValue: tempDefaultValue , packageRootPath} = (isUri ? await getPackageInformationFromUri(node)
             : await getPackageInformationFromNode(node)) || {};
+    let defaultValue = tempDefaultValue;
     if (defaultValue === undefined || packageRootPath === undefined) {
         return;
     }
@@ -560,7 +561,7 @@ async function getPackageInformationFromUri(uri: Uri): Promise<Record<string, st
         return defaultValue;
     }
 
-    let sourcePaths: string[] = (await getSourceRoots())?.data?.map(
+    const sourcePaths: string[] = (await getSourceRoots())?.data?.map(
         (sourcePath) => sourcePath.path).sort((a, b) => b.length - a.length) ?? [];
 
     if (!sourcePaths?.length) {
@@ -587,17 +588,17 @@ async function getPackageInformationFromNode(node: DataNode): Promise<Record<str
         return {
             packageRootPath: await getPackageFsPath(node) || "",
             defaultValue: "",
-        }
+        };
     } else if (nodeKind === NodeKind.PackageRoot) {
         return {
             packageRootPath: Uri.parse(node.uri!).fsPath,
             defaultValue: "",
-        }
+        };
     } else if (nodeKind === NodeKind.Package) {
         return {
             packageRootPath: getPackageRootPath(Uri.parse(node.uri!).fsPath, node.nodeData.name),
             defaultValue: node.nodeData.name + ".",
-        }
+        };
     } else if (nodeKind === NodeKind.PrimaryType) {
         const primaryTypeNode = <PrimaryTypeNode> node;
         const packageRootPath = primaryTypeNode.getPackageRootPath();
@@ -611,9 +612,9 @@ async function getPackageInformationFromNode(node: DataNode): Promise<Record<str
             return undefined;
         }
         return {
-            packageRootPath: packageRootPath,
+            packageRootPath,
             defaultValue: path.relative(packageRootPath, packagePath).replace(/[/\\]/g, "."),
-        }
+        };
     }
 
     return undefined;