Repository: rust-analyzer/rust-analyzer
Pull request #10722 (2021-11-08 13:32:41)

fix: Fix proc-macro attributes being shadowed by their functions in IDE layer
We sometimes still didn't resolve proc-macro attrs in attribute paths in the ide crates due to their function definitions resolving first.
bors r+  

bors[bot]: Build failed:
  * [Rust (ubuntu-latest)](https://github.com/rust-analyzer/rust-analyzer/runs/4139476762?check_suite_focus=true)

Patch:
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index f781e0987a..9c0f3093e1 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -132,8 +132,5 @@ jobs:
         run: npm --prefix ./editors/code test
         # working-directory: ./editors/code  # does not work: https://github.com/GabrielBB/xvfb-action/issues/8
 
-    - run: npm run pretest
-      working-directory: ./editors/code
-
     - run: npm run package --scripts-prepend-node-path
       working-directory: ./editors/code
diff --git a/crates/hir/src/semantics.rs b/crates/hir/src/semantics.rs
index 0f63de9e72..b09c0e753b 100644
--- a/crates/hir/src/semantics.rs
+++ b/crates/hir/src/semantics.rs
@@ -329,6 +329,10 @@ impl<'db, DB: HirDatabase> Semantics<'db, DB> {
         self.imp.resolve_path(path)
     }
 
+    pub fn resolve_path_as_macro(&self, path: &ast::Path) -> Option<MacroDef> {
+        self.imp.resolve_path_as_macro(path)
+    }
+
     pub fn resolve_extern_crate(&self, extern_crate: &ast::ExternCrate) -> Option<Crate> {
         self.imp.resolve_extern_crate(extern_crate)
     }
@@ -845,6 +849,12 @@ impl<'db> SemanticsImpl<'db> {
         self.analyze(path.syntax()).resolve_path(self.db, path)
     }
 
+    // FIXME: This shouldn't exist, but is currently required to always resolve attribute paths in
+    // the IDE layer due to namespace collisions
+    fn resolve_path_as_macro(&self, path: &ast::Path) -> Option<MacroDef> {
+        self.analyze(path.syntax()).resolve_path_as_macro(self.db, path)
+    }
+
     fn resolve_extern_crate(&self, extern_crate: &ast::ExternCrate) -> Option<Crate> {
         let krate = self.scope(extern_crate.syntax()).krate()?;
         krate.dependencies(self.db).into_iter().find_map(|dep| {
diff --git a/crates/hir/src/source_analyzer.rs b/crates/hir/src/source_analyzer.rs
index 08d0a02d79..b12461818e 100644
--- a/crates/hir/src/source_analyzer.rs
+++ b/crates/hir/src/source_analyzer.rs
@@ -246,6 +246,18 @@ impl SourceAnalyzer {
         }
     }
 
+    pub(crate) fn resolve_path_as_macro(
+        &self,
+        db: &dyn HirDatabase,
+        path: &ast::Path,
+    ) -> Option<MacroDef> {
+        // This must be a normal source file rather than macro file.
+        let hygiene = Hygiene::new(db.upcast(), self.file_id);
+        let ctx = body::LowerCtx::with_hygiene(db.upcast(), &hygiene);
+        let hir_path = Path::from_src(path.clone(), &ctx)?;
+        resolve_hir_path_as_macro(db, &self.resolver, &hir_path)
+    }
+
     pub(crate) fn resolve_path(
         &self,
         db: &dyn HirDatabase,
diff --git a/crates/ide_db/src/defs.rs b/crates/ide_db/src/defs.rs
index d95bca515f..e4874c7c48 100644
--- a/crates/ide_db/src/defs.rs
+++ b/crates/ide_db/src/defs.rs
@@ -433,20 +433,20 @@ impl NameRefClass {
                 .find_map(ast::Attr::cast)
                 .map(|attr| attr.path().as_ref() == Some(&top_path));
             return match is_attribute_path {
-                Some(true) => sema.resolve_path(&path).and_then(|resolved| {
-                    match resolved {
-                        // Don't wanna collide with builtin attributes here like `test` hence guard
-                        // so only resolve to modules that aren't the last segment
-                        PathResolution::Def(module @ ModuleDef::Module(_)) if path != top_path => {
-                            cov_mark::hit!(name_ref_classify_attr_path_qualifier);
-                            Some(NameRefClass::Definition(Definition::ModuleDef(module)))
-                        }
-                        PathResolution::Macro(mac) if mac.kind() == hir::MacroKind::Attr => {
-                            Some(NameRefClass::Definition(Definition::Macro(mac)))
-                        }
-                        _ => None,
+                Some(true) if path == top_path => sema
+                    .resolve_path_as_macro(&path)
+                    .filter(|mac| mac.kind() == hir::MacroKind::Attr)
+                    .map(Definition::Macro)
+                    .map(NameRefClass::Definition),
+                // in case of the path being a qualifier, don't resolve to anything but a module
+                Some(true) => match sema.resolve_path(&path)? {
+                    PathResolution::Def(module @ ModuleDef::Module(_)) => {
+                        cov_mark::hit!(name_ref_classify_attr_path_qualifier);
+                        Some(NameRefClass::Definition(Definition::ModuleDef(module)))
                     }
-                }),
+                    _ => None,
+                },
+                // inside attribute, but our path isn't part of the attribute's path(might be in its expression only)
                 Some(false) => None,
                 None => sema.resolve_path(&path).map(Into::into).map(NameRefClass::Definition),
             };
diff --git a/editors/code/package-lock.json b/editors/code/package-lock.json
index e3372574b3..0b226a985d 100644
--- a/editors/code/package-lock.json
+++ b/editors/code/package-lock.json
@@ -28,7 +28,7 @@
                 "glob": "^7.1.6",
                 "mocha": "^9.0.2",
                 "tslib": "^2.3.0",
-                "typescript": "^4.4.4",
+                "typescript": "^4.3.5",
                 "typescript-formatter": "^7.2.2",
                 "vsce": "^1.95.1",
                 "vscode-test": "^1.5.1"
@@ -3541,9 +3541,9 @@
             }
         },
         "node_modules/typescript": {
-            "version": "4.4.4",
-            "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz",
-            "integrity": "sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==",
+            "version": "4.3.5",
+            "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz",
+            "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==",
             "dev": true,
             "bin": {
                 "tsc": "bin/tsc",
@@ -6647,9 +6647,9 @@
             }
         },
         "typescript": {
-            "version": "4.4.4",
-            "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz",
-            "integrity": "sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==",
+            "version": "4.3.5",
+            "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz",
+            "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==",
             "dev": true
         },
         "typescript-formatter": {
diff --git a/editors/code/package.json b/editors/code/package.json
index 4c718f0b79..336081e88c 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -32,7 +32,7 @@
         "watch": "npm run build-base -- --sourcemap --watch",
         "lint": "tsfmt --verify && eslint -c .eslintrc.js --ext ts ./src ./tests",
         "fix": " tsfmt -r       && eslint -c .eslintrc.js --ext ts ./src ./tests --fix",
-        "pretest": "tsc --noEmit && npm run build",
+        "pretest": "tsc && npm run build",
         "test": "node ./out/tests/runTests.js"
     },
     "dependencies": {
diff --git a/editors/code/tsconfig.json b/editors/code/tsconfig.json
index 7c4fbd21eb..c9f348241a 100644
--- a/editors/code/tsconfig.json
+++ b/editors/code/tsconfig.json
@@ -9,7 +9,6 @@
         "sourceMap": true,
         "rootDir": ".",
         "strict": true,
-        "useUnknownInCatchVariables": false,
         "noUnusedLocals": true,
         "noUnusedParameters": true,
         "noImplicitReturns": true,


Test patch:
diff --git a/crates/ide/src/syntax_highlighting/test_data/highlighting.html b/crates/ide/src/syntax_highlighting/test_data/highlighting.html
index 1a10a78d24..ab810aceca 100644
--- a/crates/ide/src/syntax_highlighting/test_data/highlighting.html
+++ b/crates/ide/src/syntax_highlighting/test_data/highlighting.html
@@ -43,7 +43,7 @@ pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
 <pre><code><span class="keyword">use</span> <span class="module">inner</span><span class="operator">::</span><span class="brace">{</span><span class="self_keyword">self</span> <span class="keyword">as</span> <span class="module declaration">inner_mod</span><span class="brace">}</span><span class="semicolon">;</span>
 <span class="keyword">mod</span> <span class="module declaration">inner</span> <span class="brace">{</span><span class="brace">}</span>
 
-<span class="attribute attribute">#</span><span class="attribute attribute">[</span><span class="module attribute">proc_macros</span><span class="operator attribute">::</span><span class="builtin_attr attribute">identity</span><span class="attribute attribute">]</span>
+<span class="attribute attribute">#</span><span class="attribute attribute">[</span><span class="module attribute">proc_macros</span><span class="operator attribute">::</span><span class="macro attribute">identity</span><span class="attribute attribute">]</span>
 <span class="keyword">pub</span> <span class="keyword">mod</span> <span class="module declaration public">ops</span> <span class="brace">{</span>
     <span class="attribute attribute">#</span><span class="attribute attribute">[</span><span class="builtin_attr attribute">lang</span> <span class="operator attribute">=</span> <span class="string_literal attribute">"fn_once"</span><span class="attribute attribute">]</span>
     <span class="keyword">pub</span> <span class="keyword">trait</span> <span class="trait declaration public">FnOnce</span><span class="angle">&lt;</span><span class="type_param declaration">Args</span><span class="angle">&gt;</span> <span class="brace">{</span><span class="brace">}</span>