v0.18.7 RC bits (#827)

* update third party notices (#784)

Signed-off-by: Yan Zhang <[email protected]>

* Exp: rollout getting started walkthrough (#796)

Signed-off-by: Yan Zhang <[email protected]>

* Add configure formatter settings entry in help center (#802)

* support to detect arm-macOS (#808)

Signed-off-by: Yan Zhang <[email protected]>

* fix: Get correct project type (#804)

Signed-off-by: Sheng Chen <[email protected]>

* upversion to 0.18.7

Signed-off-by: Yan Zhang <[email protected]>

Co-authored-by: Shi Chen <[email protected]>
Co-authored-by: Sheng Chen <[email protected]>

Author: 3 people

.vscodeignore

@@ -14,3 +14,4 @@ webpack.config.js
 out/**/*.map
 out/assets/**/*.js
 *.vsix
+scripts

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## 0.18.6
+### Fixed
+- Support to detect macOS with ARM chips.
+- Get correct project type.
+
 ## 0.18.6
 ### Changed
 - Adopt Adoptium API v3 to download JDK 17. [#765](https://github.com/microsoft/vscode-java-pack/pull/765)

ThirdPartyNotices.txt

@@ -3,7 +3,7 @@
   "displayName": "Extension Pack for Java",
   "description": "Popular extensions for Java development that provides Java IntelliSense, debugging, testing, Maven/Gradle support, project management and more",
   "license": "MIT",
-  "version": "0.18.6",
+  "version": "0.18.7",
   "publisher": "vscjava",
   "preview": true,
   "engines": {
@@ -314,14 +314,13 @@
     "vscode:prepublish": "npm run build",
     "compile": "webpack --config webpack.config.js",
     "watch": "webpack --config webpack.config.js --watch --info-verbosity verbose",
-    "build": "webpack --config webpack.config.js --mode=\"production\""
+    "build": "webpack --config webpack.config.js --mode=\"production\"",
+    "update-tpn": "node scripts/update-third-party-notice.js"
   },
   "devDependencies": {
-    "@iconify-icons/codicon": "^1.1.8",
-    "@iconify/react": "^1.1.3",
-    "@reduxjs/toolkit": "^1.5.0",
     "@types/bytes": "^3.1.0",
     "@types/expand-tilde": "^2.0.0",
+    "@types/fs-extra": "^9.0.1",
     "@types/lodash": "^4.14.161",
     "@types/minimatch": "^3.0.3",
     "@types/node": "^8.10.63",
@@ -335,41 +334,22 @@
     "@types/vscode": "1.52.0",
     "@types/winreg": "^1.2.30",
     "@types/xmldom": "^0.1.30",
-    "axios": "^0.21.2",
-    "arch": "^2.1.2",
     "autoprefixer": "^8.5.1",
-    "bootstrap": "^4.5.2",
     "bytes": "^3.1.0",
     "css-loader": "^3.6.0",
-    "expand-tilde": "^2.0.2",
     "file-loader": "^6.2.0",
-    "find-java-home": "^1.1.0",
-    "highlight.js": "10.5.0",
     "html-webpack-inline-source-plugin": "0.0.10",
     "html-webpack-plugin": "^3.2.0",
-    "jquery": "^3.5.1",
-    "lodash": "^4.17.21",
-    "minimatch": "^3.0.4",
     "node-sass": "^4.14.1",
-    "path-exists": "^3.0.0",
-    "popper.js": "^1.16.1",
     "postcss-loader": "^2.1.5",
-    "react": "^17.0.1",
-    "react-bootstrap": "^1.4.3",
-    "react-dom": "^17.0.1",
-    "react-redux": "^7.2.2",
-    "request": "^2.88.2",
-    "request-promise-native": "^1.0.9",
     "sass-loader": "^7.3.1",
     "style-loader": "^0.21.0",
     "ts-loader": "^4.3.0",
     "tslint": "^5.20.1",
     "typescript": "^3.7.5",
     "url-loader": "^4.1.1",
-    "vscode-tas-client": "^0.1.22",
     "webpack": "^4.44.1",
-    "webpack-cli": "^3.3.12",
-    "xmldom": "^0.6.0"
+    "webpack-cli": "^3.3.12"
   },
   "extensionPack": [
     "redhat.java",
@@ -380,12 +360,31 @@
     "VisualStudioExptTeam.vscodeintellicode"
   ],
   "dependencies": {
-    "@types/fs-extra": "^9.0.1",
+    "@iconify-icons/codicon": "^1.1.8",
+    "@iconify/react": "^1.1.4",
+    "@reduxjs/toolkit": "^1.5.0",
+    "arch": "^2.1.2",
+    "axios": "^0.21.2",
+    "bootstrap": "^4.5.2",
     "compare-versions": "^3.6.0",
     "expand-home-dir": "0.0.3",
+    "expand-tilde": "^2.0.2",
+    "find-java-home": "^1.1.0",
     "fs-extra": "^9.0.1",
+    "highlight.js": "10.5.0",
+    "jquery": "^3.5.1",
+    "lodash": "^4.17.21",
+    "minimatch": "^3.0.4",
+    "react": "^17.0.1",
+    "react-bootstrap": "^1.4.3",
+    "react-dom": "^17.0.1",
+    "react-redux": "^7.2.2",
+    "request": "^2.88.2",
+    "request-promise-native": "^1.0.9",
     "semver": "^5.7.1",
     "vscode-extension-telemetry-wrapper": "^0.9.0",
-    "winreg-utf8": "^0.1.1"
+    "vscode-tas-client": "^0.1.22",
+    "winreg-utf8": "^0.1.1",
+    "xmldom": "^0.6.0"
   }
 }

package-lock.json

@@ -0,0 +1,64 @@
+const fs = require('fs');
+const path = require('path');
+const formatRepositoryUrl = (url) => {
+    if (!url) return url;
+    url = url.replace(/\/$/, "");
+    url = url.replace(/\.git$/, "");
+    url = url.replace(/^git\+/, "");
+    url = url.replace(/^git:github\.com:/, "https://github.com/");
+    url = url.replace(/^git:\/\//, "https://");
+    url = url.replace(/^ssh:\/\/git@/, "https://");
+    return url;
+}
+
+const packageJSON = require(path.join(__dirname, "..", "package.json"));
+
+const header = `THIRD-PARTY SOFTWARE NOTICES AND INFORMATION
+For ${packageJSON.name} package
+
+This extension uses Open Source components. You can find the source code of their
+open source projects along with the license information below. We acknowledge and
+are grateful to these developers for their contribution to open source.
+
+`;
+
+const entries = Object.keys(packageJSON.dependencies).map((name, idx) => {
+    console.log("===>>>");
+    console.log(name);
+    // url
+    const manifestFile = require(path.join(__dirname, "..", "node_modules", name, "package.json"));
+    let url = manifestFile.repository?.url ?? manifestFile.repository;
+    console.log(url, "\t", formatRepositoryUrl(url));
+    url = formatRepositoryUrl(url);
+
+    // license
+    const packageRoot = path.join(__dirname, "..", "node_modules", name);
+    const files = fs.readdirSync(packageRoot);
+    const licenseFile = files.find(f => f.match(/^license/i));
+    const license = licenseFile ? fs.readFileSync(path.join(packageRoot, licenseFile)) : undefined;
+    console.log("<<<===");
+    return {
+        name,
+        url,
+        license
+    }
+    
+});
+
+const depsWithLicense = entries.filter(e => e.name !== undefined && e.license !== undefined);
+
+const toc = depsWithLicense.map((dep, idx) => {
+    return `${idx + 1}. ${dep.name} (${dep.url})`;
+}).join("\n") + "\n";
+
+const licenses = depsWithLicense.map(dep => {
+    return `${dep.name} NOTICES BEGIN HERE
+=============================
+${dep.license}
+=========================================
+END OF ${dep.name} NOTICES AND INFORMATION
+`;
+}).join("\n");
+
+const content = [header, toc, licenses].join("\n");
+fs.writeFileSync(path.join(__dirname, "..", "ThirdPartyNotices.txt"), content);

package.json

@@ -3,23 +3,22 @@
 
 import * as vscode from "vscode";
 import { dispose as disposeTelemetryWrapper, initialize, instrumentOperation } from "vscode-extension-telemetry-wrapper";
-import { initialize as initUtils } from "./utils";
+import { ClassPathConfigurationViewSerializer } from "./classpath/classpathConfigurationView";
 import { initialize as initCommands } from "./commands";
-import { initialize as initRecommendations } from "./recommendation";
-import { showReleaseNotesOnStart, HelpViewType } from "./misc";
 import { initialize as initExp } from "./exp";
-import { OverviewViewSerializer } from "./overview";
-import { JavaRuntimeViewSerializer, validateJavaRuntime } from "./java-runtime";
-import { scheduleAction } from "./utils/scheduler";
-import { showWelcomeWebview, WelcomeViewSerializer } from "./welcome";
-import { JavaGettingStartedViewSerializer } from "./getting-started";
 import { JavaExtGuideViewSerializer } from "./ext-guide";
-import { ClassPathConfigurationViewSerializer } from "./classpath/classpathConfigurationView";
 import { initFormatterSettingsEditorProvider } from "./formatter-settings";
 import { initRemoteProfileProvider } from "./formatter-settings/RemoteProfileProvider";
+import { JavaGettingStartedViewSerializer } from "./getting-started";
+import { JavaRuntimeViewSerializer, validateJavaRuntime } from "./java-runtime";
+import { HelpViewType, showReleaseNotesOnStart } from "./misc";
+import { OverviewViewSerializer } from "./overview";
 import { CodeActionProvider } from "./providers/CodeActionProvider";
-import { KEY_IS_WELCOME_PAGE_VIEWED, KEY_SHOW_WHEN_USING_JAVA } from "./utils/globalState";
-import { isWalkthroughEnabled } from "./utils/walkthrough";
+import { initialize as initRecommendations } from "./recommendation";
+import { initialize as initUtils } from "./utils";
+import { KEY_SHOW_WHEN_USING_JAVA } from "./utils/globalState";
+import { scheduleAction } from "./utils/scheduler";
+import { showWelcomeWebview, WelcomeViewSerializer } from "./welcome";
 
 export async function activate(context: vscode.ExtensionContext) {
   syncState(context);
@@ -48,15 +47,6 @@ async function initializeExtension(_operationId: string, context: vscode.Extensi
 
   const config = vscode.workspace.getConfiguration("java.help");
 
-  // for control group where walkthrough is not enabled, present first view for once.
-  const walkthroughEnabled = await isWalkthroughEnabled();
-  if (walkthroughEnabled === false                            // control group
-    && !context.globalState.get(KEY_IS_WELCOME_PAGE_VIEWED)   // first time
-    && vscode.env.uiKind === vscode.UIKind.Desktop            // desktop only (no popups on Codespaces)
-  ) {
-    presentFirstView(context);
-  }
-
   if (config.get("firstView") !== HelpViewType.None && context.globalState.get(KEY_SHOW_WHEN_USING_JAVA)) {
     scheduleAction("showFirstView", true).then(() => {
       presentFirstView(context);

scripts/update-third-party-notice.js

@@ -309,9 +309,9 @@ export async function suggestOpenJdk(jdkVersion: string = "openjdk17", impl: str
     os = "linux";
   }
 
-  let arch = architecture();
-  if (arch === "x86") {
-    arch = "x32";
+  let arch = process.arch;
+  if (arch === "arm64") {
+    arch = "aarch64";
   }
 
   const majorVersion = jdkVersion.replace(/^openjdk/, "");

src/extension.ts

@@ -98,8 +98,6 @@ export async function latestAssets(featureVersion: string, jvmImpl: string): Pro
     return response;
 }
 
-
-
 interface AdoptiumReleaseInfo {
     available_lts_releases: number[];
     available_releases: number[];

src/java-runtime/index.ts

@@ -10,10 +10,6 @@ export async function getProjectType(fsPath: string): Promise<ProjectType> {
     if (isDefaultProject(fsPath)) {
         return ProjectType.Default;
     }
-    const dotProjectFile = path.join(fsPath, ".project");
-    if (!await fse.pathExists(dotProjectFile)) { // for invisible projects, .project file is located in workspace storage.
-      return ProjectType.UnmanagedFolder;
-    }
     const buildDotGradleFile = path.join(fsPath, "build.gradle");
     if (await fse.pathExists(buildDotGradleFile)) {
       return ProjectType.Gradle;
@@ -22,6 +18,10 @@ export async function getProjectType(fsPath: string): Promise<ProjectType> {
     if (await fse.pathExists(pomDotXmlFile)) {
       return ProjectType.Maven;
     }
+    const dotProjectFile = path.join(fsPath, ".project");
+    if (!await fse.pathExists(dotProjectFile)) { // for invisible projects, .project file is located in workspace storage.
+      return ProjectType.UnmanagedFolder;
+    }
     return ProjectType.Others;
 }