Page MenuHomestyx hydra
Files F128075

No OneTemporary
Actions

View Options

diff --git a/src/applications/diffusion/controller/DiffusionSymbolController.php b/src/applications/diffusion/controller/DiffusionSymbolController.php
index 3aaccffd22..20c25dad82 100644
--- a/src/applications/diffusion/controller/DiffusionSymbolController.php
+++ b/src/applications/diffusion/controller/DiffusionSymbolController.php
@@ -1,157 +1,188 @@
<?php
final class DiffusionSymbolController extends DiffusionController {
public function handleRequest(AphrontRequest $request) {
$viewer = $this->getViewer();
$name = $request->getURIData('name');
$query = id(new DiffusionSymbolQuery())
->setViewer($viewer)
->setName($name);
if ($request->getStr('context')) {
$query->setContext($request->getStr('context'));
}
if ($request->getStr('type')) {
$query->setType($request->getStr('type'));
}
if ($request->getStr('lang')) {
$query->setLanguage($request->getStr('lang'));
}
+ $repos = array();
if ($request->getStr('repositories')) {
$phids = $request->getStr('repositories');
$phids = explode(',', $phids);
$phids = array_filter($phids);
if ($phids) {
$repos = id(new PhabricatorRepositoryQuery())
->setViewer($request->getUser())
->withPHIDs($phids)
->execute();
- $repos = mpull($repos, 'getPHID');
- if ($repos) {
- $query->withRepositoryPHIDs($repos);
+ $repo_phids = mpull($repos, 'getPHID');
+ if ($repo_phids) {
+ $query->withRepositoryPHIDs($repo_phids);
}
}
}
$query->needPaths(true);
$query->needRepositories(true);
$symbols = $query->execute();
-
$external_query = id(new DiffusionExternalSymbolQuery())
->withNames(array($name));
if ($request->getStr('context')) {
$external_query->withContexts(array($request->getStr('context')));
}
if ($request->getStr('type')) {
$external_query->withTypes(array($request->getStr('type')));
}
if ($request->getStr('lang')) {
$external_query->withLanguages(array($request->getStr('lang')));
}
+ if ($request->getStr('path')) {
+ $external_query->withPaths(array($request->getStr('path')));
+ }
+
+ if ($request->getInt('line')) {
+ $external_query->withLines(array($request->getInt('line')));
+ }
+
+ if ($repos) {
+ $external_query->withRepositories($repos);
+ }
+
$external_sources = id(new PhutilClassMapQuery())
->setAncestorClass('DiffusionExternalSymbolsSource')
->execute();
$results = array($symbols);
foreach ($external_sources as $source) {
- $results[] = $source->executeQuery($external_query);
+ $source_results = $source->executeQuery($external_query);
+
+ if (!is_array($source_results)) {
+ throw new Exception(
+ pht(
+ 'Expected a list of results from external symbol source "%s".',
+ get_class($source)));
+ }
+
+ try {
+ assert_instances_of($source_results, 'PhabricatorRepositorySymbol');
+ } catch (InvalidArgumentException $ex) {
+ throw new Exception(
+ pht(
+ 'Expected a list of PhabricatorRepositorySymbol objects '.
+ 'from external symbol source "%s".',
+ get_class($source)));
+ }
+
+ $results[] = $source_results;
}
$symbols = array_mergev($results);
if ($request->getBool('jump') && count($symbols) == 1) {
// If this is a clickthrough from Differential, just jump them
// straight to the target if we got a single hit.
$symbol = head($symbols);
return id(new AphrontRedirectResponse())
->setIsExternal($symbol->isExternal())
->setURI($symbol->getURI());
}
$rows = array();
foreach ($symbols as $symbol) {
$href = $symbol->getURI();
if ($symbol->isExternal()) {
$source = $symbol->getSource();
$location = $symbol->getLocation();
} else {
$repo = $symbol->getRepository();
$file = $symbol->getPath();
$line = $symbol->getLineNumber();
$source = $repo->getMonogram();
$location = $file.':'.$line;
}
$location = phutil_tag(
'a',
array(
'href' => $href,
),
$location);
$rows[] = array(
$symbol->getSymbolType(),
$symbol->getSymbolContext(),
$symbol->getSymbolName(),
$symbol->getSymbolLanguage(),
$source,
$location,
);
}
$table = new AphrontTableView($rows);
$table->setHeaders(
array(
pht('Type'),
pht('Context'),
pht('Name'),
pht('Language'),
pht('Source'),
pht('Location'),
));
$table->setColumnClasses(
array(
'',
'',
'pri',
'',
'',
'',
));
$table->setNoDataString(
pht('No matching symbol could be found in any indexed repository.'));
$header = id(new PHUIHeaderView())
->setHeader(pht('Similar Symbols'))
->setHeaderIcon('fa-bullseye');
$crumbs = $this->buildApplicationCrumbs();
$crumbs->addTextCrumb(pht('Find Symbol'));
$crumbs->setBorder(true);
$view = id(new PHUITwoColumnView())
->setHeader($header)
->setFooter(array(
$table,
));
return $this->newPage()
->setTitle(pht('Find Symbol'))
->setCrumbs($crumbs)
->appendChild($view);
}
}
diff --git a/src/applications/diffusion/symbol/DiffusionExternalSymbolQuery.php b/src/applications/diffusion/symbol/DiffusionExternalSymbolQuery.php
index d32f1b3f64..f1f916d9d4 100644
--- a/src/applications/diffusion/symbol/DiffusionExternalSymbolQuery.php
+++ b/src/applications/diffusion/symbol/DiffusionExternalSymbolQuery.php
@@ -1,46 +1,84 @@
<?php
final class DiffusionExternalSymbolQuery extends Phobject {
+
private $languages = array();
private $types = array();
private $names = array();
private $contexts = array();
+ private $paths = array();
+ private $lines = array();
+ private $repositories = array();
public function withLanguages(array $languages) {
$this->languages = $languages;
return $this;
}
+
public function withTypes(array $types) {
$this->types = $types;
return $this;
}
+
public function withNames(array $names) {
$this->names = $names;
return $this;
}
+
public function withContexts(array $contexts) {
$this->contexts = $contexts;
return $this;
}
+ public function withPaths(array $paths) {
+ $this->paths = $paths;
+ return $this;
+ }
+
+ public function withLines(array $lines) {
+ $this->lines = $lines;
+ return $this;
+ }
+
+ public function withRepositories(array $repositories) {
+ assert_instances_of($repositories, 'PhabricatorRepository');
+ $this->repositories = $repositories;
+ return $this;
+ }
public function getLanguages() {
return $this->languages;
}
+
public function getTypes() {
return $this->types;
}
+
public function getNames() {
return $this->names;
}
+
public function getContexts() {
return $this->contexts;
}
+ public function getPaths() {
+ return $this->paths;
+ }
+
+ public function getLines() {
+ return $this->lines;
+ }
+
+ public function getRepositories() {
+ return $this->repositories;
+ }
+
public function matchesAnyLanguage(array $languages) {
return (!$this->languages) || array_intersect($languages, $this->languages);
}
+
public function matchesAnyType(array $types) {
return (!$this->types) || array_intersect($types, $this->types);
}
}

File Metadata

Mime Type
text/x-diff
Expires
Tue, Apr 29, 4:36 PM (22 h, 46 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
108454
Default Alt Text
(7 KB)

Event Timeline

styx copyright 2020 sirocyl / ellie (kymkdd) / ncommander / styx contributors
Use of other names and brands is not intended to reflect a claim of, or right to, use the name or brand.
styx is an operating system using the Linux kernel and components, and "styx Linux" as a phrase does not reflect the inclusion of the Linux brand or trademark in the styx project.
Linux® is the registered trademark of Linus Torvalds in the U.S. and other countries.
Terms and Conditions (TODO: fix this!)