Skip to content

cleanup: Add ENFORCE for checking type in hover doc. #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
varungandhi-src merged 1 commit into from
Aug 2, 2022
Merged

cleanup: Add ENFORCE for checking type in hover doc. #48

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions scip_indexer/SCIPIndexer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,17 +261,24 @@ class NamedSymbolRef final {
}

vector<string> docStrings(const core::GlobalState &gs, core::Loc loc) {
#define CHECK_TYPE(type, name) \
ENFORCE(type, "missing type for {} in file {}\n{}\n", name, loc.file().data(gs).path(), loc.toString(gs))

vector<string> docs;
string markdown = "";
switch (this->kind()) {
case Kind::UndeclaredField: {
markdown = fmt::format("{} = T.let(_, {})", this->name.show(gs), this->type.show(gs));
auto name = this->name.show(gs);
CHECK_TYPE(this->type, name);
markdown = fmt::format("{} = T.let(_, {})", name, this->type.show(gs));
break;
}
case Kind::StaticField: {
auto fieldRef = this->selfOrOwner.asFieldRef();
markdown =
fmt::format("{} = T.let(_, {})", fieldRef.showFullName(gs), fieldRef.data(gs)->resultType.show(gs));
auto resultType = fieldRef.data(gs)->resultType;
auto name = fieldRef.showFullName(gs);
CHECK_TYPE(resultType, name);
markdown = fmt::format("{} = T.let(_, {})", name, resultType.show(gs));
break;
}
case Kind::ClassOrModule: {
Expand All @@ -291,8 +298,9 @@ class NamedSymbolRef final {
}
case Kind::Method: {
auto ref = this->selfOrOwner.asMethodRef();
markdown = realmain::lsp::prettyTypeForMethod(gs, ref, ref.data(gs)->owner.data(gs)->resultType,
nullptr, nullptr);
auto resultType = ref.data(gs)->owner.data(gs)->resultType;
CHECK_TYPE(resultType, fmt::format("result type for {}", ref.showFullName(gs)));
markdown = realmain::lsp::prettyTypeForMethod(gs, ref, resultType, nullptr, nullptr);
// FIXME(varun): For some reason, it looks like a bunch of public methods
// get marked as private here. Avoid printing misleading info until we fix that.
// https://github.com/sourcegraph/scip-ruby/issues/33
Expand All @@ -310,6 +318,7 @@ class NamedSymbolRef final {
}
}
return docs;
#undef CHECK_TYPE
}

// Returns OK if we were able to compute a symbol for the expression.
Expand Down