@neocompose/cli 0.61.5 → 0.62.0

package/dist/neo.mjs

@@ -119,6 +119,92 @@ var init_workspace_source_path = __esm({
   }
 });
 
+// ../packages/neoscript-language/src/local-scope-index.ts
+var LocalScopeIndex;
+var init_local_scope_index = __esm({
+  "../packages/neoscript-language/src/local-scope-index.ts"() {
+    "use strict";
+    LocalScopeIndex = class {
+      constructor(locals) {
+        this.locals = locals;
+        for (let index = 0; index < locals.length; index++) {
+          const local = locals[index];
+          if (local.scopeStart > local.scopeEnd) continue;
+          const named = this.byName.get(local.name);
+          if (named) named.push(index);
+          else this.byName.set(local.name, [index]);
+        }
+      }
+      locals;
+      byName = /* @__PURE__ */ new Map();
+      segments = /* @__PURE__ */ new Map();
+      at(name, offset) {
+        const named = this.byName.get(name);
+        if (!named) return void 0;
+        let segments = this.segments.get(name);
+        if (!segments) {
+          segments = this.buildSegments(named);
+          this.segments.set(name, segments);
+        }
+        let low = 0;
+        let high = segments.length;
+        while (low < high) {
+          const middle = low + high >>> 1;
+          if (segments[middle].start <= offset) low = middle + 1;
+          else high = middle;
+        }
+        const index = segments[low - 1]?.localIndex;
+        return index === void 0 ? void 0 : this.locals[index];
+      }
+      buildSegments(indices) {
+        const events = indices.flatMap((index) => [
+          { offset: this.locals[index].scopeStart, index },
+          // Scope ends are inclusive in the editor's recovery model.
+          { offset: this.locals[index].scopeEnd + 1, index: void 0 }
+        ]);
+        events.sort((a, b) => a.offset - b.offset);
+        const active = [];
+        const result = [];
+        for (let eventIndex = 0; eventIndex < events.length; ) {
+          const offset = events[eventIndex].offset;
+          while (events[eventIndex]?.offset === offset) {
+            const index = events[eventIndex++].index;
+            if (index === void 0) continue;
+            let child = active.length;
+            active.push(index);
+            while (child > 0) {
+              const parent = child - 1 >>> 1;
+              if (active[parent] >= index) break;
+              active[child] = active[parent];
+              child = parent;
+            }
+            active[child] = index;
+          }
+          while (active.length && this.locals[active[0]].scopeEnd < offset) {
+            const last = active.pop();
+            if (!active.length) break;
+            let parent = 0;
+            while (parent * 2 + 1 < active.length) {
+              let child = parent * 2 + 1;
+              if (child + 1 < active.length && active[child + 1] > active[child])
+                child++;
+              if (active[child] <= last) break;
+              active[parent] = active[child];
+              parent = child;
+            }
+            active[parent] = last;
+          }
+          const localIndex = active[0];
+          if (!result.length || result.at(-1).localIndex !== localIndex) {
+            result.push({ start: offset, localIndex });
+          }
+        }
+        return result;
+      }
+    };
+  }
+});
+
 // ../packages/neoscript-language/src/cell-pattern.ts
 var NEO_CELL_PATTERN_CLASS_ID, NEO_CELL_PATTERN_CONSTRUCTOR_ID, NEO_CELL_PATTERN_EXCLUDING_ENUM_ID, NEO_CELL_PATTERN_EXCLUDING_OPTION_IDS, NEO_CELL_PATTERN_MEMBER_IDS, NEO_OBJECT_GRID_MEMBER_IDS, NEO_CELL_PATTERN_PURE_NATIVE_MEMBER_IDS, NEO_OBJECT_CLASS_ID;
 var init_cell_pattern = __esm({
@@ -8385,7 +8471,7 @@ var init_strict_resolver = __esm({
           };
         }
         if (expression.kind !== "member") return null;
-        if (expression.receiver.kind === "ident" && !scope.lookup(expression.receiver.name)) {
+        if (expression.receiver.kind === "ident" && !this.hasValueReceiver(expression.receiver.name, scope)) {
           const owner2 = this.project.typeByName.get(expression.receiver.name);
           const symbol2 = owner2?.members.find(
             (candidate) => candidate.name === expression.name
@@ -9015,7 +9101,7 @@ var init_strict_resolver = __esm({
             expression: this.resolveIdentifier("this", scope, expression.pos)
           };
         } else if (expression.kind === "member") {
-          if (expression.receiver.kind === "ident" && !scope.lookup(expression.receiver.name)) {
+          if (expression.receiver.kind === "ident" && !this.hasValueReceiver(expression.receiver.name, scope)) {
             owner = this.project.typeByName.get(expression.receiver.name);
             symbol = owner?.members.find(
               (candidate) => candidate.name === expression.name && (candidate.kind === "function" || candidate.kind === "method")
@@ -9100,7 +9186,7 @@ var init_strict_resolver = __esm({
           owner = implicit.owner;
           receiverType = this.context.thisClass;
         } else if (expression.kind === "member") {
-          if (expression.receiver.kind === "ident" && !scope.lookup(expression.receiver.name)) {
+          if (expression.receiver.kind === "ident" && !this.hasValueReceiver(expression.receiver.name, scope)) {
             owner = this.project.typeByName.get(expression.receiver.name);
             symbol = owner?.members.find(
               (candidate) => candidate.name === expression.name && (candidate.kind === "function" || candidate.kind === "method")
@@ -9320,10 +9406,17 @@ var init_strict_resolver = __esm({
         if (global) return this.symbolValue(global);
         const implicit = this.implicitMember(name);
         if (implicit && implicit.symbol.kind !== "function" && implicit.symbol.kind !== "method") {
+          if (implicit.symbol.static === true) {
+            return this.resolveStaticMemberValue(
+              implicit.owner,
+              implicit.symbol,
+              pos
+            );
+          }
           return this.resolveMember(
             {
               kind: "ident",
-              name: implicit.symbol.static === true ? implicit.owner.name : "this",
+              name: "this",
               pos
             },
             name,
@@ -9545,7 +9638,7 @@ var init_strict_resolver = __esm({
         if (path[1] !== NEO_VARIANT_SCOPE_NAME) return null;
         const className = path[0];
         if (className === void 0) return null;
-        if (scope.lookup(className)) return null;
+        if (this.hasValueReceiver(className, scope)) return null;
         const classType = this.project.typeByName.get(className);
         if (classType === void 0 || classType.kind !== "class") return null;
         const rest = path.slice(2);
@@ -9649,7 +9742,7 @@ var init_strict_resolver = __esm({
         const isInitialize = callee.name === VARIANT_INITIALIZE_NAME;
         const isApply = callee.name === VARIANT_APPLY_NAME;
         if (!isInitialize && !isApply) return null;
-        if (callee.receiver.kind === "ident" && !scope.lookup(callee.receiver.name) && this.project.typeByName.has(callee.receiver.name)) {
+        if (callee.receiver.kind === "ident" && !this.hasValueReceiver(callee.receiver.name, scope) && this.project.typeByName.has(callee.receiver.name)) {
           return null;
         }
         const receiver = this.resolveExpression(callee.receiver, scope);
@@ -9804,6 +9897,49 @@ var init_strict_resolver = __esm({
         }
         return resolved;
       }
+      resolveStaticMemberValue(staticType, member, pos) {
+        this.assertMemberAccessible(staticType, member, pos);
+        if (member.static !== true) {
+          throw new CompileError(
+            `Member '${staticType.name}.${member.name}' requires an instance receiver.`,
+            pos
+          );
+        }
+        if (member.kind === "function" || member.kind === "method") {
+          throw new CompileError(
+            `Static Function '${staticType.name}.${member.name}' must be called with \`()\`; it cannot be read as a value.`,
+            pos
+          );
+        }
+        if (member.id === NEOSCRIPT_SPRITE_INFO_EMPTY_MEMBER_ID) {
+          return literal(member.type, {
+            ...NEOSCRIPT_SPRITE_INFO_EMPTY_VALUE
+          });
+        }
+        if (member.computed === true) {
+          return {
+            pointer: {
+              type: "callGetter" /* CallGetter */,
+              memberId: member.id,
+              receiver: { kind: "static", memberId: member.id }
+            },
+            type: member.type,
+            symbol: member,
+            ...member.writable ? {
+              writability: member.writability ? toWritability(member.writability) : "setter" /* Setter */
+            } : {}
+          };
+        }
+        return {
+          pointer: {
+            type: "staticMember" /* StaticMember */,
+            memberId: member.id
+          },
+          type: member.type,
+          symbol: member,
+          ...member.writability ? { writability: toWritability(member.writability) } : {}
+        };
+      }
       resolveMemberNatural(receiverAst, name, scope, pos, optional2) {
         if (receiverAst.kind === "ident" && receiverAst.name === "base") {
           const { owner, symbol, receiver: receiver2 } = this.resolveBaseMember(
@@ -9844,7 +9980,7 @@ var init_strict_resolver = __esm({
           }
           return variantPath2;
         }
-        if (receiverAst.kind === "ident" && !scope.lookup(receiverAst.name)) {
+        if (receiverAst.kind === "ident" && !this.hasValueReceiver(receiverAst.name, scope)) {
           if (receiverAst.name === "SpriteInfo" && name === "Empty") {
             return literal(
               { kind: "primitive", name: "SpriteInfo" },
@@ -9886,47 +10022,7 @@ var init_strict_resolver = __esm({
                 pos
               );
             }
-            this.assertMemberAccessible(staticType, member, pos);
-            if (member.static !== true) {
-              throw new CompileError(
-                `Member '${staticType.name}.${name}' requires an instance receiver.`,
-                pos
-              );
-            }
-            if (member.kind === "function" || member.kind === "method") {
-              throw new CompileError(
-                `Static Function '${staticType.name}.${name}' must be called with \`()\`; it cannot be read as a value.`,
-                pos
-              );
-            }
-            if (member.id === NEOSCRIPT_SPRITE_INFO_EMPTY_MEMBER_ID) {
-              return literal(member.type, {
-                ...NEOSCRIPT_SPRITE_INFO_EMPTY_VALUE
-              });
-            }
-            if (member.computed === true) {
-              return {
-                pointer: {
-                  type: "callGetter" /* CallGetter */,
-                  memberId: member.id,
-                  receiver: { kind: "static", memberId: member.id }
-                },
-                type: member.type,
-                symbol: member,
-                ...member.writable ? {
-                  writability: member.writability ? toWritability(member.writability) : "setter" /* Setter */
-                } : {}
-              };
-            }
-            return {
-              pointer: {
-                type: "staticMember" /* StaticMember */,
-                memberId: member.id
-              },
-              type: member.type,
-              symbol: member,
-              ...member.writability ? { writability: toWritability(member.writability) } : {}
-            };
+            return this.resolveStaticMemberValue(staticType, member, pos);
           }
         }
         const resolvedReceiver = this.resolveExpression(receiverAst, scope);
@@ -10716,7 +10812,7 @@ var init_strict_resolver = __esm({
             pos
           );
         }
-        if (callee.receiver.kind === "ident" && !scope.lookup(callee.receiver.name)) {
+        if (callee.receiver.kind === "ident" && !this.hasValueReceiver(callee.receiver.name, scope)) {
           if (callee.receiver.name === MATH_NAMESPACE_NAME) {
             if (callee.optional) {
               throw new CompileError(
@@ -11967,7 +12063,7 @@ var init_strict_resolver = __esm({
           if (implicit?.symbol.static !== true)
             receiverType = this.context.thisClass;
         } else if (expression.kind === "member") {
-          const isStatic = expression.receiver.kind === "ident" && !scope.lookup(expression.receiver.name) && this.project.typeByName.has(expression.receiver.name);
+          const isStatic = expression.receiver.kind === "ident" && !this.hasValueReceiver(expression.receiver.name, scope) && this.project.typeByName.has(expression.receiver.name);
           if (!isStatic) {
             receiverType = this.resolveExpression(expression.receiver, scope).type;
           }
@@ -12673,7 +12769,7 @@ var init_strict_resolver = __esm({
         }
         if (expression.callee.kind !== "member") return null;
         const memberName = expression.callee.name;
-        if (expression.callee.receiver.kind === "ident" && !scope.lookup(expression.callee.receiver.name)) {
+        if (expression.callee.receiver.kind === "ident" && !this.hasValueReceiver(expression.callee.receiver.name, scope)) {
           const staticType = this.project.typeByName.get(
             expression.callee.receiver.name
           );
@@ -13384,6 +13480,9 @@ var init_strict_resolver = __esm({
         }
         return literal(symbol.type, null);
       }
+      hasValueReceiver(name, scope) {
+        return scope.lookup(name) !== null || this.implicitMember(name) !== null;
+      }
       implicitMember(name) {
         if (this.context.implicitMemberAccess !== true) return null;
         const declaring = this.context.declaringType ?? this.context.thisClass;
@@ -13425,6 +13524,53 @@ var init_strict_resolver = __esm({
 });
 
 // ../packages/neoscript-language/src/analyzer.ts
+function scriptFeatureIndex(snapshot) {
+  const cached = SCRIPT_FEATURE_INDEX.get(snapshot);
+  if (cached) return cached;
+  const references = /* @__PURE__ */ new Map();
+  const locals = /* @__PURE__ */ new Map();
+  const calls = /* @__PURE__ */ new Map();
+  const contextualKeywords = /* @__PURE__ */ new Set();
+  const typeAnnotations = /* @__PURE__ */ new Set();
+  for (const reference2 of snapshot.parsed.references) {
+    if (!references.has(reference2.start))
+      references.set(reference2.start, reference2);
+  }
+  for (const local of snapshot.parsed.locals) {
+    const start = snapshot.source.offsetAt(local.nameRange.start);
+    if (!locals.has(start)) locals.set(start, local);
+    if (local.contextualKeywordRange)
+      contextualKeywords.add(
+        snapshot.source.offsetAt(local.contextualKeywordRange.start)
+      );
+    for (const token of local.typeTokens) typeAnnotations.add(token.start);
+  }
+  for (const call of snapshot.parsed.calls) {
+    const start = snapshot.source.offsetAt(call.nameRange.start);
+    if (!calls.has(start)) calls.set(start, call);
+    if (call.kind === "constructor" && call.contextualKeywordRange)
+      contextualKeywords.add(
+        snapshot.source.offsetAt(call.contextualKeywordRange.start)
+      );
+  }
+  const tokens = snapshot.lexed.tokens.filter(
+    (token) => token.kind !== "comment" && token.kind !== "eof"
+  );
+  const tokenIndexes = new Map(
+    tokens.map((token, index2) => [token.start, index2])
+  );
+  const index = {
+    references,
+    locals,
+    calls,
+    contextualKeywords,
+    typeAnnotations,
+    tokens,
+    tokenIndexes
+  };
+  SCRIPT_FEATURE_INDEX.set(snapshot, index);
+  return index;
+}
 function buildProjectIndexWithBuiltins(context) {
   const typeIds = new Set(context.project.types.map((type) => type.id));
   const globalIds3 = new Set(context.project.globals.map((symbol) => symbol.id));
@@ -13684,8 +13830,12 @@ function signatureHelp(snapshot, position) {
 function inlayHints(snapshot, range2) {
   const hints = [];
   for (const call of snapshot.parsed.calls) {
-    const reference2 = snapshot.parsed.references.find(
-      (candidate) => candidate.range.start.line === call.nameRange.start.line && candidate.range.start.character === call.nameRange.start.character
+    if (range2 && !call.argumentRanges.some(
+      (argument2) => comparePositions(argument2.end, range2.start) >= 0 && comparePositions(argument2.start, range2.end) <= 0
+    ))
+      continue;
+    const reference2 = scriptFeatureIndex(snapshot).references.get(
+      snapshot.source.offsetAt(call.nameRange.start)
     );
     const resolution = reference2 ? resolveReference(snapshot, reference2) : null;
     const parameterNames = call.kind === "constructor" ? constructorParameterNames(resolution?.staticType) : resolution?.symbol?.parameters?.map((parameter4) => parameter4.name);
@@ -13698,6 +13848,7 @@ function inlayHints(snapshot, range2) {
         continue;
       }
       const position = firstNonWhitespacePosition(snapshot, argumentRange);
+      if (comparePositions(position, argumentRange.end) >= 0) continue;
       if (range2 && !positionInRange(position, range2)) continue;
       hints.push({
         position,
@@ -13709,10 +13860,10 @@ function inlayHints(snapshot, range2) {
   }
   for (const local of snapshot.parsed.locals) {
     if (!local.inferred || !local.contextualKeywordRange) continue;
-    const type = resolveDeclaredType(local, snapshot);
-    if (type.kind === "primitive" && type.name === "unknown") continue;
     const position = local.nameRange.end;
     if (range2 && !positionInRange(position, range2)) continue;
+    const type = localSymbol(local, snapshot).type;
+    if (type.kind === "primitive" && type.name === "unknown") continue;
     hints.push({
       position,
       label: `: ${formatType(type, snapshot.project)}`,
@@ -13806,6 +13957,7 @@ function documentSymbols(snapshot) {
 }
 function semanticTokens(snapshot) {
   const result = [];
+  const index = scriptFeatureIndex(snapshot);
   for (const token of snapshot.lexed.tokens) {
     if (token.kind === "eof" || token.kind === "error") continue;
     if (token.kind === "keyword" || token.kind === "comment" || token.kind === "string") {
@@ -13829,17 +13981,11 @@ function semanticTokens(snapshot) {
       continue;
     }
     if (token.kind !== "identifier") continue;
-    if (snapshot.parsed.locals.some(
-      (local) => local.contextualKeywordRange?.start.line === token.range.start.line && local.contextualKeywordRange.start.character === token.range.start.character
-    ) || snapshot.parsed.calls.some(
-      (call) => call.kind === "constructor" && call.contextualKeywordRange?.start.line === token.range.start.line && call.contextualKeywordRange.start.character === token.range.start.character
-    )) {
+    if (index.contextualKeywords.has(token.start)) {
       result.push({ range: token.range, type: "keyword", modifiers: [] });
       continue;
     }
-    const declaredLocal = snapshot.parsed.locals.find(
-      (local) => local.nameRange.start.line === token.range.start.line && local.nameRange.start.character === token.range.start.character
-    );
+    const declaredLocal = index.locals.get(token.start);
     if (declaredLocal) {
       const symbol2 = localSymbol(declaredLocal, snapshot);
       result.push({
@@ -13852,9 +13998,7 @@ function semanticTokens(snapshot) {
       });
       continue;
     }
-    const reference2 = snapshot.parsed.references.find(
-      (candidate) => candidate.start === token.start
-    );
+    const reference2 = index.references.get(token.start);
     const resolved = reference2 ? resolveReference(snapshot, reference2) : null;
     if (resolved?.staticType) {
       result.push({
@@ -13906,6 +14050,16 @@ function referenceAtPosition(snapshot, position) {
     snapshot.source.offsetAt(position)
   );
 }
+function localSymbolAtPosition(snapshot, position) {
+  const offset = snapshot.source.offsetAt(position);
+  const declaration = snapshot.parsed.locals.find(
+    (local) => snapshot.source.offsetAt(local.nameRange.start) <= offset && offset <= snapshot.source.offsetAt(local.nameRange.end)
+  );
+  if (declaration) return localSymbol(declaration, snapshot);
+  const reference2 = referenceAtPosition(snapshot, position);
+  const symbol = reference2 ? resolveReference(snapshot, reference2)?.symbol : null;
+  return symbol?.id.startsWith("local:") ? symbol : null;
+}
 function contextualCompletionItems(snapshot, offset, word) {
   const items = [];
   const expectedType = expectedTypeAt(snapshot, word.start);
@@ -14148,6 +14302,14 @@ function expectedTypeAt(snapshot, offset) {
       offset
     );
   }
+  if (snapshot.expressionRange && snapshot.context.returnType) {
+    return expectedCollectionElementType(
+      snapshot.context.returnType,
+      tokens,
+      snapshot.source.offsetAt(snapshot.expressionRange.start),
+      offset
+    );
+  }
   return null;
 }
 function expectedTypeFromComparisonRight(snapshot, offset) {
@@ -14559,16 +14721,12 @@ function resolveReference(snapshot, reference2) {
     );
     if (contextual) return contextual;
   }
-  const tokens = snapshot.lexed.tokens.filter(
-    (token) => token.kind !== "comment" && token.kind !== "eof" && token.end <= reference2.end
-  );
-  const tokenIndex = tokens.findIndex(
-    (token) => token.start === reference2.start
-  );
-  if (tokenIndex < 0) return null;
-  if (!reference2.member) {
+  if (!reference2.member)
     return resolveRoot(snapshot, reference2.name, reference2.start);
-  }
+  const index = scriptFeatureIndex(snapshot);
+  const tokens = index.tokens;
+  const tokenIndex = index.tokenIndexes.get(reference2.start);
+  if (tokenIndex === void 0) return null;
   const dotIndex = tokenIndex - 1;
   const chainTokens = expressionTokensBefore(tokens, dotIndex);
   const receiver = resolveChain(snapshot, chainTokens, reference2.start);
@@ -14576,9 +14734,7 @@ function resolveReference(snapshot, reference2) {
     return resolveContextualSwitchEnumReference(snapshot, reference2);
   }
   const member = resolveMember(snapshot, receiver, reference2.name);
-  const call = snapshot.parsed.calls.find(
-    (call2) => call2.nameRange.start.line === reference2.range.start.line && call2.nameRange.start.character === reference2.range.start.character
-  );
+  const call = index.calls.get(reference2.start);
   return specializeGridQuery(snapshot, member, call?.typeArgumentTokens);
 }
 function specializeGridQuery(snapshot, resolved, typeArguments) {
@@ -14786,9 +14942,7 @@ function selectLambdaResultTokens(body) {
   return semicolon < 0 ? tail : tail.slice(0, semicolon);
 }
 function resolveRoot(snapshot, name, offset) {
-  const symbol = scopeAt(snapshot, offset).find(
-    (candidate) => candidate.name === name
-  );
+  const symbol = scopeAt(snapshot, offset, name)[0];
   if (symbol) return { type: symbol.returnType ?? symbol.type, symbol };
   const typeParameter2 = contextualTypeParameters(snapshot).find(
     (candidate) => candidate.name === name
@@ -14842,18 +14996,18 @@ function resolveMember(snapshot, receiver, name) {
     symbol: member
   };
 }
-function scopeAt(snapshot, offset) {
+function scopeAt(snapshot, offset, name) {
   const result = [];
-  for (const root of snapshot.context.project.roots) {
+  for (const root of namedItems(snapshot.context.project.roots, name)) {
     result.push(withScope(root, 0, snapshot.source.text.length));
   }
   for (const global of [
-    ...snapshot.context.project.globals,
-    ...NEOSCRIPT_GLOBALS
+    ...namedItems(snapshot.context.project.globals, name),
+    ...namedItems(NEOSCRIPT_GLOBALS, name)
   ]) {
     result.push(withScope(global, 0, snapshot.source.text.length));
   }
-  if (snapshot.context.thisClass) {
+  if (snapshot.context.thisClass && (name === void 0 || name === "this")) {
     result.push(
       withScope(
         {
@@ -14868,7 +15022,7 @@ function scopeAt(snapshot, offset) {
       )
     );
   }
-  if (snapshot.context.baseClass) {
+  if (snapshot.context.baseClass && (name === void 0 || name === "base")) {
     result.push(
       withScope(
         {
@@ -14910,7 +15064,7 @@ function scopeAt(snapshot, offset) {
       )
     );
   }
-  if (snapshot.context.dialogueContextType) {
+  if (snapshot.context.dialogueContextType && (name === void 0 || name === "context")) {
     result.push(
       withScope(
         {
@@ -14925,7 +15079,7 @@ function scopeAt(snapshot, offset) {
       )
     );
   }
-  for (const alias of snapshot.context.valueAliases ?? []) {
+  for (const alias of namedItems(snapshot.context.valueAliases ?? [], name)) {
     result.push(
       withScope(
         {
@@ -14944,7 +15098,7 @@ function scopeAt(snapshot, offset) {
   if (snapshot.context.implicitMemberAccess === true && declaringType?.kind === "named") {
     const owner = snapshot.project.typeById.get(declaringType.typeId);
     if (owner) {
-      for (const member of owner.members) {
+      for (const member of namedItems(owner.members, name)) {
         if (snapshot.context.staticMember === true && member.static !== true) {
           continue;
         }
@@ -14953,7 +15107,7 @@ function scopeAt(snapshot, offset) {
       }
     }
   }
-  if (effectiveDocumentKind(snapshot, offset) === "setter" && snapshot.context.returnType) {
+  if ((name === void 0 || name === "value") && effectiveDocumentKind(snapshot, offset) === "setter" && snapshot.context.returnType) {
     result.push(
       withScope(
         {
@@ -14968,19 +15122,47 @@ function scopeAt(snapshot, offset) {
       )
     );
   }
-  for (const parameter4 of snapshot.context.parameters ?? []) {
+  for (const parameter4 of namedItems(snapshot.context.parameters ?? [], name)) {
     result.push(
       parameterSymbol(parameter4, snapshot.uri, snapshot.source.text.length)
     );
   }
-  for (const local of snapshot.parsed.locals) {
-    if (offset < local.scopeStart || offset > local.scopeEnd) continue;
-    result.push(localSymbol(local, snapshot));
+  if (name === void 0) {
+    for (const local of snapshot.parsed.locals) {
+      if (offset < local.scopeStart || offset > local.scopeEnd) continue;
+      result.push(localSymbol(local, snapshot));
+    }
+  } else {
+    let index = LOCAL_SCOPE_INDEX.get(snapshot.parsed.locals);
+    if (!index) {
+      index = new LocalScopeIndex(snapshot.parsed.locals);
+      LOCAL_SCOPE_INDEX.set(snapshot.parsed.locals, index);
+    }
+    const local = index.at(name, offset);
+    if (local) result.push(localSymbol(local, snapshot));
   }
   const byName = /* @__PURE__ */ new Map();
-  for (const symbol of result) byName.set(symbol.name, symbol);
+  for (const symbol of result) {
+    if (name === void 0 || symbol.name === name)
+      byName.set(symbol.name, symbol);
+  }
   return [...byName.values()];
 }
+function namedItems(items, name) {
+  if (name === void 0) return items;
+  let index = NAMED_ITEM_INDEX.get(items);
+  if (!index) {
+    index = /* @__PURE__ */ new Map();
+    for (let i2 = 0; i2 < items.length; i2++) {
+      const key = items[i2].name;
+      const matches = index.get(key);
+      if (matches) matches.push(i2);
+      else index.set(key, [i2]);
+    }
+    NAMED_ITEM_INDEX.set(items, index);
+  }
+  return (index.get(name) ?? []).map((i2) => items[i2]);
+}
 function resolveDeclaredType(local, snapshot) {
   if (local.inferred) return inferLocalType(local, snapshot);
   const tokens = local.typeTokens;
@@ -15474,7 +15656,14 @@ function parameterSymbol(value, uri, documentEnd) {
   );
 }
 function localSymbol(local, snapshot) {
-  return withScope(
+  let symbols = LOCAL_SYMBOL_CACHE.get(snapshot);
+  if (!symbols) {
+    symbols = /* @__PURE__ */ new Map();
+    LOCAL_SYMBOL_CACHE.set(snapshot, symbols);
+  }
+  const cached = symbols.get(local);
+  if (cached) return cached;
+  const symbol = withScope(
     {
       id: `local:${snapshot.uri}:${local.nameRange.start.line}:${local.nameRange.start.character}`,
       name: local.name,
@@ -15486,6 +15675,8 @@ function localSymbol(local, snapshot) {
     local.scopeStart,
     local.scopeEnd
   );
+  symbols.set(local, symbol);
+  return symbol;
 }
 function inferLambdaParameterType(local, snapshot) {
   const explicit = resolveDeclaredType(local, snapshot);
@@ -15850,18 +16041,16 @@ function comparePositions(left, right) {
   return left.line === right.line ? left.character - right.character : left.line - right.line;
 }
 function isTypeAnnotationReference(snapshot, reference2) {
-  return snapshot.parsed.locals.some(
-    (local) => local.typeTokens.some((token) => token.start === reference2.start)
-  );
+  return scriptFeatureIndex(snapshot).typeAnnotations.has(reference2.start);
 }
 function isConstructorTypeReference(snapshot, reference2) {
-  return snapshot.parsed.calls.some(
-    (call) => call.kind === "constructor" && call.nameRange.start.line === reference2.range.start.line && call.nameRange.start.character === reference2.range.start.character
-  );
+  return scriptFeatureIndex(snapshot).calls.get(reference2.start)?.kind === "constructor";
 }
+var SCRIPT_FEATURE_INDEX, LOCAL_SCOPE_INDEX, NAMED_ITEM_INDEX, LOCAL_SYMBOL_CACHE;
 var init_analyzer = __esm({
   "../packages/neoscript-language/src/analyzer.ts"() {
     "use strict";
+    init_local_scope_index();
     init_cell_pattern();
     init_tile_conversion();
     init_syntax_index();
@@ -15870,6 +16059,10 @@ var init_analyzer = __esm({
     init_executable_parser();
     init_strict_resolver();
     init_project();
+    SCRIPT_FEATURE_INDEX = /* @__PURE__ */ new WeakMap();
+    LOCAL_SCOPE_INDEX = /* @__PURE__ */ new WeakMap();
+    NAMED_ITEM_INDEX = /* @__PURE__ */ new WeakMap();
+    LOCAL_SYMBOL_CACHE = /* @__PURE__ */ new WeakMap();
   }
 });
 
@@ -19131,16 +19324,34 @@ function documentPrefix(text, position) {
   ].join("\n");
 }
 function projectTokenAt(document, position) {
-  const offset = new SourceText(document.text).offsetAt(position);
+  return projectTokens(document)[projectTokenIndexAt(document, position)];
+}
+function projectTokenIndexAt(document, position) {
+  const offset = projectSourceText(document).offsetAt(position);
   const tokens = projectTokens(document);
-  const containing = tokens.find(
-    (token) => token.start <= offset && offset < token.end
-  );
-  if (isProjectNameToken(containing)) return containing;
-  const touching = tokens.find(
-    (token) => isProjectNameToken(token) && token.end === offset
-  );
-  return touching ?? containing;
+  let low = 0;
+  let high = tokens.length;
+  while (low < high) {
+    const middle = low + high >>> 1;
+    if (tokens[middle].start <= offset) low = middle + 1;
+    else high = middle;
+  }
+  const candidate = tokens[low - 1];
+  const containing = candidate && offset < candidate.end ? low - 1 : -1;
+  if (isProjectNameToken(tokens[containing])) return containing;
+  const touching = isProjectNameToken(candidate) && candidate.end === offset ? low - 1 : low - 2;
+  if (isProjectNameToken(tokens[touching]) && tokens[touching].end === offset) {
+    return touching;
+  }
+  return containing;
+}
+function projectSourceText(document) {
+  let source = PROJECT_SOURCE_CACHE.get(document);
+  if (!source) {
+    source = new SourceText(document.text);
+    PROJECT_SOURCE_CACHE.set(document, source);
+  }
+  return source;
 }
 function isProjectNameToken(token) {
   return token !== void 0 && (token.kind === "identifier" || token.kind === "type" || token.kind === "keyword");
@@ -19148,7 +19359,7 @@ function isProjectNameToken(token) {
 function projectTokens(document) {
   const cached = PROJECT_TOKEN_CACHE.get(document);
   if (cached) return cached;
-  const source = new SourceText(document.text);
+  const source = projectSourceText(document);
   const tokens = lex(document.text).tokens.flatMap(
     (token) => {
       if (token.kind !== "string" || !token.raw.startsWith('"""')) {
@@ -19248,18 +19459,16 @@ function tripleInterpolationEnd(text, start, limit) {
   }
   return null;
 }
-function rangesEqual(left, right) {
-  return positionCompare2(left.start, right.start) === 0 && positionCompare2(left.end, right.end) === 0;
-}
 function positionCompare2(left, right) {
   return left.line === right.line ? left.character - right.character : left.line - right.line;
 }
-var PROJECT_TOKEN_CACHE;
+var PROJECT_SOURCE_CACHE, PROJECT_TOKEN_CACHE;
 var init_project_source_tokens = __esm({
   "../packages/neoscript-language/src/project-source-tokens.ts"() {
     "use strict";
     init_lexer();
     init_source_text();
+    PROJECT_SOURCE_CACHE = /* @__PURE__ */ new WeakMap();
     PROJECT_TOKEN_CACHE = /* @__PURE__ */ new WeakMap();
   }
 });
@@ -25783,18 +25992,25 @@ var init_project_source_semantics = __esm({
 });
 
 // ../packages/neoscript-language/src/project-source-accessors.ts
-function findProjectSourceAccessorBody(source, keyword, containingRange) {
-  if (source.length === 0) return null;
+function projectSourceAccessors(source, containingRange) {
   const full = new SourceText(source);
   const range2 = containingRange ?? full.fullRange();
   const bodyStart = full.offsetAt(range2.start);
-  const bodyEnd = full.offsetAt(range2.end);
-  const body = source.slice(bodyStart, bodyEnd);
-  const tokens = lex(body).roots.filter((token) => token.kind !== "comment");
+  const tokens = lex(
+    source.slice(bodyStart, full.offsetAt(range2.end))
+  ).roots.filter((token) => token.kind !== "comment");
   if (isToken(tokens[0], "operator", "=>")) {
-    if (keyword !== "get") return null;
-    return expressionAccessor(source, full, tokens, bodyStart, 1);
+    return [
+      {
+        keyword: "get",
+        form: "expression",
+        range: range2,
+        parameters: null,
+        body: expressionAccessor(source, full, tokens, bodyStart, 1)
+      }
+    ];
   }
+  const accessors = [];
   let depth = 0;
   for (let index = 0; index < tokens.length; index++) {
     const token = tokens[index];
@@ -25806,44 +26022,66 @@ function findProjectSourceAccessorBody(source, keyword, containingRange) {
       depth--;
       continue;
     }
-    if (depth !== 1 || token.kind !== "identifier" && token.kind !== "keyword" || token.text !== keyword) {
+    if (depth !== 1 || token.kind !== "identifier" && token.kind !== "keyword" || token.text !== "get" && token.text !== "set")
       continue;
-    }
     let openIndex = index + 1;
+    let parameters = null;
     if (isToken(tokens[openIndex], "punctuation", "(")) {
+      const firstParameter = ++openIndex;
       let parameterDepth = 1;
-      for (let cursor = openIndex + 1; cursor < tokens.length; cursor++) {
-        const candidate = tokens[cursor];
-        if (isToken(candidate, "punctuation", "(")) parameterDepth++;
-        if (isToken(candidate, "punctuation", ")")) parameterDepth--;
-        if (parameterDepth !== 0) continue;
-        openIndex = cursor + 1;
-        break;
+      for (; openIndex < tokens.length; openIndex++) {
+        if (isToken(tokens[openIndex], "punctuation", "(")) parameterDepth++;
+        if (isToken(tokens[openIndex], "punctuation", ")")) parameterDepth--;
+        if (parameterDepth === 0) break;
       }
-      if (parameterDepth !== 0) return null;
+      parameters = tokens.slice(firstParameter, openIndex);
+      openIndex++;
     }
     const open = tokens[openIndex];
+    let body = null;
+    let form = isToken(open, "punctuation", ";") ? "contract" : "invalid";
     if (isToken(open, "operator", "=>")) {
-      return expressionAccessor(source, full, tokens, bodyStart, openIndex + 1);
-    }
-    if (open === void 0 || !isToken(open, "punctuation", "{")) return null;
-    let accessorDepth = 1;
-    for (let cursor = openIndex + 1; cursor < tokens.length; cursor++) {
-      const candidate = tokens[cursor];
-      if (isToken(candidate, "punctuation", "{")) accessorDepth++;
-      if (isToken(candidate, "punctuation", "}")) accessorDepth--;
-      if (accessorDepth !== 0) continue;
-      const start = bodyStart + open.end;
-      const end = bodyStart + candidate.start;
-      return {
-        range: full.range(start, end),
-        source: source.slice(start, end),
-        form: "block"
-      };
+      form = "expression";
+      body = expressionAccessor(source, full, tokens, bodyStart, openIndex + 1);
+      if (body) {
+        const end = full.offsetAt(body.range.end) - bodyStart;
+        while (openIndex + 1 < tokens.length && tokens[openIndex + 1].start < end)
+          openIndex++;
+      }
+    } else if (isToken(open, "punctuation", "{")) {
+      form = "block";
+      let accessorDepth = 1;
+      for (let cursor = openIndex + 1; cursor < tokens.length; cursor++) {
+        const candidate = tokens[cursor];
+        if (isToken(candidate, "punctuation", "{")) accessorDepth++;
+        if (isToken(candidate, "punctuation", "}")) accessorDepth--;
+        if (accessorDepth !== 0) continue;
+        const start = bodyStart + open.end;
+        const end = bodyStart + candidate.start;
+        body = {
+          range: full.range(start, end),
+          source: source.slice(start, end),
+          form: "block"
+        };
+        openIndex = cursor;
+        break;
+      }
     }
-    return null;
+    accessors.push({
+      keyword: token.text,
+      form,
+      range: full.range(bodyStart + token.start, bodyStart + token.end),
+      parameters,
+      body
+    });
+    index = Math.max(index, openIndex);
   }
-  return null;
+  return accessors;
+}
+function findProjectSourceAccessorBody(source, keyword, containingRange) {
+  return projectSourceAccessors(source, containingRange).find(
+    (accessor) => accessor.keyword === keyword
+  )?.body ?? null;
 }
 function isToken(token, kind, text) {
   return token?.kind === kind && token.text === text;
@@ -26078,9 +26316,10 @@ function compileBody(args) {
     memberName: args.memberName,
     unit: args.unit,
     range: args.range,
-    context: args.context
+    context: args.context,
+    ...args.bodyMode ? { bodyMode: args.bodyMode } : {}
   });
-  const source = new SourceText(args.document.sourceText);
+  const source = args.document.syntax.source;
   const start = source.offsetAt(args.range.start);
   const end = source.offsetAt(args.range.end);
   const result = compileNeoScriptStrict(
@@ -26435,7 +26674,9 @@ function sourceMemberSymbol(member, owner, typeIds, source) {
     };
   }
   if (member.kind === "property") {
-    const hasSetter = findProjectSourceAccessorBody(source, "set", member.body.range) !== null || /\bset\s*;/.test(member.body.text);
+    const hasSetter = projectSourceAccessors(source, member.body.range).some(
+      (accessor) => accessor.keyword === "set"
+    );
     return {
       ...common,
       kind: "property",
@@ -27463,6 +27704,8 @@ function validateMemberTypeKind(uri, type, context, name, diagnostics) {
 function validateMembers(environment, diagnostics) {
   for (const ref of environment.interfaces.values()) {
     for (const member of ref.declaration.members) {
+      if (member.kind === "property")
+        validatePropertyAccessors(ref, member, diagnostics);
       if (member.kind === "field") {
         diagnose(
           diagnostics,
@@ -27723,35 +27966,96 @@ function validateClassMemberModifiers(ref, environment, diagnostics) {
         related(ref.location, "The containing class is declared here.")
       );
     }
-    if (member.kind === "property" && !modifiers.has("abstract") && findProjectSourceAccessorBody(member.body.text, "get") === null) {
+    if (member.kind === "property")
+      validatePropertyAccessors(ref, member, diagnostics);
+    if (modifiers.has("abstract") && member.kind === "field" && member.initializer) {
+      diagnose(
+        diagnostics,
+        ref.uri,
+        member.initializer.range,
+        "abstract-member-initializer",
+        `Abstract member '${member.name}' cannot declare a default initializer.`
+      );
+    }
+  }
+}
+function validatePropertyAccessors(ref, member, diagnostics) {
+  const accessors = projectSourceAccessors(member.body.text);
+  const isInterface = ref.declaration.kind === "interface";
+  const isAbstract = member.modifiers.includes("abstract");
+  const contract = isInterface || isAbstract;
+  const seen = /* @__PURE__ */ new Set();
+  for (const accessor of accessors) {
+    if (seen.has(accessor.keyword)) {
       diagnose(
         diagnostics,
         ref.uri,
         member.nameRange,
-        "concrete-property-getter-body",
-        `Property '${ref.declaration.name}.${member.name}' requires a getter body. Implement 'get { return ...; }' or 'get => ...;', declare the property abstract in an abstract class, or use a field with an initializer for stored data.`
+        "duplicate-property-accessor",
+        `Property '${ref.declaration.name}.${member.name}' declares more than one '${accessor.keyword}' accessor.`
       );
     }
-    if (modifiers.has("abstract") && member.kind === "field" && member.initializer) {
+    seen.add(accessor.keyword);
+    if (accessor.form === "invalid") {
       diagnose(
         diagnostics,
         ref.uri,
-        member.initializer.range,
-        "abstract-member-initializer",
-        `Abstract member '${member.name}' cannot declare a default initializer.`
+        member.nameRange,
+        "invalid-property-accessor",
+        `Property '${ref.declaration.name}.${member.name}' accessor '${accessor.keyword}' requires a body or a semicolon for an abstract/interface contract.`
       );
     }
-    if (modifiers.has("abstract") && member.kind === "property" && (member.body.expression !== void 0 || /\b(?:get|set)\s*\{/.test(member.body.text))) {
+    const parameters = accessor.parameters;
+    if (parameters !== null) {
+      const actual = parameters.map((token) => token.text);
+      const expected = accessor.keyword === "get" ? "" : `${accessorTypeName(member.type)} value`;
+      const expectedTokens = lex(expected).roots.filter((token) => token.kind !== "eof").map((token) => token.text);
+      if (actual.length !== expectedTokens.length || actual.some((token, index) => token !== expectedTokens[index])) {
+        const signature = accessor.keyword === "get" ? "get" : `set(${accessorTypeName(member.type)} value)`;
+        diagnose(
+          diagnostics,
+          ref.uri,
+          member.nameRange,
+          "property-accessor-signature",
+          `Property '${ref.declaration.name}.${member.name}' requires '${signature}'; accessor parameters must match the property type and use the name 'value' for a setter.`
+        );
+      }
+    }
+    if (contract && (accessor.form === "block" || accessor.form === "expression")) {
       diagnose(
         diagnostics,
         ref.uri,
         member.body.range,
-        "abstract-member-body",
-        `Abstract property '${member.name}' can declare accessor contracts but cannot implement an accessor body.`
+        isInterface ? "interface-property-body" : "abstract-member-body",
+        `${isInterface ? "Interface" : "Abstract"} property '${member.name}' can declare accessor contracts but cannot implement an accessor body.`
       );
     }
+    if (!contract && accessor.keyword === "set" && accessor.body === null) {
+      diagnose(
+        diagnostics,
+        ref.uri,
+        member.nameRange,
+        "concrete-property-setter-body",
+        `Property '${ref.declaration.name}.${member.name}' requires a setter body. Implement 'set(${accessorTypeName(member.type)} value) { ... }', or remove the setter for a read-only property.`
+      );
+    }
+  }
+  if (!contract && !accessors.some(
+    (accessor) => accessor.keyword === "get" && accessor.body !== null
+  )) {
+    diagnose(
+      diagnostics,
+      ref.uri,
+      member.nameRange,
+      "concrete-property-getter-body",
+      `Property '${ref.declaration.name}.${member.name}' requires a getter body. Implement 'get { return ...; }' or 'get => ...;', declare the property abstract in an abstract class, or use a field with an initializer for stored data.`
+    );
   }
 }
+function accessorTypeName(type) {
+  const argumentsText = type.typeArguments.length ? `<${type.typeArguments.map(accessorTypeName).join(",")}>` : "";
+  return `${type.name}${argumentsText}${type.nullable ? "?" : ""}`;
+}
 function validateClassOverrides(ref, environment, diagnostics) {
   const inherited = inheritedClassMembers(ref, environment);
   for (const member of ref.declaration.members) {
@@ -28144,10 +28448,10 @@ function valueAccessors(member, environment) {
     };
   }
   if (member.kind === "function") return { get: false, set: false };
-  if (member.body.expression) return { get: true, set: false };
+  const accessors = projectSourceAccessors(member.body.text);
   return {
-    get: /\bget\b/.test(member.body.text),
-    set: /\bset\b/.test(member.body.text)
+    get: accessors.some((accessor) => accessor.keyword === "get"),
+    set: accessors.some((accessor) => accessor.keyword === "set")
   };
 }
 function resolvedSourceMemberStorage(owner, member, environment, seen = /* @__PURE__ */ new Set()) {
@@ -28327,6 +28631,7 @@ var init_project_source_type_checker = __esm({
     "use strict";
     init_language_spec();
     init_project_source_ast();
+    init_lexer();
     init_project_source_accessors();
     init_project_source_identifiers();
     BUILTIN_ARITY = /* @__PURE__ */ new Map([
@@ -29658,7 +29963,7 @@ function projectCompletions(analysis, document, position) {
   return projectFallbackCompletions(analysis, document, position);
 }
 function projectAnnotationCompletions(analysis, document, position) {
-  const source = new SourceText(document.text);
+  const source = projectSourceText(document);
   const offset = source.offsetAt(position);
   const word = projectWordRange(document.text, offset);
   if (document.text[word.start - 1] !== "@") return null;
@@ -29686,7 +29991,7 @@ function projectAnnotationNamesAt(analysis, document, position) {
   if (document.languageId === "neoflow") {
     return ["id", "primary", "incomplete"];
   }
-  const offset = new SourceText(document.text).offsetAt(position);
+  const offset = projectSourceText(document).offsetAt(position);
   const followingDeclaration = /^\s*(class|interface|enum)\b([^{}]*)/.exec(
     document.text.slice(offset)
   );
@@ -29738,7 +30043,7 @@ function projectMemberAnnotationNames(member) {
   return names;
 }
 function projectContextualEnumCompletions(analysis, document, position) {
-  const source = new SourceText(document.text);
+  const source = projectSourceText(document);
   const offset = source.offsetAt(position);
   const word = projectWordRange(document.text, offset);
   if (!isContextualDot(document.text, word.start)) return null;
@@ -29866,7 +30171,7 @@ function projectAfterNewAt(analysis, document, position) {
   );
   let cursor = tokens.length - 1;
   const current = tokens[cursor];
-  const offset = new SourceText(document.text).offsetAt(position);
+  const offset = projectSourceText(document).offsetAt(position);
   if (current?.kind === "identifier" && current.text !== "new" && /[A-Za-z0-9_]$/.test(document.text.slice(0, offset))) {
     cursor--;
   }
@@ -29899,10 +30204,35 @@ function projectTypeNameAssignable(analysis, sourceName, targetName) {
   };
   return derivesFrom(source.id);
 }
+function projectBodies(analysis, uri) {
+  let byUri = PROJECT_BODIES.get(analysis);
+  if (!byUri) {
+    byUri = /* @__PURE__ */ new Map();
+    for (const body of analysis.bodyContexts) {
+      const bodies = byUri.get(body.uri);
+      if (bodies) bodies.push(body);
+      else byUri.set(body.uri, [body]);
+    }
+    for (const bodies of byUri.values())
+      bodies.sort((a, b) => positionCompare2(a.range.end, b.range.end));
+    PROJECT_BODIES.set(analysis, byUri);
+  }
+  return byUri.get(uri) ?? [];
+}
+function rangeItemAt(items, position) {
+  let low = 0;
+  let high = items.length;
+  while (low < high) {
+    const middle = low + high >>> 1;
+    if (positionCompare2(items[middle].range.end, position) < 0)
+      low = middle + 1;
+    else high = middle;
+  }
+  const item = items[low];
+  return item && rangeContains(item.range, position) ? item : void 0;
+}
 function projectBodySnapshotAt(analysis, document, position) {
-  const body = analysis.bodyContexts.find(
-    (candidate) => candidate.uri === document.uri && rangeContains(candidate.range, position)
-  );
+  const body = rangeItemAt(projectBodies(analysis, document.uri), position);
   return body ? projectBodySnapshot(analysis, document, body) : null;
 }
 function projectBodySnapshot(analysis, document, body) {
@@ -29913,30 +30243,35 @@ function projectBodySnapshot(analysis, document, body) {
   }
   const cached = snapshots.get(body);
   if (cached) return cached;
-  const source = new SourceText(document.text);
+  const source = projectSourceText(document);
   const start = source.offsetAt(body.range.start);
   const end = source.offsetAt(body.range.end);
-  const text = maskOutsideProjectBody(document.text, start, end);
-  const syntax = analyzeNeoScriptSyntax(text, body.context.kind);
+  const lexed = analysis.documents.get(document.uri)?.syntax ?? lex(document.text);
+  const syntax = analyzeNeoScriptSyntax(
+    document.text,
+    body.context.kind,
+    sliceLexResult(lexed, start, end)
+  );
   const context = { ...body.context, project: analysis.project };
   const snapshot = {
     uri: document.uri,
+    ...body.bodyMode === "expression" ? { expressionRange: body.range } : {},
     source: syntax.lexed.source,
     lexed: syntax.lexed,
     parsed: syntax.parsed,
     context,
-    project: buildProjectIndexWithBuiltins(context)
+    project: projectBodyIndex(analysis, context)
   };
   snapshots.set(body, snapshot);
   return snapshot;
 }
-function maskOutsideProjectBody(text, start, end) {
-  let masked = "";
-  for (let index = 0; index < text.length; index++) {
-    const character = text[index] ?? "";
-    masked += index >= start && index < end || character === "\n" || character === "\r" ? character : " ";
+function projectBodyIndex(analysis, context) {
+  let index = PROJECT_BODY_INDEX_CACHE.get(analysis);
+  if (!index) {
+    index = buildProjectIndexWithBuiltins(context);
+    PROJECT_BODY_INDEX_CACHE.set(analysis, index);
   }
-  return masked;
+  return index;
 }
 function projectWordRange(text, offset) {
   let start = offset;
@@ -29949,9 +30284,9 @@ function isContextualDot(text, wordStart) {
   while (cursor >= 0 && /\s/.test(text[cursor] ?? "")) cursor--;
   const beforeDot = text[cursor];
   if (beforeDot !== void 0 && /[A-Za-z0-9_]/.test(beforeDot)) {
-    const precedingWord = /[A-Za-z_][A-Za-z0-9_]*$/.exec(
-      text.slice(0, cursor + 1)
-    )?.[0];
+    let start = cursor;
+    while (start > 0 && /[A-Za-z0-9_]/.test(text[start - 1])) start--;
+    const precedingWord = text.slice(start, cursor + 1);
     return precedingWord === "return" || precedingWord === "case";
   }
   return beforeDot === void 0 || !/[A-Za-z0-9_\])}]/.test(beforeDot);
@@ -30012,54 +30347,44 @@ function projectClassBasePositionAt(analysis, document, position) {
   return true;
 }
 function sourceTypeAt(document, position) {
-  const contains2 = (type) => {
-    for (const argument2 of type.typeArguments) {
+  const contains2 = (type2) => {
+    for (const argument2 of type2.typeArguments) {
       const nested = contains2(argument2);
       if (nested) return nested;
     }
-    return rangeContains(type.range, position) ? type : null;
+    return rangeContains(type2.range, position) ? type2 : null;
   };
-  const parameterType = (parameters) => {
-    for (const parameter4 of parameters ?? []) {
-      const match = contains2(parameter4.type);
-      if (match) return match;
-    }
-    return null;
-  };
-  for (const declaration of document.declarations) {
-    if (declaration.kind === "global") {
-      const match = contains2(declaration.type);
-      if (match) return match;
-      continue;
-    }
-    if (declaration.kind === "enum") continue;
-    for (const base of declaration.baseTypes) {
-      const match = contains2(base);
-      if (match) return match;
-    }
-    if (declaration.kind === "class") {
-      const header = parameterType(declaration.headerParameters);
-      if (header) return header;
-      for (const generic of declaration.genericParameters) {
-        if (!generic.constraint) continue;
-        const match = contains2(generic.constraint);
-        if (match) return match;
+  let types = SOURCE_TYPES.get(document);
+  if (!types) {
+    types = [];
+    const parameters = (items) => {
+      for (const parameter4 of items ?? []) types.push(parameter4.type);
+    };
+    for (const declaration of document.declarations) {
+      if (declaration.kind === "global") {
+        types.push(declaration.type);
+        continue;
       }
-      for (const constructor2 of declaration.constructors) {
-        const match = parameterType(constructor2.parameters);
-        if (match) return match;
+      if (declaration.kind === "enum") continue;
+      types.push(...declaration.baseTypes);
+      if (declaration.kind === "class") {
+        parameters(declaration.headerParameters);
+        for (const generic of declaration.genericParameters) {
+          if (generic.constraint) types.push(generic.constraint);
+        }
+        for (const constructor2 of declaration.constructors)
+          parameters(constructor2.parameters);
       }
-    }
-    for (const member of declaration.members) {
-      const memberType2 = contains2(member.type);
-      if (memberType2) return memberType2;
-      if (member.kind === "function") {
-        const match = parameterType(member.parameters);
-        if (match) return match;
+      for (const member of declaration.members) {
+        types.push(member.type);
+        if (member.kind === "function") parameters(member.parameters);
       }
     }
+    types.sort((a, b) => positionCompare2(a.range.end, b.range.end));
+    SOURCE_TYPES.set(document, types);
   }
-  return null;
+  const type = rangeItemAt(types, position);
+  return type ? contains2(type) : null;
 }
 function projectMemberCompletions(analysis, document, position) {
   const owner = projectMemberCompletionOwnerToken(document, position);
@@ -30436,6 +30761,7 @@ function projectCompletionKind(symbol) {
     case "constructor":
       return "method";
     case "parameter":
+    case "local":
     case "flowBinding":
     case "graphChild":
     case "global":
@@ -30677,7 +31003,7 @@ function requiredDestinationEdit(sourceDocument, document, initializer, destinat
     };
   }
   if (initializer.body.kind !== "block") return null;
-  const source = new SourceText(document.text);
+  const source = projectSourceText(document);
   const start = source.offsetAt(initializer.body.range.start);
   const end = source.offsetAt(initializer.body.range.end);
   const tokens = sourceDocument.syntax.tokens;
@@ -30756,9 +31082,7 @@ function projectSignatureHelp(analysis, document, position) {
   };
 }
 function projectInlayHints(analysis, document, range2) {
-  const bodyContexts = analysis.bodyContexts.filter(
-    (body) => body.uri === document.uri
-  );
+  const bodyContexts = projectBodies(analysis, document.uri);
   const tokens = projectDocumentTokens(analysis, document).filter(
     (token) => token.kind !== "comment" && token.kind !== "eof"
   );
@@ -30767,19 +31091,28 @@ function projectInlayHints(analysis, document, range2) {
     document
   );
   const hints = [];
+  const delimiterEnds = projectDelimiterEnds(tokens);
   for (let index = 0; index < tokens.length - 1; index++) {
     const callee = tokens[index];
     const open = tokens[index + 1];
     if (!callee || callee.kind !== "identifier" && callee.kind !== "type") {
       continue;
     }
-    if (bodyContexts.some((body) => rangeContains(body.range, callee.range.start))) {
+    if (rangeItemAt(bodyContexts, callee.range.start)) {
       continue;
     }
     if (!open || open.text !== "(") continue;
     const beforeCallee = tokens[index - 1];
     if (beforeCallee?.text === "@") continue;
     if (declarationNames.has(positionKey(callee.range.start))) continue;
+    if (range2 && positionCompare2(callee.range.start, range2.end) > 0) break;
+    const callArguments2 = projectCallArguments(
+      tokens,
+      index + 1,
+      delimiterEnds
+    );
+    if (range2 && !callArguments2.some((argument2) => rangeContains(range2, argument2.start)))
+      continue;
     const parameterNames = projectCallParameterNames(
       analysis,
       document,
@@ -30787,7 +31120,6 @@ function projectInlayHints(analysis, document, range2) {
       beforeCallee
     );
     if (!parameterNames) continue;
-    const callArguments2 = projectCallArguments(tokens, index + 1);
     for (let argument2 = 0; argument2 < callArguments2.length; argument2++) {
       const argumentToken = callArguments2[argument2];
       if (!argumentToken || argumentToken.named) continue;
@@ -30806,6 +31138,8 @@ function projectInlayHints(analysis, document, range2) {
     }
   }
   for (const body of bodyContexts) {
+    if (range2 && (positionCompare2(body.range.end, range2.start) < 0 || positionCompare2(body.range.start, range2.end) > 0))
+      continue;
     const snapshot = projectBodySnapshot(analysis, document, body);
     hints.push(
       ...inlayHints(snapshot, range2).filter(
@@ -30850,19 +31184,31 @@ function projectCallParameterNames(analysis, document, callee, beforeCallee) {
     return names.size === 1 && name ? name : null;
   });
 }
-function projectCallArguments(tokens, openIndex) {
+function projectDelimiterEnds(tokens) {
+  const ends = /* @__PURE__ */ new Map();
+  const stack = [];
+  for (let index = 0; index < tokens.length; index++) {
+    const text = tokens[index].text;
+    if (text === "(" || text === "[" || text === "{") stack.push(index);
+    else if (text === ")" || text === "]" || text === "}") {
+      const open = stack.pop();
+      if (open !== void 0) ends.set(open, index);
+    }
+  }
+  return ends;
+}
+function projectCallArguments(tokens, openIndex, delimiterEnds) {
   const result = [];
-  let depth = 0;
   let atArgumentStart = true;
   for (let index = openIndex + 1; index < tokens.length; index++) {
     const token = tokens[index];
     if (!token) break;
-    if (depth === 0 && token.text === ")") break;
-    if (depth === 0 && token.text === ",") {
+    if (token.text === ")") break;
+    if (token.text === ",") {
       atArgumentStart = true;
       continue;
     }
-    if (depth === 0 && atArgumentStart) {
+    if (atArgumentStart) {
       result.push({
         start: token.range.start,
         named: token.kind === "identifier" && tokens[index + 1]?.text === ":",
@@ -30871,9 +31217,7 @@ function projectCallArguments(tokens, openIndex) {
       atArgumentStart = false;
     }
     if (token.text === "(" || token.text === "[" || token.text === "{") {
-      depth++;
-    } else if (token.text === ")" || token.text === "]" || token.text === "}") {
-      if (depth > 0) depth--;
+      index = delimiterEnds.get(index) ?? tokens.length;
     }
   }
   return result;
@@ -30988,6 +31332,7 @@ function projectSemanticTokenType(symbol) {
       return symbol.callable ? "method" : "property";
     case "constructor":
       return "method";
+    case "local":
     case "graphChild":
     case "flowBinding":
     case "global":
@@ -30998,9 +31343,13 @@ function symbolRangeKey(range2) {
   return `${range2.start.line}:${range2.start.character}-${range2.end.line}:${range2.end.character}`;
 }
 function buildProjectSymbolIndex(symbols) {
+  const cached = PROJECT_SYMBOL_INDEX_CACHE.get(symbols);
+  if (cached) return cached;
   const byLocation = /* @__PURE__ */ new Map();
   const byName = /* @__PURE__ */ new Map();
+  const byId = /* @__PURE__ */ new Map();
   for (const symbol of symbols) {
+    if (symbol.id !== null) byId.set(symbol.id, symbol);
     let uriBucket = byLocation.get(symbol.location.uri);
     if (!uriBucket) {
       uriBucket = /* @__PURE__ */ new Map();
@@ -31014,7 +31363,9 @@ function buildProjectSymbolIndex(symbols) {
     if (named) named.push(symbol);
     else byName.set(symbol.name, [symbol]);
   }
-  return { byLocation, byName };
+  const index = { byLocation, byName, byId };
+  PROJECT_SYMBOL_INDEX_CACHE.set(symbols, index);
+  return index;
 }
 function symbolsDeclaredAt(index, uri, range2) {
   return index.byLocation.get(uri)?.get(symbolRangeKey(range2)) ?? [];
@@ -31022,16 +31373,14 @@ function symbolsDeclaredAt(index, uri, range2) {
 function projectSemanticTokens(document, analysis) {
   const index = buildProjectSymbolIndex(analysis.symbols);
   const tokens = projectTokens(document);
-  const bodyContexts = analysis.bodyContexts.filter(
-    (body) => body.uri === document.uri
-  );
+  const bodyContexts = projectBodies(analysis, document.uri);
   const result = tokens.flatMap((token, tokenIndex) => {
     if (token.kind === "eof" || token.kind === "error") return [];
-    if (bodyContexts.some((body) => rangeContains(body.range, token.range.start))) {
+    if (rangeItemAt(bodyContexts, token.range.start)) {
       return [];
     }
     const declaration = symbolsDeclaredAt(index, document.uri, token.range)[0];
-    const resolved = isProjectNameToken(token) ? indexedProjectSymbolAt(analysis, document, token.range.start, index)?.symbol : void 0;
+    const resolved = !declaration && isProjectNameToken(token) ? indexedProjectSymbolAt(analysis, document, token.range.start, index)?.symbol : void 0;
     let type;
     if (declaration) {
       type = projectSemanticTokenType(declaration);
@@ -31078,32 +31427,40 @@ function isProjectContextualKeyword(tokens, tokenIndex) {
   if (token?.text !== "new") return false;
   return next?.text === "(" || next?.text === "{" || next?.kind === "identifier" || next?.kind === "type";
 }
-function projectSymbolAt(analysis, document, position) {
-  return indexedProjectSymbolAt(
-    analysis,
-    document,
-    position,
-    buildProjectSymbolIndex(analysis.symbols)
-  );
+function projectSymbolAt(analysis, document, position, index = buildProjectSymbolIndex(analysis.symbols)) {
+  return indexedProjectSymbolAt(analysis, document, position, index);
 }
 function indexedProjectSymbolAt(analysis, document, position, index) {
-  const token = projectTokenAt(document, position);
+  const tokenIndex = projectTokenIndexAt(document, position);
+  const sourceTokens = projectTokens(document);
+  const token = sourceTokens[tokenIndex];
   if (!isProjectNameToken(token)) return null;
   const body = projectBodySnapshotAt(analysis, document, position);
   if (body) {
+    const local = localSymbolAtPosition(body, position);
+    if (local?.location) {
+      return {
+        token,
+        symbol: {
+          kind: "local",
+          id: local.id,
+          name: local.name,
+          location: local.location
+        }
+      };
+    }
     const reference2 = referenceAtPosition(body, position);
     const symbolId = reference2 ? resolveReferenceSymbolId(body, reference2) : null;
-    const symbol = symbolId ? analysis.symbols.find((candidate) => candidate.id === symbolId) : void 0;
+    const executable = symbolId ? body.project.symbolById.get(symbolId) : void 0;
+    const location3 = executable?.selectionLocation ?? executable?.location;
+    const located = location3 ? symbolsDeclaredAt(index, location3.uri, location3.range)[0] : void 0;
+    const symbol = located ?? (symbolId ? index.byId.get(symbolId) : void 0);
     if (symbol) return { token, symbol };
   }
   const exact = symbolsDeclaredAt(index, document.uri, token.range);
   if (exact.length === 1) return { token, symbol: exact[0] };
   const candidates = index.byName.get(token.text) ?? [];
   if (candidates.length === 0) return null;
-  const sourceTokens = projectTokens(document);
-  const tokenIndex = sourceTokens.findIndex(
-    (candidate) => candidate.start === token.start && candidate.end === token.end
-  );
   const source = analysis.documents.get(document.uri);
   const typePosition = source && sourceTypeAt(source, token.range.start);
   if (typePosition || sourceTokens[tokenIndex - 1]?.text === "new") {
@@ -31275,6 +31632,7 @@ function projectSymbolTypeName(symbol) {
       return symbol.name;
     case "member":
     case "parameter":
+    case "local":
     case "flowBinding":
     case "global":
       return symbol.detail ?? null;
@@ -31291,13 +31649,6 @@ function declarationContaining(document, position) {
     (declaration) => positionCompare2(declaration.range.start, position) <= 0 && positionCompare2(position, declaration.range.end) <= 0
   );
 }
-function sameProjectSymbol(left, right) {
-  if (left.kind !== right.kind) return false;
-  if (left.id && right.id) {
-    return left.id === right.id && (left.kind !== "enumOption" || left.ownerName === right.ownerName);
-  }
-  return left.location.uri === right.location.uri && rangesEqual(left.location.range, right.location.range);
-}
 function tokensBeforePosition(tokens, position) {
   return tokens.filter(
     (token) => token.kind !== "comment" && token.kind !== "eof" && positionCompare2(token.range.start, position) < 0
@@ -31391,31 +31742,67 @@ function contextualConstructorType(analysis, document, position) {
 function initializerRootAt(analysis, document, position) {
   const source = analysis.documents.get(document.uri);
   if (!source) return null;
-  for (const declaration of source.declarations) {
-    if (declaration.kind === "global") {
-      if (rangeContains(declaration.initializer.range, position)) {
-        return {
+  let roots = INITIALIZER_ROOTS.get(source);
+  if (!roots) {
+    roots = [];
+    for (const declaration of source.declarations) {
+      if (declaration.kind === "global") {
+        roots.push({
           type: declaration.type,
           range: declaration.initializer.range
-        };
+        });
+        continue;
       }
-      continue;
-    }
-    if (declaration.kind === "enum") continue;
-    for (const member of declaration.members) {
-      if (member.kind === "field" && member.initializer && rangeContains(member.initializer.range, position)) {
-        return { type: member.type, range: member.initializer.range };
+      if (declaration.kind === "enum") continue;
+      for (const member of declaration.members) {
+        if (member.kind === "field" && member.initializer) {
+          roots.push({ type: member.type, range: member.initializer.range });
+        }
       }
     }
+    roots.sort((a, b) => positionCompare2(a.range.end, b.range.end));
+    INITIALIZER_ROOTS.set(source, roots);
   }
-  return null;
+  return rangeItemAt(roots, position) ?? null;
 }
 function constructionSiteAt(analysis, document, position) {
   const root = initializerRootAt(analysis, document, position);
   if (!root) return null;
-  const tokens = projectTokens(document).filter(
-    (token) => token.kind !== "comment" && token.kind !== "eof" && rangeContains(root.range, token.range.start) && positionCompare2(token.range.start, position) < 0
-  );
+  let documents = CONSTRUCTION_SITE_CACHE.get(analysis);
+  if (!documents) {
+    documents = /* @__PURE__ */ new WeakMap();
+    CONSTRUCTION_SITE_CACHE.set(analysis, documents);
+  }
+  let roots = documents.get(document);
+  if (!roots) {
+    roots = /* @__PURE__ */ new Map();
+    documents.set(document, roots);
+  }
+  const key = positionKey(root.range.start);
+  let sites = roots.get(key);
+  if (!sites) {
+    sites = indexConstructionSites(analysis, document, root);
+    roots.set(key, sites);
+  }
+  let low = 0;
+  let high = sites.length;
+  while (low < high) {
+    const middle = low + high >>> 1;
+    if (positionCompare2(sites[middle].position, position) < 0)
+      low = middle + 1;
+    else high = middle;
+  }
+  return sites[Math.max(0, low - 1)].site;
+}
+function indexConstructionSites(analysis, document, root) {
+  const allTokens = projectTokens(document);
+  let start = Math.max(0, projectTokenIndexAt(document, root.range.start));
+  while (start < allTokens.length && positionCompare2(allTokens[start].range.start, root.range.start) < 0)
+    start++;
+  let end = start;
+  while (end < allTokens.length && positionCompare2(allTokens[end].range.start, root.range.end) <= 0)
+    end++;
+  const tokens = allTokens.slice(start, end).filter((token) => token.kind !== "comment" && token.kind !== "eof");
   const stack = [];
   const expectedType = () => {
     const frame = stack.at(-1);
@@ -31432,11 +31819,38 @@ function constructionSiteAt(analysis, document, position) {
         return null;
     }
   };
+  const objects = [];
+  const snapshot = () => {
+    const expected = expectedType();
+    const innermost = stack.at(-1);
+    const directly = innermost?.kind === "object" ? innermost : null;
+    const keys = directly?.keys ?? [];
+    const keyCount = keys.length;
+    return {
+      expectedType: expected,
+      expectedTypeName: expected?.name ?? null,
+      enclosingTypeName: objects.at(-1)?.typeName ?? null,
+      initializerTypeName: directly?.typeName ?? null,
+      get initializerKeys() {
+        return keys.slice(0, keyCount);
+      },
+      atInitializerKey: directly?.atKey ?? false
+    };
+  };
+  const sites = [];
+  let previousPosition = root.range.start;
+  const pop = () => {
+    const frame = stack.pop();
+    if (frame?.kind === "object") objects.pop();
+    return frame;
+  };
   let sawNew = false;
   let pendingNewTypeName = null;
   let closedConstructorTypeName = null;
   for (let index = 0; index < tokens.length; index++) {
+    sites.push({ position: previousPosition, site: snapshot() });
     const token = tokens[index];
+    previousPosition = token.range.start;
     if (token.text === "@") {
       if ((tokens[index + 1]?.kind === "identifier" || tokens[index + 1]?.kind === "keyword") && tokens[index + 2]?.text === "(") {
         let depth = 0;
@@ -31470,13 +31884,15 @@ function constructionSiteAt(analysis, document, position) {
     }
     if (token.text === "{") {
       if (sawNew || closedConstructorTypeName !== null) {
-        stack.push({
+        const frame2 = {
           kind: "object",
           typeName: pendingNewTypeName ?? closedConstructorTypeName,
           slotType: null,
           keys: [],
           atKey: true
-        });
+        };
+        stack.push(frame2);
+        objects.push(frame2);
         sawNew = false;
         pendingNewTypeName = null;
       } else {
@@ -31519,12 +31935,12 @@ function constructionSiteAt(analysis, document, position) {
       continue;
     }
     if (token.text === ")") {
-      const frame2 = stack.pop();
+      const frame2 = pop();
       closedConstructorTypeName = frame2?.kind === "call" ? frame2.typeName : null;
       continue;
     }
     if (token.text === "}" || token.text === "]") {
-      stack.pop();
+      pop();
       closedConstructorTypeName = null;
       continue;
     }
@@ -31555,19 +31971,8 @@ function constructionSiteAt(analysis, document, position) {
       }
     }
   }
-  const enclosing = [...stack].reverse().find(
-    (frame) => frame.kind === "object"
-  );
-  const innermost = stack.at(-1);
-  const directly = innermost?.kind === "object" ? innermost : null;
-  return {
-    expectedType: expectedType(),
-    expectedTypeName: expectedType()?.name ?? null,
-    enclosingTypeName: enclosing?.typeName ?? null,
-    initializerTypeName: directly?.typeName ?? null,
-    initializerKeys: directly?.keys ?? [],
-    atInitializerKey: directly?.atKey ?? false
-  };
+  sites.push({ position: previousPosition, site: snapshot() });
+  return sites;
 }
 function collectionElementType(type) {
   if (!type) return null;
@@ -31582,13 +31987,31 @@ function constructorArgumentType(analysis, frame) {
   if (!declaration || declaration.kind === "global" || declaration.kind === "enum") {
     return null;
   }
-  const fields = declaration.members.filter(
-    (member) => member.kind === "field" && !member.modifiers.includes("static") && !member.modifiers.includes("readonly")
-  );
+  const fields = declarationFields(declaration);
   if (frame.argumentName !== null) {
-    return fields.find((field) => field.name === frame.argumentName)?.type ?? null;
+    return fields.assignableByName.get(frame.argumentName)?.type ?? null;
   }
-  return fields[frame.argumentIndex]?.type ?? null;
+  return fields.assignable[frame.argumentIndex]?.type ?? null;
+}
+function declarationFields(declaration) {
+  let fields = DECLARATION_FIELDS.get(declaration);
+  if (!fields) {
+    const byName = /* @__PURE__ */ new Map();
+    const assignable = [];
+    const assignableByName = /* @__PURE__ */ new Map();
+    for (const member of declaration.members) {
+      if (member.kind !== "field") continue;
+      if (!byName.has(member.name)) byName.set(member.name, member);
+      if (member.modifiers.includes("static") || member.modifiers.includes("readonly"))
+        continue;
+      assignable.push(member);
+      if (!assignableByName.has(member.name))
+        assignableByName.set(member.name, member);
+    }
+    fields = { byName, assignable, assignableByName };
+    DECLARATION_FIELDS.set(declaration, fields);
+  }
+  return fields;
 }
 function declaredFieldType(analysis, typeName, fieldName) {
   let current = typeName;
@@ -31599,9 +32022,7 @@ function declaredFieldType(analysis, typeName, fieldName) {
     if (!declaration || declaration.kind === "global" || declaration.kind === "enum") {
       return null;
     }
-    const member = declaration.members.find(
-      (candidate) => candidate.kind === "field" && candidate.name === fieldName
-    );
+    const member = declarationFields(declaration).byName.get(fieldName);
     if (member) return member.type;
     current = declaration.kind === "class" ? resolvableBaseClassName(analysis, declaration) : null;
   }
@@ -31615,13 +32036,19 @@ function resolvableBaseClassName(analysis, declaration) {
   return null;
 }
 function findTypeDeclaration(analysis, name) {
-  for (const document of analysis.documents.values()) {
-    const declaration = document.declarations.find(
-      (candidate) => candidate.kind !== "global" && candidate.name === name
-    );
-    if (declaration) return declaration;
+  let declarations = PROJECT_TYPE_DECLARATIONS.get(analysis);
+  if (!declarations) {
+    declarations = /* @__PURE__ */ new Map();
+    for (const document of analysis.documents.values()) {
+      for (const declaration of document.declarations) {
+        if (declaration.kind !== "global" && !declarations.has(declaration.name)) {
+          declarations.set(declaration.name, declaration);
+        }
+      }
+    }
+    PROJECT_TYPE_DECLARATIONS.set(analysis, declarations);
   }
-  return void 0;
+  return declarations.get(name);
 }
 function constructorParameterLabel(parameter4) {
   return `${parameter4.type} ${parameter4.name}${parameterDefaultSuffix2(parameter4)}`;
@@ -31738,21 +32165,27 @@ function graphConstructorParameters(typeName) {
   }
 }
 function projectFunctionsNamed(analysis, name) {
-  const result = [];
-  for (const document of analysis.documents.values()) {
-    for (const declaration of document.declarations) {
-      if (declaration.kind === "global" || declaration.kind === "enum")
-        continue;
-      for (const member of declaration.members) {
-        if (member.kind === "function" && member.name === name) {
-          result.push({ owner: declaration.name, member });
+  let byName = PROJECT_FUNCTIONS.get(analysis);
+  if (!byName) {
+    byName = /* @__PURE__ */ new Map();
+    for (const document of analysis.documents.values()) {
+      for (const declaration of document.declarations) {
+        if (declaration.kind === "global" || declaration.kind === "enum")
+          continue;
+        for (const member of declaration.members) {
+          if (member.kind !== "function") continue;
+          const entry = { owner: declaration.name, member };
+          const named = byName.get(member.name);
+          if (named) named.push(entry);
+          else byName.set(member.name, [entry]);
         }
       }
     }
+    PROJECT_FUNCTIONS.set(analysis, byName);
   }
-  return result;
+  return byName.get(name) ?? [];
 }
-var PROJECT_BODY_SNAPSHOT_CACHE, CONSTRUCTION_INDEX_CACHE, VARIANT_SCOPE_INDEX_CACHE;
+var PROJECT_BODIES, PROJECT_BODY_INDEX_CACHE, PROJECT_BODY_SNAPSHOT_CACHE, SOURCE_TYPES, CONSTRUCTION_INDEX_CACHE, VARIANT_SCOPE_INDEX_CACHE, PROJECT_SYMBOL_INDEX_CACHE, INITIALIZER_ROOTS, CONSTRUCTION_SITE_CACHE, DECLARATION_FIELDS, PROJECT_TYPE_DECLARATIONS, PROJECT_FUNCTIONS;
 var init_project_source_language_features = __esm({
   "../packages/neoscript-language/src/project-source-language-features.ts"() {
     "use strict";
@@ -31766,11 +32199,19 @@ var init_project_source_language_features = __esm({
     init_project_source_settlement();
     init_project_source_tokens();
     init_quick_fixes();
-    init_source_text();
     init_syntax();
+    PROJECT_BODIES = /* @__PURE__ */ new WeakMap();
+    PROJECT_BODY_INDEX_CACHE = /* @__PURE__ */ new WeakMap();
     PROJECT_BODY_SNAPSHOT_CACHE = /* @__PURE__ */ new WeakMap();
+    SOURCE_TYPES = /* @__PURE__ */ new WeakMap();
     CONSTRUCTION_INDEX_CACHE = /* @__PURE__ */ new WeakMap();
     VARIANT_SCOPE_INDEX_CACHE = /* @__PURE__ */ new WeakMap();
+    PROJECT_SYMBOL_INDEX_CACHE = /* @__PURE__ */ new WeakMap();
+    INITIALIZER_ROOTS = /* @__PURE__ */ new WeakMap();
+    CONSTRUCTION_SITE_CACHE = /* @__PURE__ */ new WeakMap();
+    DECLARATION_FIELDS = /* @__PURE__ */ new WeakMap();
+    PROJECT_TYPE_DECLARATIONS = /* @__PURE__ */ new WeakMap();
+    PROJECT_FUNCTIONS = /* @__PURE__ */ new WeakMap();
   }
 });
 
@@ -34977,6 +35418,57 @@ var init_project_local_value_refactorings = __esm({
   }
 });
 
+// ../packages/neoscript-language/src/project-source-reference-family.ts
+function projectReferenceFamily(analysis, target, index = buildProjectSymbolIndex(analysis.symbols)) {
+  const named = index.byName.get(target.name) ?? [];
+  if (target.kind === "class" || target.kind === "constructor") {
+    const owner = target.kind === "class" ? target.name : target.ownerName;
+    return named.filter(
+      (symbol) => symbol.kind === "class" ? symbol.name === owner : symbol.kind === "constructor" && symbol.ownerName === owner
+    );
+  }
+  if (target.kind !== "member" || !target.ownerName) return [target];
+  const symbols = new Map(
+    named.filter((symbol) => symbol.kind === "member").map((symbol) => [symbol.ownerName, symbol])
+  );
+  const classes = /* @__PURE__ */ new Map();
+  for (const document of analysis.documents.values()) {
+    for (const declaration of document.declarations) {
+      if (declaration.kind === "class")
+        classes.set(declaration.name, declaration);
+    }
+  }
+  const roots = /* @__PURE__ */ new Map();
+  const root = (name) => {
+    if (roots.has(name)) return roots.get(name);
+    roots.set(name, null);
+    const declaration = classes.get(name);
+    const own = symbols.get(name);
+    const member = declaration?.members.find(
+      (candidate) => candidate.name === target.name
+    );
+    if (own && !member?.modifiers.includes("override")) {
+      roots.set(name, own);
+      return own;
+    }
+    const base = declaration?.baseTypes.find((type) => classes.has(type.name));
+    const resolved = (base ? root(base.name) : null) ?? own ?? null;
+    roots.set(name, resolved);
+    return resolved;
+  };
+  const selected = root(target.ownerName);
+  if (!selected) return [target];
+  return [...symbols.values()].filter(
+    (symbol) => symbol.ownerName && root(symbol.ownerName) === selected
+  );
+}
+var init_project_source_reference_family = __esm({
+  "../packages/neoscript-language/src/project-source-reference-family.ts"() {
+    "use strict";
+    init_project_source_language_features();
+  }
+});
+
 // ../packages/neoscript-language/src/spelling-diagnostics.ts
 function enhanceSpellingDiagnostics(document, diagnostics, completionAt) {
   return diagnostics.map((diagnostic) => {
@@ -35208,6 +35700,16 @@ function sameLocationInList(target, locations) {
     (location3) => location3.uri === target.uri && location3.range.start.line === target.range.start.line && location3.range.start.character === target.range.start.character
   );
 }
+function locationKey(location3) {
+  const { start, end } = location3.range;
+  return JSON.stringify([
+    location3.uri,
+    start.line,
+    start.character,
+    end.line,
+    end.character
+  ]);
+}
 var LanguageService;
 var init_service = __esm({
   "../packages/neoscript-language/src/service.ts"() {
@@ -35220,6 +35722,7 @@ var init_service = __esm({
     init_project_source_identifiers();
     init_project_source_analysis();
     init_project_source_construction_quick_fixes();
+    init_project_source_reference_family();
     init_project_source_language_features();
     init_project_source_tokens();
     init_quick_fixes();
@@ -35402,6 +35905,16 @@ var init_service = __esm({
         if (!reference2) return [];
         const symbolId = resolveReferenceSymbolId(source, reference2);
         if (!symbolId) return [];
+        for (const location3 of definition(source, position)) {
+          const owner = this.documents.get(location3.uri);
+          if (owner && isProjectDocument(owner.document, owner.context)) {
+            return this.projectReferences(
+              owner.document,
+              location3.range.start,
+              includeDeclaration
+            );
+          }
+        }
         const locations = [];
         for (const other of this.documents.values()) {
           if (isProjectDocument(other.document, other.context)) continue;
@@ -35455,8 +35968,10 @@ var init_service = __esm({
           );
           if (!resolved) return null;
           const memberLabel2 = resolved.symbol.kind === "member" || resolved.symbol.kind === "enumOption" || resolved.symbol.kind === "graphChild";
-          const binding = resolved.symbol.kind === "parameter" || resolved.symbol.kind === "genericParameter" || resolved.symbol.kind === "flowBinding";
-          const validNeoName = memberLabel2 ? isValidNeoProjectMemberIdentifier(newName) : binding ? isValidNeoProjectBindingIdentifier(newName) : isValidNeoProjectIdentifier(newName);
+          const binding = resolved.symbol.kind === "local" || resolved.symbol.kind === "parameter" || resolved.symbol.kind === "genericParameter" || resolved.symbol.kind === "flowBinding";
+          let validNeoName = memberLabel2 ? isValidNeoProjectMemberIdentifier(newName) : binding ? isValidNeoProjectBindingIdentifier(newName) : isValidNeoProjectIdentifier(newName);
+          if (resolved.symbol.kind === "local")
+            validNeoName = isValidNeoScriptBindingIdentifier(newName);
           validName = validNeoName && isGeneratedCSharpIdentifier(newName) && !isGeneratedCSharpReservedKeyword(newName);
         } else {
           validName = isValidNeoScriptBindingIdentifier(newName);
@@ -35565,12 +36080,22 @@ var init_service = __esm({
         const token = projectTokenAt(document, position);
         if (!isProjectNameToken(token)) return [];
         const analysis = this.projectAnalysis();
-        const resolved = projectSymbolAt(analysis, document, position);
+        const index = buildProjectSymbolIndex(analysis.symbols);
+        const resolved = projectSymbolAt(analysis, document, position, index);
         if (!resolved) return [];
         const declaration = resolved.symbol;
+        const family = projectReferenceFamily(analysis, declaration, index);
+        const familyLocations = new Set(
+          family.map((member) => locationKey(member.location))
+        );
+        const familyIds = new Set(
+          family.flatMap((member) => member.id === null ? [] : [member.id])
+        );
         const locations = [];
         for (const state of this.documents.values()) {
           if (!isProjectDocument(state.document, state.context)) continue;
+          if (declaration.kind === "local" && state.document.uri !== document.uri)
+            continue;
           for (const candidate of projectTokens(state.document)) {
             if (!isProjectNameToken(candidate) || candidate.text !== token.text) {
               continue;
@@ -35578,28 +36103,29 @@ var init_service = __esm({
             const candidateSymbol = projectSymbolAt(
               analysis,
               state.document,
-              candidate.range.start
+              candidate.range.start,
+              index
             )?.symbol;
-            if (!candidateSymbol || !sameProjectSymbol(candidateSymbol, declaration)) {
+            if (!candidateSymbol || !familyLocations.has(locationKey(candidateSymbol.location))) {
               continue;
             }
             const location3 = { uri: state.document.uri, range: candidate.range };
-            if (!includeDeclaration && location3.uri === declaration.location.uri && rangesEqual(location3.range, declaration.location.range)) {
+            if (!includeDeclaration && familyLocations.has(locationKey(location3))) {
               continue;
             }
             locations.push(location3);
           }
         }
         for (const state of this.documents.values()) {
-          if (state.context.projectSourceKind !== "spec") continue;
+          if (declaration.kind === "local") break;
+          if (isProjectDocument(state.document, state.context)) continue;
           const snapshot = this.scriptSnapshot(state);
           for (const candidate of snapshot.parsed.references) {
             if (candidate.name !== declaration.name) continue;
             const symbolId = resolveReferenceSymbolId(snapshot, candidate);
             if (symbolId === null) continue;
-            const matches = declaration.id !== null ? symbolId === declaration.id : sameLocationInList(
-              declaration.location,
-              definition(snapshot, candidate.range.start)
+            const matches = familyIds.has(symbolId) || definition(snapshot, candidate.range.start).some(
+              (location3) => familyLocations.has(locationKey(location3))
             );
             if (!matches) continue;
             locations.push({ uri: state.document.uri, range: candidate.range });
@@ -50359,6 +50885,41 @@ var init_interface_graph = __esm({
 });
 
 // ../src/models/neoscript/type-info-compatibility.ts
+function isTypeInfoAssignable(from, to, context) {
+  if (to.type === NS_TYPE_UNKNOWN) return true;
+  if (from.type === NS_TYPE_UNKNOWN) return false;
+  if (from.required === false && to.required === true) return false;
+  if (from.type === 0 /* Null */) return to.required === false;
+  if (from.type === 2 /* Int */ && to.type === 4 /* Float */) {
+    return true;
+  }
+  if (from.type === 7 /* Class */ && to.type === 7 /* Class */) {
+    if (from.classId === to.classId) {
+      return typeInfosInvariantlyEqual({ ...from, required: to.required }, to);
+    }
+    return resolveInheritanceChain(from.classId, context.classes).some(
+      (schemaClass2) => schemaClass2.id === to.classId
+    );
+  }
+  if (from.type === 7 /* Class */ && to.type === 22 /* Interface */) {
+    return classImplementsInterface(
+      from.classId,
+      to.interfaceId,
+      context.classes,
+      context.interfaces
+    );
+  }
+  if (from.type === 22 /* Interface */ && to.type === 22 /* Interface */) {
+    return resolveInterfaceClosure(from.interfaceId, context.interfaces).some(
+      (neoInterface) => neoInterface.id === to.interfaceId
+    );
+  }
+  if (from.type === 22 /* Interface */ || to.type === 22 /* Interface */) {
+    return false;
+  }
+  const normalizedFrom = { ...from, required: to.required };
+  return typeInfosInvariantlyEqual(normalizedFrom, to);
+}
 var init_type_info_compatibility = __esm({
   "../src/models/neoscript/type-info-compatibility.ts"() {
     "use strict";
@@ -62812,7 +63373,9 @@ function lowerInterface(context, declaration) {
       name: member.name,
       ...member.docsText === void 0 ? {} : { docsText: member.docsText },
       type: lowerType(context, member.type),
-      settable: /\bset\s*;/.test(member.body ?? ""),
+      settable: projectSourceAccessors(member.body ?? "").some(
+        (accessor) => accessor.keyword === "set"
+      ),
       accessModifier,
       source
     };
@@ -64214,7 +64777,8 @@ function propertyAccessors(body) {
     const accessor = findProjectSourceAccessorBody(body, keyword);
     if (accessor === null) return null;
     const source = normalizeBodySource(accessor.source);
-    if (accessor.form === "block") return source;
+    if (accessor.form === "block")
+      return keyword === "set" && source.length === 0 ? "return;" : source;
     return keyword === "get" ? `return ${source};` : `${source};`;
   };
   return {
@@ -111987,8 +112551,11 @@ function validateDocumentInheritanceFlags(ctx) {
       )) {
         continue;
       }
+      const declaringClass = classesById.get(
+        inheritedMetadata.declarationClassId
+      );
       errors.push({
-        message: `Schema member "${schemaKey}" on class "${schemaClass2.name}" (${schemaClass2.id}) does not match the inherited generated signature from member "${generatedAncestorMember.name}" (${generatedAncestorMember.id}). Abstract implementations and re-abstractions must preserve the generated member contract or have a supported codegen bridge.`
+        message: `Schema member "${schemaKey}" on class "${schemaClass2.name}" (${schemaClass2.id}) does not match the inherited generated signature from member "${generatedAncestorMember.name}" (${generatedAncestorMember.id}). ${schemaClass2.name}.${schemaKey} generates "${ctx.signatureProjector.format(localSignature)}" but ${declaringClass?.name ?? inheritedMetadata.memberId}.${schemaKey} declares "${ctx.signatureProjector.format(ancestorSignature)}". Abstract implementations and re-abstractions must preserve the generated member contract or have a supported codegen bridge.`
       });
     }
   }
@@ -112176,6 +112743,7 @@ function createGenerationContext(exportData, diagnostics, docs = EMPTY_UNITY_COD
     docs,
     members: Object.values(exportData.members),
     classes: Object.values(exportData.classes),
+    interfaces: Object.values(exportData.interfaces),
     diagnostics,
     enumNames: buildEnumNameMap(Object.values(exportData.enums), diagnostics),
     enumOptionFieldNames: /* @__PURE__ */ new Map(),
@@ -112411,29 +112979,35 @@ function emittedGeneratedMemberContract(ctx, ownerClassId, schemaKey, memberId,
     valueType: narrowedMemberValueType(ctx, member, valueType, inherited),
     hasSetter,
     getOnlyContract: (inherited?.getOnlyContract ?? false) || isAbstractMember(member) === true && !hasSetter,
-    valueClassId: generatedValueClassId(ctx, member),
+    valueTypeInfo: generatedValueTypeInfo(ctx, member),
     closesGenericType: (inherited?.closesGenericType ?? false) || lookupNarrowsThroughGenericParam(member) || isMemberGenericBase(member)
   };
 }
 function suppressesInheritedSetter(contract) {
   return contract?.getOnlyContract === true;
 }
-function generatedValueClassId(ctx, member) {
-  if (isMemberClassBase(member)) return member.classId;
-  const nsReturnTypeInfo = nsPropertyReturnTypeInfo(member);
-  if (nsReturnTypeInfo !== null) {
-    return nsReturnTypeInfo.type === 7 /* Class */ ? nsReturnTypeInfo.classId : null;
+function generatedValueTypeInfo(ctx, member) {
+  const required2 = isRequiredMember2(member);
+  if (isMemberClassBase(member)) {
+    return { type: 7 /* Class */, classId: member.classId, required: required2 };
   }
+  const returnType = nsPropertyReturnTypeInfo(member);
+  if (returnType !== null) return returnType;
   if (isMemberLookupBase(member)) {
-    const declaredTypeInfo = lookupDeclaredTypeInfo2(member);
-    if (declaredTypeInfo !== null) {
-      return declaredTypeInfo.type === 7 /* Class */ ? declaredTypeInfo.classId : null;
+    const declaredType = lookupDeclaredTypeInfo2(member);
+    if (declaredType !== null) return declaredType;
+    const entry = resolveLookupEntryMember(ctx, member);
+    if (entry === null) return null;
+    if (isMemberClassBase(entry)) {
+      return { type: 7 /* Class */, classId: entry.classId, required: required2 };
     }
-    const entryMember = resolveLookupEntryMember(ctx, member);
-    return entryMember !== null && isMemberClassBase(entryMember) ? entryMember.classId : null;
   }
   return null;
 }
+function generatedValueClassId(ctx, member) {
+  const typeInfo = generatedValueTypeInfo(ctx, member);
+  return typeInfo?.type === 7 /* Class */ ? typeInfo.classId : null;
+}
 function narrowedMemberValueType(ctx, member, rawValueType, contract) {
   if (contract === null) return rawValueType;
   if (contract.valueType === rawValueType) return rawValueType;
@@ -112449,13 +113023,18 @@ function narrowedMemberValueType(ctx, member, rawValueType, contract) {
   )) {
     return contract.valueType;
   }
-  if (contract.valueClassId === null) return rawValueType;
-  const valueClassId = generatedValueClassId(ctx, member);
-  if (valueClassId === null) return rawValueType;
-  const narrows = resolveInheritanceChainForEmission(ctx, valueClassId).some(
-    (ancestor) => ancestor.id === contract.valueClassId
-  );
-  return narrows ? contract.valueType : rawValueType;
+  const inheritedType = contract.valueTypeInfo;
+  if (inheritedType === null) return rawValueType;
+  if (inheritedType.type !== 7 /* Class */ && inheritedType.type !== 22 /* Interface */)
+    return rawValueType;
+  const valueType = generatedValueTypeInfo(ctx, member);
+  if (valueType === null) return rawValueType;
+  const sourceType = valueType.type === 7 /* Class */ && inheritedType.type === 7 /* Class */ && valueType.required === false && inheritedType.required === true ? { ...valueType, required: true } : valueType;
+  try {
+    return isTypeInfoAssignable(sourceType, inheritedType, ctx) ? contract.valueType : rawValueType;
+  } catch {
+    return rawValueType;
+  }
 }
 function storedCollectionImplementsContract(ctx, member, rawValueType, contractType2) {
   const contract = contractType2.replace(/\?$/, "");
@@ -112639,6 +113218,13 @@ function createGeneratedInstanceMemberSignatureProjector(exportData) {
     equals: generatedInstanceMemberSignaturesEqual
   };
 }
+function formatGeneratedInstanceMemberSignature(signature) {
+  if (signature.kind === "property") {
+    const accessors = signature.hasSetter ? "get; set;" : "get;";
+    return `${signature.valueType} ${signature.name} { ${accessors} }`;
+  }
+  return `${signature.returnType} ${signature.name}(${signature.parameterTypes.join(", ")})`;
+}
 function generatedInstanceMemberSignaturesEqual(left, right) {
   if (left.kind !== right.kind) return false;
   if (left.name !== right.name) return false;
@@ -114246,6 +114832,7 @@ var init_generate_unity_classes = __esm({
     init_sdk_runtime_enums();
     init_members();
     init_classes();
+    init_type_info_compatibility();
     DEFAULT_NAMESPACE = "Assets.Scripts.Neo";
     isNSPropertyContractDeclaration = isMemberNSPropertyContractBase;
     SMART_TILE_CONTRACT_WORLD_KINDS = /* @__PURE__ */ new Set([
@@ -114334,6 +114921,7 @@ function assertProjectDocumentInheritanceFlagsValid(document) {
       PROJECT_ROOTS.map((root) => document.project[root.projectField])
     ),
     signatureProjector: {
+      format: formatGeneratedInstanceMemberSignature,
       resolveLocal: (classId, schemaKey) => getGeneratedSignatures().projectLocal(classId, schemaKey),
       resolveInherited: (classId, schemaKey) => getGeneratedSignatures().projectInherited(classId, schemaKey),
       resolveInheritedMetadata: (classId, schemaKey) => {
@@ -114343,6 +114931,7 @@ function assertProjectDocumentInheritanceFlagsValid(document) {
         );
         return signature === null ? null : {
           memberId: signature.memberId,
+          declarationClassId: signature.declarationClassId,
           isAbstract: signature.isAbstract
         };
       },
@@ -134256,7 +134845,7 @@ var init_project_document_cache = __esm({
     init_src();
     init_project_documents();
     PROJECT_SOURCE_BUILD_CACHE_PATH = ".neo/build/project-source-analysis-v4.json";
-    PROJECT_SOURCE_BUILD_CACHE_REVISION = 3;
+    PROJECT_SOURCE_BUILD_CACHE_REVISION = 4;
   }
 });
 
@@ -146409,7 +146998,7 @@ var init_registry2 = __esm({
   "../packages/manifest/schema-contract/registry.mjs"() {
     "use strict";
     PROJECT_SCHEMA_CONTRACT = Object.freeze({
-      cliVersion: "0.61.5",
+      cliVersion: "0.62.0",
       projectFileUploadBatchSize: 32,
       documentRecords: {
         member: {
@@ -155089,7 +155678,7 @@ There is no --keep-current: preserving current semantic state defines flatten.
 async function main() {
   const args = parseArgs(process.argv.slice(2));
   if (args.command === "--version") {
-    console.log("0.61.5");
+    console.log("0.62.0");
     return;
   }
   if (args.command === null || args.command === "help" || args.command === "--help" || args.command === "-h") {