Merge branch 'master' into improve-package-name-resolver-test

Author: EmmaYuan1015

.ci/smoke-tests-common-validation.yml

@@ -9,6 +9,8 @@ steps:
       TargetFolder: "$(System.DefaultWorkingDirectory)/test/smoke/resources/extension"
   - script: npm run prepare-smoke-tests
     displayName: "Prepare smoke tests"
+    env:
+      NODE_OPTIONS: "--openssl-legacy-provider"
   - script: npm run prepare-smoke-tests-project
     displayName: "Prepare smoke tests sample project"
   - script: npm run smoke-tests --verbose

.vscode/settings.json

@@ -21,4 +21,9 @@
     },
     // "gulp.autoDetect": "on",
     "typescript.tsdk": "./node_modules/typescript/lib"
+    ,
+    "react-native-tools.logHighlight.enabled": true,
+    "files.associations": {
+        "*.rn-output": "rn-output-log"
+    }
 }

package-lock.json

@@ -39,6 +39,13 @@
   ],
   "main": "./dist/rn-extension",
   "contributes": {
+    "languages": [
+      {
+        "id": "rn-output-log",
+        "aliases": ["RN Output Log"],
+        "extensions": [".rn-output"]
+      }
+    ],
     "walkthroughs": [
       {
         "id": "RNTGetStarted",
@@ -1163,6 +1170,13 @@
         }
       }
     ],
+    "grammars": [
+      {
+        "language": "rn-output-log",
+        "scopeName": "react-native-tools-output-simple",
+        "path": "./syntaxes/rn-output-simple.tmGrammar.json"
+      }
+    ],
     "configuration": {
       "type": "object",
       "title": "%reactNative.configuration.title%",
@@ -1366,6 +1380,12 @@
           ],
           "scope": "resource",
           "default": "npm"
+        },
+        "react-native-tools.logHighlight.enabled": {
+          "description": "Enable lightweight syntax highlighting for extension output logs. When enabled, applies color highlighting to common log keywords (ERROR, WARN, INFO, DEBUG, SUCCESS, etc.). This feature is disabled by default to avoid performance issues.",
+          "type": "boolean",
+          "scope": "resource",
+          "default": false
         }
       }
     }
@@ -1514,7 +1534,7 @@
     "typescript": "^5.0.4",
     "vscode-debugprotocol": "1.51.0",
     "vscode-nls-dev": "^4.0.4",
-    "webpack": "5.94.0",
+    "webpack": "5.105.0",
     "webpack-bundle-analyzer": "4.4.0"
   },
   "extensionDependencies": [

package.json

@@ -20,9 +20,11 @@ export class PackageNameResolver {
         PackageNameResolver.GradleBuildName,
     ];
     private applicationName: string;
+    private fileSystem: FileSystem;
 
-    constructor(applicationName: string) {
+    constructor(applicationName: string, fileSystem?: FileSystem) {
         this.applicationName = applicationName;
+        this.fileSystem = fileSystem || new FileSystem();
     }
 
     /**
@@ -47,36 +49,27 @@ export class PackageNameResolver {
     }
 
     private async readApplicationId(gradlePath: string): Promise<string | null> {
-        if (gradlePath) {
-            const fs = new FileSystem();
-            if (await fs.exists(gradlePath)) {
-                const content = await fs.readFile(gradlePath);
-                const match = content.toString().match(PackageNameResolver.ApplicationIdRegexp);
-                return match ? match[2] : null;
-            }
+        if (!(await this.fileSystem.exists(gradlePath))) {
+            return null;
         }
-        return null;
+
+        const content = await this.fileSystem.readFile(gradlePath);
+        const match = content.toString().match(PackageNameResolver.ApplicationIdRegexp);
+        return match ? match[2] : null;
     }
 
     /**
      * Given a manifest file path, it parses the file and returns the package name.
      * If the package name cannot be parsed, the default packge name is returned.
      */
     private async readPackageName(manifestPath: string): Promise<string> {
-        if (manifestPath) {
-            const fs = new FileSystem();
-            const exists = await fs.exists(manifestPath);
-            if (exists) {
-                const manifestContent = await fs.readFile(manifestPath);
-                let packageName = this.parsePackageName(manifestContent.toString());
-                if (!packageName) {
-                    packageName = this.getDefaultPackageName(this.applicationName);
-                }
-                return packageName;
-            }
+        if (!(await this.fileSystem.exists(manifestPath))) {
             return this.getDefaultPackageName(this.applicationName);
         }
-        return this.getDefaultPackageName(this.applicationName);
+
+        const manifestContent = await this.fileSystem.readFile(manifestPath);
+        const packageName = this.parsePackageName(manifestContent.toString());
+        return packageName || this.getDefaultPackageName(this.applicationName);
     }
 
     /**

src/extension/android/packageNameResolver.ts

@@ -0,0 +1,70 @@
+{
+    "scopeName": "react-native-tools-output-simple",
+    "patterns": [
+        {
+            "include": "#keywords-error"
+        },
+        {
+            "include": "#keywords-warn"
+        },
+        {
+            "include": "#keywords-info"
+        },
+        {
+            "include": "#keywords-debug"
+        },
+        {
+            "include": "#keywords-success"
+        },
+        {
+            "include": "#constants"
+        },
+        {
+            "include": "#string-quoted"
+        },
+        {
+            "include": "#url-simple"
+        },
+        {
+            "include": "#numeric-decimal"
+        }
+    ],
+    "repository": {
+        "keywords-error": {
+            "match": "\\b(ERROR|error|FAILED|failed|FAILURE|failure|Exception|exception|FATAL|fatal|Fatal)\\b",
+            "name": "markup.bold invalid.illegal rnt.output.error"
+        },
+        "keywords-warn": {
+            "match": "\\b(WARN|warn|WARNING|warning)\\b",
+            "name": "markup.bold markup.deleted rnt.output.warn"
+        },
+        "keywords-info": {
+            "match": "\\b(INFO|info|INFORMATION|information)\\b",
+            "name": "markup.bold markup.inserted rnt.output.info"
+        },
+        "keywords-debug": {
+            "match": "\\b(DEBUG|debug)\\b",
+            "name": "markup.bold markup.changed rnt.output.debug"
+        },
+        "keywords-success": {
+            "match": "\\b(SUCCESS|success|BUILD SUCCESSFUL|BUILD PASSED|PASSED|passed)\\b",
+            "name": "markup.bold markup.inserted rnt.output.success"
+        },
+        "constants": {
+            "match": "\\b(true|false|null|undefined|NaN)\\b",
+            "name": "constant.language rnt.output.constant"
+        },
+        "string-quoted": {
+            "match": "['\"]([^'\"]{0,50})['\"]",
+            "name": "string.quoted rnt.output.string"
+        },
+        "url-simple": {
+            "match": "https?://[^\\s]+",
+            "name": "markup.underline.link rnt.output.url"
+        },
+        "numeric-decimal": {
+            "match": "\\b\\d+(?:\\.\\d+)?\\b",
+            "name": "constant.numeric rnt.output.numeric"
+        }
+    }
+}