src: correct spelling errors (#1162)

This commit is contained in:
Josh Soref
2021-03-14 07:47:26 +01:00
committed by GitHub
parent 5932e9f1e8
commit 3a75ef0df4
97 changed files with 261 additions and 261 deletions
+7 -7
View File
@@ -292,7 +292,7 @@ released 2018-08-31
* Windows: Fixed policy for finding Windows user data folder (issue [#612](https://github.com/CoatiSoftware/Sourcetrail/issues/612))
* C/C++: Fixed recording of multiple cxx anonymous namespaces within the same file
* C/C++: Fixed files within indexed directories always refreshed in empty C/C++ source groups
* Code: Don't show list of overriden methods when clicking overriding method
* Code: Don't show list of overridden methods when clicking overriding method
* Code: Fixed local reference navigation not shown for edges when file content was not cached
* Fixed crash related to update check when app was opened with a project
* Tooltip: Fixed repeated signature name qualification and line breaks
@@ -477,7 +477,7 @@ released 2018-01-30
* Group include validation results by file and add line breaks for readability
* Fixed location pickers used system root directory when empty
* Graph: Add "bidirectional" to tooltip of bidirectional aggregation edges
* Linux: Don't explicitely open terminal when running on Linux (issue [#525](https://github.com/CoatiSoftware/Sourcetrail/issues/525))
* Linux: Don't explicitly open terminal when running on Linux (issue [#525](https://github.com/CoatiSoftware/Sourcetrail/issues/525))
* Fixed files and directories dialog to offer selection of files (issue [#521](https://github.com/CoatiSoftware/Sourcetrail/issues/521))
* C++: Fixed cases where references to members were recorded as usage instead of call
* Fixed crash when Start Screen is closed while checking for update
@@ -554,7 +554,7 @@ released 2017-10-25
* Code: Added indexing of qualifier source locations and allow symbol activation by clicking qualifiers
* Linux: Enabled Qt highDPI scaling to fix UI issues on high resolution screens
* Fixed handling of non-indexed files in Graph and Code
* C/C++: Removed include check validataion for compilation database source groups
* C/C++: Removed include check validation for compilation database source groups
* Graph: Bundle nested anonymous namespaces into anonymous namespace bundle in namespace overview (issue [#465](https://github.com/CoatiSoftware/Sourcetrail/issues/465))
* Search: Fixed vertical growth of search bar area when resizing window
* Visual Studio plugin: Lots off fixes, see changelog (https://github.com/CoatiSoftware/vs-sourcetrail/blob/master/CHANGELOG.md)
@@ -722,7 +722,7 @@ released 2017-04-12
#### 0.11.15
released 2017-03-01
* Don't accept richt text in 'enter license' dialog field (issue [#207](https://github.com/CoatiSoftware/Sourcetrail/issues/207))
* Don't accept rich text in 'enter license' dialog field (issue [#207](https://github.com/CoatiSoftware/Sourcetrail/issues/207))
* Updated EULA to include Test License and better clarify other license types
* Fixed icons in project setup dialogs blurry on highDPI screens
* Added link to additional downloadable pre-indexed projects to trial start screen
@@ -787,7 +787,7 @@ released 2017-03-01
* Code: Added single file view mode
* Code: Added navigation bar with mode toggle and buttons to navigate references
* Graph: Removed underscores in edge hover names
* Infere some non-indexed node types by their edges
* Infer some non-indexed node types by their edges
#### 0.10.0
@@ -1004,7 +1004,7 @@ released 2016-06-15
* Added link to download page to start screen to remind users of updating once in a while
* Check if compilation database still exists before refreshing
* Added separate step for defining project name, project location and compilation database to project setup
* Explain that the project stays up-to-date with the compilation databes on refresh in project setup UI
* Explain that the project stays up-to-date with the compilation database on refresh in project setup UI
* Disregard source extensions when loading from compilation database
* Removed error logs in name resolver
* Added plugin for VIM: https://github.com/CoatiSoftware/vim-coati
@@ -1096,7 +1096,7 @@ released 2016-02-25
* Show overview on project open with node bundles per type
* Added application move protection to reenter license key
* Improved log file names to be sorted chronologically
* Improved graph view node bundeling to bundle more
* Improved graph view node bundling to bundle more
* Display scope name at bottom of code snippet
* Added .coatiproject file associations with icon for Mac and Windows
* Return to last scroll position when going back in code view
+3 -3
View File
@@ -143,7 +143,7 @@ Building Sourcetrail requires several dependencies to be in place on your machin
### Required dependencies
* __LLVM/Clang 11.0.0__
* __Reason__: Used for running the preprocessor on the indexedes source code, building and traversing an Abstract Syntax Tree and generating error messages.
* __Reason__: Used for running the preprocessor on the indexed source code, building and traversing an Abstract Syntax Tree and generating error messages.
* __Building__: Make sure to check out the correct tag: `git checkout llvmorg-11.0.0`
* __Building for Windows__: Follow [these steps](https://clang.llvm.org/get_started.html) to build the project. Run the cmake command exactly as described.
* __Building for Unix__: Follow this [installation guide](http://clang.llvm.org/docs/LibASTMatchersTutorial.html) to build the project. Make sure to build with `-DLLVM_ENABLE_RTTI=ON`.
@@ -163,14 +163,14 @@ Building Sourcetrail requires several dependencies to be in place on your machin
* __JDK 1.8__
* __Reason__: Used to build the Java indexer and make it callable from the C++ code via JNI.
* __Remarks__: Make sure that `<jdk_root>/bin` is available in your `PATH` environmen variable and that the `JAVA_HOME` environment variable is set:
* __Remarks__: Make sure that `<jdk_root>/bin` is available in your `PATH` environment variable and that the `JAVA_HOME` environment variable is set:
```
JAVA_HOME=<path/to/Java>/jdk1.x.x_xxx
```
* __Maven__
* __REASON__: Used within Sourcetrail's automated tests.
* __Remarks__: Make sure `.../apache-maven-x.x.x/bin` is available in your `PATH` environmen variable and that both `M2_HOME` and `MAVEN_HOME` environment variables are set:
* __Remarks__: Make sure `.../apache-maven-x.x.x/bin` is available in your `PATH` environment variable and that both `M2_HOME` and `MAVEN_HOME` environment variables are set:
```
M2_HOME=.../apache-maven-x.x.x
MAVEN_HOME=.../apache-maven-x.x.x
+2 -2
View File
@@ -171,7 +171,7 @@
</hatching>
</default>
<!-- OPTIONAL: type specific node colors can be overriden by using the TEMPLATE within a type tag below -->
<!-- OPTIONAL: type specific node colors can be overridden by using the TEMPLATE within a type tag below -->
<type></type>
<builtin_type></builtin_type>
<class></class>
@@ -211,7 +211,7 @@
<focus></focus> <!-- If not defined, the normal tag is used -->
</default>
<!-- OPTIONAL: type specific edge colors can be overriden by using the TEMPLATE within a type tag below -->
<!-- OPTIONAL: type specific edge colors can be overridden by using the TEMPLATE within a type tag below -->
<type_of></type_of>
<return_type></return_type>
<parameter_type></parameter_type>
@@ -172,7 +172,7 @@ class HumanPlayer(Player):
def _check(self, field, move):
if not field.inRange(move):
stringOut("Wrong inpot!\n")
stringOut("Wrong input!\n")
return False
elif not field.isEmpty(move):
stringOut("Is occupied!\n")
@@ -7,7 +7,7 @@
//------------------------------------------------------------------------------
//
// ANYTING ELSE I SHOULD KNOW?
// ANYTHING ELSE I SHOULD KNOW?
// I'm glad that you asked. Take a look at the code below. You will notice two
// different highlights when hovering different symbols in that snippet. One
// is used for symbols that may be used everywhere throughout your code base
@@ -7,7 +7,7 @@
//------------------------------------------------------------------------------
//
// 9 - CONGRATULATONS
// 9 - CONGRATULATIONS
// You have completed the challenge of search.
// Oh, I almost forgot: You can only find nodes such as symbols via the search
// bar. It doesn't allow you to find edges like calls or inheritance. At least
@@ -29,7 +29,7 @@ public class AppTest
}
/**
* Rigourous Test :-)
* Rigorous Test :-)
*/
public void testApp()
{
+1 -1
View File
@@ -1,7 +1,7 @@
"If you're a researcher on this book thing and you were on Earth, you must have been gathering material on it."
"Well, I was able to extend the original entry a bit, yes."
"Let me see what it says in this edition, then. I've got to see it."
... "What? Harmless! Is that all it's got to say? Harmless! One word! ... Well, for God's sake I hope you managed to recitify that a bit."
... "What? Harmless! Is that all it's got to say? Harmless! One word! ... Well, for God's sake I hope you managed to rectify that a bit."
"Oh yes, well I managed to transmit a new entry off to the editor. He had to trim it a bit, but it's still an improvement."
"And what does it say now?" asked Arthur.
"Mostly harmless," admitted Ford with a slightly embarrassed cough.
@@ -29,7 +29,7 @@ public class AppTest
}
/**
* Rigourous Test :-)
* Rigorous Test :-)
*/
public void testApp()
{
@@ -29,7 +29,7 @@ public class AppTest
}
/**
* Rigourous Test :-)
* Rigorous Test :-)
*/
public void testApp()
{
@@ -29,7 +29,7 @@ public class AppTest
}
/**
* Rigourous Test :-)
* Rigorous Test :-)
*/
public void testApp()
{
@@ -776,7 +776,7 @@
<summary>Detects the range of versions including the value in VersionMin.</summary>
</member>
<member name="F:Microsoft.Deployment.WindowsInstaller.UpgradeAttributes.VersionMaxInclusive">
<summary>Dectects the range of versions including the value in VersionMax.</summary>
<summary>Detects the range of versions including the value in VersionMax.</summary>
</member>
<member name="F:Microsoft.Deployment.WindowsInstaller.UpgradeAttributes.LanguagesExclusive">
<summary>Detects all languages, excluding the languages listed in the Language column.</summary>
@@ -1115,7 +1115,7 @@
<summary>
Gets the set of registered qualifiers for the component.
</summary>
<returns>Enumeration of the qulifiers for the component.</returns>
<returns>Enumeration of the qualifiers for the component.</returns>
<exception cref="T:Microsoft.Deployment.WindowsInstaller.InstallerException">The installer configuration data is corrupt</exception>
<remarks><p>
Because qualifiers are not ordered, any new qualifier has an arbitrary index,
@@ -1438,7 +1438,7 @@
</member>
<member name="M:Microsoft.Deployment.WindowsInstaller.CustomActionProxy.MethodHasCustomActionSignature(System.Reflection.MethodInfo)">
<summary>
Checks if a method has the right return and paramater types
Checks if a method has the right return and parameter types
for a custom action, and that it is marked by a CustomActionAttribute.
</summary>
<param name="method">Method to be checked.</param>
@@ -1508,7 +1508,7 @@
needed, as leaving lots of unused handles open can degrade performance.
</p><p>
The database is opened in <see cref="F:Microsoft.Deployment.WindowsInstaller.DatabaseOpenMode.CreateDirect" /> mode, and will be
automatically commited when it is closed.
automatically committed when it is closed.
</p><p>
Win32 MSI API:
<a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiopendatabase.asp">MsiOpenDatabase</a>
@@ -1532,7 +1532,7 @@
longer needed, as leaving lots of unused handles open can degrade performance.
</p><p>
A database opened in <see cref="F:Microsoft.Deployment.WindowsInstaller.DatabaseOpenMode.CreateDirect" /> or
<see cref="F:Microsoft.Deployment.WindowsInstaller.DatabaseOpenMode.Direct" /> mode will be automatically commited when it is
<see cref="F:Microsoft.Deployment.WindowsInstaller.DatabaseOpenMode.Direct" /> mode will be automatically committed when it is
closed. However a database opened in <see cref="F:Microsoft.Deployment.WindowsInstaller.DatabaseOpenMode.Create" /> or
<see cref="F:Microsoft.Deployment.WindowsInstaller.DatabaseOpenMode.Transact" /> mode must have the <see cref="M:Microsoft.Deployment.WindowsInstaller.Database.Commit" /> method
called before it is closed, otherwise no changes will be persisted.
@@ -2779,7 +2779,7 @@
<summary>Patches that are superseded by other patches.</summary>
</member>
<member name="F:Microsoft.Deployment.WindowsInstaller.PatchStates.Obsoleted">
<summary>Patches that are obsolesced by other patches.</summary>
<summary>Patches that are obsoleted by other patches.</summary>
</member>
<member name="F:Microsoft.Deployment.WindowsInstaller.PatchStates.Registered">
<summary>Patches that are registered to a product but not applied.</summary>
@@ -3340,7 +3340,7 @@
</member>
<member name="P:Microsoft.Deployment.WindowsInstaller.MergeException.Message">
<summary>
Gets a message that describes the merge conflits.
Gets a message that describes the merge conflicts.
</summary>
</member>
<member name="M:Microsoft.Deployment.WindowsInstaller.MergeException.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
@@ -3471,7 +3471,7 @@
</summary>
<param name="logModes">One or more mode flags specifying the type of messages to log</param>
<param name="logFile">Full path to the log file. A null path disables logging,
in which case the logModes paraneter is ignored.</param>
in which case the logModes parameter is ignored.</param>
<exception cref="T:System.ArgumentException">an invalid log mode was specified</exception>
<remarks>This method takes effect on any new installation processes. Calling this
method from within a custom action will not start logging for that installation.</remarks>
@@ -3483,7 +3483,7 @@
</summary>
<param name="logModes">One or more mode flags specifying the type of messages to log</param>
<param name="logFile">Full path to the log file. A null path disables logging,
in which case the logModes paraneter is ignored.</param>
in which case the logModes parameter is ignored.</param>
<param name="append">If true, the log lines will be appended to any existing file content.
If false, the log file will be truncated if it exists. The default is false.</param>
<param name="flushEveryLine">If true, the log will be flushed after every line.
@@ -3846,7 +3846,7 @@
<summary>
Determines which patches apply to a specified product and in what sequence. If
the product is installed, this method accounts for patches that have already been applied to
the product and accounts for obsolete and superceded patches.
the product and accounts for obsolete and superseded patches.
</summary>
<param name="product">The product that is the target for the set of patches. This may be
either a ProductCode (GUID) of a product that is currently installed, or the path to a an
@@ -4267,7 +4267,7 @@
<a href="http://msdn.microsoft.com/library/en-us/msi/setup/msigetfeatureinfo.asp">MsiGetFeatureInfo</a>,
<a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisetfeatureattributes.asp">MsiSetFeatureAttributes</a>
</p><p>
Since the lpAttributes paramter of
Since the lpAttributes parameter of
<a href="http://msdn.microsoft.com/library/en-us/msi/setup/msigetfeatureinfo.asp">MsiGetFeatureInfo</a>
does not contain an equivalent flag for <see cref="F:Microsoft.Deployment.WindowsInstaller.FeatureAttributes.UIDisallowAbsent"/>, this flag will
not be retrieved.
@@ -4453,7 +4453,7 @@
</member>
<member name="P:Microsoft.Deployment.WindowsInstaller.InstallerHandle.Sync">
<summary>
Gets an object that can be used internally for safe syncronization.
Gets an object that can be used internally for safe synchronization.
</summary>
</member>
<member name="M:Microsoft.Deployment.WindowsInstaller.InstallerHandle.Dispose(System.Boolean)">
@@ -4824,7 +4824,7 @@
</member>
<member name="P:Microsoft.Deployment.WindowsInstaller.PatchInstallation.IsObsoleted">
<summary>
Gets a value indicating whether this patch is marked as obsolte.
Gets a value indicating whether this patch is marked as obsolete.
</summary>
</member>
<member name="P:Microsoft.Deployment.WindowsInstaller.PatchInstallation.IsSuperseded">
@@ -5328,7 +5328,7 @@
</summary>
<remarks><p>
Win32 MSI API:
<a href="http://msdn.microsoft.com/library/en-us/msi/setup/msirecordcleardata.asp">MsiRecordClearData</a>
<a href="http://msdn.microsoft.com/library/en-us/msi/setup/msirecordclearedata.asp">MsiRecordClearData</a>
</p></remarks>
</member>
<member name="M:Microsoft.Deployment.WindowsInstaller.Record.IsNull(System.Int32)">
@@ -6085,7 +6085,7 @@
<item><description>The Select and Installed states for all features in the Feature table</description></item>
<item><description>The Action state of each component in the Component table, based on the new level</description></item>
</list>
If 0 or a negative number is passed in the ilnstallLevel parameter,
If 0 or a negative number is passed in the installLevel parameter,
the current installation level does not change, but all features are still
updated based on the current installation level.
</p><p>
@@ -6200,7 +6200,7 @@
</member>
<member name="M:Microsoft.Deployment.WindowsInstaller.Session.ValidateSessionAccess">
<summary>
Throws an exception if the custom action is not able to access immedate session details.
Throws an exception if the custom action is not able to access immediate session details.
</summary>
</member>
<member name="T:Microsoft.Deployment.WindowsInstaller.ShortcutTarget">
@@ -6605,7 +6605,7 @@
<member name="P:Microsoft.Deployment.WindowsInstaller.SummaryInfo.Template">
<summary>Gets or sets the Template summary information property.</summary>
<remarks><p>
The Template summary information propery indicates the platform and language versions supported by the database.
The Template summary information property indicates the platform and language versions supported by the database.
</p><p>
The syntax of the Template Summary property information is:
[platform property][,platform property][,...];[language id][,language id][,...]
+1 -1
View File
@@ -23,7 +23,7 @@ echo "installer version is $VERSION_STRING"
PRODUCT_GUID=$("uuidgen")
if [ -z "$PRODUCT_GUID" ]; then
echo "Unable to generate GUID. Make sure to run this script from the Visual Studio command propmt. Aborting now."
echo "Unable to generate GUID. Make sure to run this script from the Visual Studio command prompt. Aborting now."
exit 1
else
echo "$WIN_ARCH product guid is $PRODUCT_GUID"
+7 -7
View File
@@ -10,7 +10,7 @@ Build the installer
-I used stable version 3.10.3 for development
-make sure the WiX directory is in you OS path variable ('..\WiX Toolset v3.10\bin')
-Sourcetrail has to be built with the 'deploy' flag
-installer would still build if the deploy flag wasnt set, but the Sourcetrail wont run properly on a user machine
-installer would still build if the deploy flag wasn't set, but the Sourcetrail wont run properly on a user machine
-Execute build.bat
-This will build sourcetrail.msi file, all needed custom action dlls and the setup.exe file
@@ -41,10 +41,10 @@ Add new components (e.g. files) to the installation
-...
Generel
General
-to add a file create a <Component> element
-mind the <Directory> tags, they define where the component will be installed. Add new directories if necessary
-Id: the directory will be refered to within the wix project using this id
-Id: the directory will be referred to within the wix project using this id
-Name: the name of the folder that will be created on the user machine
-Id: is used to refer to the component within the wix project
-Guid: GUIDs are unique id's used by windows to identify and refer to installed files, applications and so on. You need to create a new GUID for every new component
@@ -55,7 +55,7 @@ Generel
-Name: the name that the file will have on the user machine, may be different from the file name on the source machine
-Source: the path and name to the file on the source machine, relative to the current .wxs file
-KeyPath: depends on where you want to install the file, see below in 'Add new file to...'
-usually there is one component for each single file. Multiple files can be added to a component, this might make sense if the files are considered 100% unseperable. The recommended way however is one file per component
-usually there is one component for each single file. Multiple files can be added to a component, this might make sense if the files are considered 100% inseparable. The recommended way however is one file per component
Add new file to the installation directory (installDir.wxs)
@@ -76,7 +76,7 @@ Not quite done yet! (sourcetrail.wxs)
-components need to be added to a feature (a feature is part of a software, consisting of components, that may or may not be installed during setup)
-right now we only have the Complete/Program feature, so no part of sourcetrail is optional right now
-to add a component to a feature use the <ComponentRef> tag
-Id: id of the component you want to refere to
-Id: id of the component you want to reference
------------------
@@ -89,7 +89,7 @@ Version Number
-candle.exe -dprojectVersion="0.7.0" ...
-replace 0.7.0 with the desired version number
Minor upgrage (sourcetrail.wxs)
Minor upgrade (sourcetrail.wxs)
-for when only a few files are to be updated
-update the version number in build.bat script
-do NOT change the product GUID
@@ -101,4 +101,4 @@ Major upgrade (sourcetrail.wxs)
-update the version number in build.bat script
-DO change the product GUID
-insert the same GUID into the uninstall_wix.bat script
-package GUID changes too, but thats again done automatically
-package GUID changes too, but that's again done automatically
+36 -36
View File
@@ -197,7 +197,7 @@
<div class="row" style="height:20px;"></div>
<strong>Are you using CMake, Make or Qt Creator?</strong>
<p>If you are using <a href="https://cmake.org/">CMake</a> or <a href="https://www.gnu.org/software/make/">Make</a> as build environment you can export a <a href="https://clang.llvm.org/docs/JSONCompilationDatabase.html">clang JSON Compilaton Database</a> as <code>compile_commands.json</code> file. A Compilation Database holds all information necessary for building the project, such as source files, include paths and compiler flags. Having a Compilation Database makes project setup within Sourcetrail a lot easier. We recommend using this approach if possible.</p>
<p>If you are using <a href="https://cmake.org/">CMake</a> or <a href="https://www.gnu.org/software/make/">Make</a> as build environment you can export a <a href="https://clang.llvm.org/docs/JSONCompilationDatabase.html">clang JSON Compilation Database</a> as <code>compile_commands.json</code> file. A Compilation Database holds all information necessary for building the project, such as source files, include paths and compiler flags. Having a Compilation Database makes project setup within Sourcetrail a lot easier. We recommend using this approach if possible.</p>
<p>Exporting a Compilation Database:</p>
<ul>
@@ -753,7 +753,7 @@
</tr>
<tr>
<th scope="row">Multi process C/C++ indexing</th>
<td>Enable C/C++ indexer threads to run in a different process. This prevents the application from crashing due to unforseen exceptions while indexing.</td>
<td>Enable C/C++ indexer threads to run in a different process. This prevents the application from crashing due to unforeseen exceptions while indexing.</td>
</tr>
<tr>
<th scope="row">Java Path</th>
@@ -821,7 +821,7 @@
<strong>Interactions:</strong>
<ul>
<li>Swith indexing mode by clicking a different option.</li>
<li>Switch indexing mode by clicking a different option.</li>
<li>Clicking <var>Cancel</var> will abort indexing.</li>
<li>Clicking <var>Start</var> will start the file clearing and indexing.</li>
</ul>
@@ -1848,7 +1848,7 @@
</ul>
<h3>Keywords</h3>
<p>Additionally the search view provides specific keywords that select a certein group of symbols.</p>
<p>Additionally the search view provides specific keywords that select a certain group of symbols.</p>
<table class="table table-hover">
<thead>
<tr> <th>keyword</th> <th>effect</th> </tr>
@@ -1868,7 +1868,7 @@
</div>
<strong>Interactions:</strong>
<ul>
<li>Start a query with <code>?</code> or use the <a href="#FindText">Find Text</a> action to do a case-insensitive full text serach.</li>
<li>Start a query with <code>?</code> or use the <a href="#FindText">Find Text</a> action to do a case-insensitive full text search.</li>
<li>Start a query with <code>??</code> to do a case-sensitive full text search.</li>
</ul>
@@ -1960,7 +1960,7 @@
<div class="row" style="height:10px;"></div>
<h3>Errors Tab</h3>
<p>This list shows errors occured durring indexing.</p>
<p>This list shows errors occurred during indexing.</p>
<div class="row">
<div class="col-sm-10 col-sm-offset-1">
<img src="img/status_view_error.png" style="width:100%;">
@@ -2043,7 +2043,7 @@
<li>Clicking a <var>Source Group</var> will let you edit it's configuration and change it's name.</li>
<li>Clicking <code>+</code> beneath the Source Group list will take you to the creation of a new Source Group.</li>
<li>Clicking <code>-</code> beneath the Source Group list will delete the currently selected Source Group.</li>
<li>Clicking <code></code> beneath the Source Group list will duplicate the currenlty selected Source Group.</li>
<li>Clicking <code></code> beneath the Source Group list will duplicate the currently selected Source Group.</li>
<li>Clicking <var>Create</var> will close this window and create the new project.</li>
</ul>
@@ -2068,7 +2068,7 @@
<h2>Choose a Source Group Type</h2>
<p>When creating a new Source Group you can choose between different methods of setup depending on your project language. Please have a look at our <a href="#Choosingtherightprojectsetup">QUCICK START GUIDE section</a> for help on choosing the right Source Group type.</p>
<p>When creating a new Source Group you can choose between different methods of setup depending on your project language. Please have a look at our <a href="#ChoosingTheRightProjectSetup">QUICK START GUIDE section</a> for help on choosing the right Source Group type.</p>
<div class="row">
<div class="col-sm-8 col-sm-offset-2">
@@ -2157,7 +2157,7 @@
<h2 id="CreateAProjectFromCompilationDatabase">C/C++ Source Group from Compilation Database</h2>
<p>If you are using <a href="https://cmake.org/">CMake</a> you can export compile commands by defining the <code>CMAKE_EXPORT_COMPILE_COMMANDS</code> flag and then use the exportet <code>.json</code> file for Sourcetrail project setup.</p>
<p>If you are using <a href="https://cmake.org/">CMake</a> you can export compile commands by defining the <code>CMAKE_EXPORT_COMPILE_COMMANDS</code> flag and then use the exported <code>.json</code> file for Sourcetrail project setup.</p>
<p>For non-CMake projects you can use <a href="https://github.com/rizsotto/Bear">Bear</a>. Bear generates a <code>.json</code> file during the simulated build process. Bear has been tested on FreeBSD, GNU/Linux and OS X.</p>
<p>C/C++ Source Groups from Compilation Database offer the following configuration options:</p>
@@ -2527,7 +2527,7 @@
</tr>
<tr>
<th scope="row">Source File Extensions</th>
<td>Define the valid extensions for source files including the dot e.g. <code>.ext</code>. Sourcetrail will only try to index files that match one of these extensions. If no extion is defined, any file extension is valid.</td>
<td>Define the valid extensions for source files including the dot e.g. <code>.ext</code>. Sourcetrail will only try to index files that match one of these extensions. If no extension is defined, any file extension is valid.</td>
</tr>
</tbody>
</table>
@@ -2537,7 +2537,7 @@
<h1>Command Line</h1>
<p>Currently you can use the command line to configue Sourcetrail or index a Sourcetrail project.</p>
<p>Currently you can use the command line to configure Sourcetrail or index a Sourcetrail project.</p>
<p>When no command is given</p>
<pre>sourcetrail [options...] </pre>
@@ -2572,7 +2572,7 @@
<tr> <th scope="row">--indexer-threads</th> <td>Number of threads used for indexing (0 means ideal thread count).</td> </tr>
<tr> <th scope="row">--use-processes</th> <td>Enable C/C++ indexer threads to run in different processes.</td> </tr>
<tr> <th scope="row">--logging-enabled</th> <td>Enable (true) or disable (false) file/console logging.</td> </tr>
<tr> <th scope="row">--verbose-indexer-logging-enabled</th> <td>Enable additaional log of abstract syntax tree during the indexing. Be careful with this, it slows down the indexing tremendously.</td> </tr>
<tr> <th scope="row">--verbose-indexer-logging-enabled</th> <td>Enable additional log of abstract syntax tree during the indexing. Be careful with this, it slows down the indexing tremendously.</td> </tr>
<tr> <th scope="row">--jvm-path</th> <td>Path to the location of the jvm library.</td> </tr>
<tr> <th scope="row">--jvm-max-memory</th> <td>Set the maximum amount of memory for the JVM indexer(-1 for using the JVM default settings).</td> </tr>
<tr> <th scope="row">--maven-path</th> <td>Path to the maven executable.</td> </tr>
@@ -2756,7 +2756,7 @@
<strong>Installation</strong>
<p><ul>
<li>Manuelly</li>
<li>Manually</li>
<ol>
<li>Download the sourcetrail.el from <a href="https://github.com/CoatiSoftware/emacs-sourcetrail">https://github.com/CoatiSoftware/emacs-sourcetrail</a></li>
<li>In Emacs press <kbd>M</kbd> + <kbd>x</kbd> and type in <code>package-install-file</code></li>
@@ -2806,12 +2806,12 @@
</li>
<li>restart Sublime</li>
</ol>
<li>Package Controll</li>
<li>Package Control</li>
<ol>
<li>If you dont have Package Controll for Sublime go to https://packagecontrol.io and
<li>If you don't have Package Control for Sublime go to https://packagecontrol.io and
install it</li>
<li>Open Command Pallete with <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd></li>
<li>Select <code>Package Controll: Install Package</code></li>
<li>Open Command Palette with <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd></li>
<li>Select <code>Package Control: Install Package</code></li>
<li>Install <code>sourcetrail</code></li>
</ol>
</ul></p>
@@ -2829,7 +2829,7 @@
<strong>Installation</strong>
<p>
<p>Please visit the <a href="https://github.com/CoatiSoftware/vim-sourcetrail">vim-sourcetrail</a> repository on Github for details.</p>
<p>Please visit the <a href="https://github.com/CoatiSoftware/vim-sourcetrail">vim-sourcetrail</a> repository on GitHub for details.</p>
</p>
<strong>Use</strong>
<p>If you want Vim to activate a certain element in Sourcetrail, go to the code location and use
@@ -2850,9 +2850,9 @@
</p>
<strong>Use</strong>
<p>To start the Tcp Server go to the Command Pallete(<kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd>) and type: <code>Sourcetrail: (Re)start server</code></p>
<p>To start the Tcp Server go to the Command Palette(<kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd>) and type: <code>Sourcetrail: (Re)start server</code></p>
<p>To send a location to Sourcetrail, place the cursor and right-click and select <code>Sourcetrail: Send Location</code>
or type in the Command Pallete: <code>Sourcetrail: Send Location</code></p>
or type in the Command Palette: <code>Sourcetrail: Send Location</code></p>
<h3>Visual Studio</h3>
<strong>Download, Reviews:</strong>
@@ -2903,19 +2903,19 @@
<tr> <th>Option</th> <th>Description</th> </tr>
</thead>
<tbody>
<tr> <th scope="row">Select Projects</th> <td>The list of C/C++ projects in your solution. Check all projects you want to be included in the generated JSON Compilaton Database file.</td> </tr>
<tr> <th scope="row">Select Projects</th> <td>The list of C/C++ projects in your solution. Check all projects you want to be included in the generated JSON Compilation Database file.</td> </tr>
<tr> <th scope="row">De/Select All</th> <td>Will select all projects if at least one project is not selected. If all projects are selected they will all be unselected.</td> </tr>
<tr> <th scope="row">Configuration</th> <td>A dropdown list of the available build configurations. The selected configuration affects include paths and compile flags for the Compilaton Database.</td> </tr>
<tr> <th scope="row">Platform</th> <td>A dropdown list of the available target platforms. The selected platform affects include paths and compile flags for the Compilaton Database.</td> </tr>
<tr> <th scope="row">Browse</th> <td>Opens a folder browser to select the directory where the Compilaton Database will be created in. By default it is the directory of your solution. Instead of using the folder browser you can also paste a path into the adjacent text field.</td> </tr>
<tr> <th scope="row">filename</th> <td>This is the name for the Compilaton Database file. By default it is the same name as your solution.</td> </tr>
<tr> <th scope="row">Configuration</th> <td>A dropdown list of the available build configurations. The selected configuration affects include paths and compile flags for the Compilation Database.</td> </tr>
<tr> <th scope="row">Platform</th> <td>A dropdown list of the available target platforms. The selected platform affects include paths and compile flags for the Compilation Database.</td> </tr>
<tr> <th scope="row">Browse</th> <td>Opens a folder browser to select the directory where the Compilation Database will be created in. By default it is the directory of your solution. Instead of using the folder browser you can also paste a path into the adjacent text field.</td> </tr>
<tr> <th scope="row">filename</th> <td>This is the name for the Compilation Database file. By default it is the same name as your solution.</td> </tr>
<tr> <th scope="row">C Standard</th> <td>A dropdown list of all C standards supported by Sourcetrail. If your projects contain C files select the appropriate standard.</td> </tr>
<tr> <th scope="row">Cancel</th> <td>Aborts the process and closes the wizard.</td> </tr>
<tr> <th scope="row">Create</th> <td>Creates the Compilaton Database using the specified options. Note that at least one project has to be selected to start creating.</td> </tr>
<tr> <th scope="row">Create</th> <td>Creates the Compilation Database using the specified options. Note that at least one project has to be selected to start creating.</td> </tr>
</tbody>
</table>
<p>Once the Compilaton Database was successfully created it can be found in the specified target directory. From this Compilaton Database you can create a Sourcetrail project as <a href="#CreateAProjectFromCompilationDatabase">described above</a>.</p>
<p>Once the Compilation Database was successfully created it can be found in the specified target directory. From this Compilation Database you can create a Sourcetrail project as <a href="#CreateAProjectFromCompilationDatabase">described above</a>.</p>
<strong>Settings</strong>
<p>Network settings and logging options can be changed in the plugin's Tools/Options entry.</p>
@@ -2941,8 +2941,8 @@
<tr> <th>Option</th> <th>Description</th> </tr>
</thead>
<tbody>
<tr> <th scope="row">File Logging</th> <td>Enable log output for the plugin. Additionaly to the output file, log messages will also be displayed in VS' </td> </tr>
<tr> <th Id="vsPluginOptionObfuscation" scope="row">Log Obfuscation</th> <td>Obfuscate project names and file names as well as directories in the log output. Note that already logged data <b>will not be obfuscated retroactively</b>. A dictionary, mapping obfuscated names to original names, will be created in a seperate file.</td> </tr>
<tr> <th scope="row">File Logging</th> <td>Enable log output for the plugin. Additionally to the output file, log messages will also be displayed in VS' </td> </tr>
<tr> <th Id="vsPluginOptionObfuscation" scope="row">Log Obfuscation</th> <td>Obfuscate project names and file names as well as directories in the log output. Note that already logged data <b>will not be obfuscated retroactively</b>. A dictionary, mapping obfuscated names to original names, will be created in a separate file.</td> </tr>
<tr> <th scope="row">Sourcetrail Port</th> <td>The port on which Sourcetrail will receive messages. Note that this must match the port setting in Sourcetrail itself.</td> </tr>
<tr> <th scope="row">Thread Count</th> <td>The number of threads used during creation of the Compilation Database</td> </tr>
<tr> <th scope="row">VS Port</th> <td>The port on which Visual Studio will receive messages. Note that this must match the port setting in Sourcetrail itself.</td> </tr>
@@ -2960,7 +2960,7 @@
</div>
<!-- Obfuscation -->
<p>Note that the logs will include project names and file names as well as directories specific to your project. If you wish to keep this informatin secret you can enable <a href="#vsPluginOptionObfuscation">log obfuscation</a>.</p>
<p>Note that the logs will include project names and file names as well as directories specific to your project. If you wish to keep this information secret you can enable <a href="#vsPluginOptionObfuscation">log obfuscation</a>.</p>
<p>Project- and file names as well as directories will be replaced by an alphanumeric sequence. The sequence has the form <code>a0, b0, c0,..., a1, b1, c1,...</code>. Note that after switching on obfuscation, already logged data <b>will not be obfuscated retroactively</b>. No log files will be send to Coati Software automatically. You can check any file you may want to send us for sensible information before sending it.</p>
<p>A dictionary, mapping obfuscated names to original names, will be created in your log folder if log obfuscation is switched on. When during the support process we refer to project items by their obfuscated name you can still make sense of it. <b>Do not send the dictionary to anybody else</b>.</p>
@@ -2980,7 +2980,7 @@
<h3>Message Structure</h3>
<p>The basic structure of the messages used by Sourcetrail plugins consists of a prefix to identify the message type, followed by no, one, or multiple parameters and ends with an 'end-of-message' token. Parameters and tokens are seperated by a 'divider' token.</p>
<p>The basic structure of the messages used by Sourcetrail plugins consists of a prefix to identify the message type, followed by no, one, or multiple parameters and ends with an 'end-of-message' token. Parameters and tokens are separated by a 'divider' token.</p>
<table class="table table-hover">
<thead>
@@ -2988,7 +2988,7 @@
</thead>
<tbody>
<tr> <th scope="row">messageType</th> <th><a href="#MessageTypes">see below</a></th> <td>A string that determines how the message will be interpreted by Sourcetrail or the plugin</td> </tr>
<tr> <th scope="row">divider</th> <th><code>>></code></th> <td>Seperates the tokens of the message</td> </tr>
<tr> <th scope="row">divider</th> <th><code>>></code></th> <td>Separates the tokens of the message</td> </tr>
<tr> <th scope="row">parameter</th> <th><a href="#MessageTypes">see below</a></th> <td>Typically an integer or string</td> </tr>
<tr> <th scope="row">endOfMessage</th> <th><code>&lt;EOM&gt;</code></th> <td>Helps to determine the end of a message</td> </tr>
</tbody>
@@ -3027,7 +3027,7 @@
</thead>
<tbody>
<tr> <th scope="row"><code>setActiveToken</code></th> <th>fileLocation: string<br>row: integer<br>column: integer</th> <td>Tells Sourcetrail to shift focus to the token located at the given position. Note that fileLocation is the absolute path and name of the target file.</td> </tr>
<tr> <th scope="row"><code>createCDBProject</code></th> <th>cdbPath: string<br>headerPaths: string</th> <td>If your plugin can provide a Compilation Database this message can prompt Sourcetrail to import it and display an appropriate dialog for the user. headerPaths is a list of the base project's header include paths. Seperate the single paths using the divider token. You can add as many paths as you need.</td> </tr>
<tr> <th scope="row"><code>createCDBProject</code></th> <th>cdbPath: string<br>headerPaths: string</th> <td>If your plugin can provide a Compilation Database this message can prompt Sourcetrail to import it and display an appropriate dialog for the user. headerPaths is a list of the base project's header include paths. Separate the single paths using the divider token. You can add as many paths as you need.</td> </tr>
<tr> <th scope="row"><code>ping</code></th> <th></th> <td>Your plugin may send this message to Sourcetrail to tell it it's listening.</td> </tr>
</tbody>
</table>
@@ -3038,7 +3038,7 @@
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">Can I use Sourcetrail on confidental source code?</h3>
<h3 class="panel-title">Can I use Sourcetrail on confidential source code?</h3>
</div>
<div class="panel-body">
Yes. Sourcetrail keeps the data completely offline and unless disabled, will only establish a connection to the internet to check if a more recent version is available.
@@ -3053,10 +3053,10 @@
<p>Sourcetrail does two things with the data collected during indexing:</p>
<ol>
<li>The data is stored in the <code>.srctrldb</code> file which is in the same directory as the <code>.srctrlprj</code> file. This database file is used by Sourcetrail to serve its purpose of letting you navigate your source code and also allowing Sourcetrail to re-open the project without re-indexing the source code each time.
<p><b> Note:</b> The <code> .srctrldb </code> file is actualy a <code> .sqlite </code> database file and can be inspected using the <a href="https://sqlitebrowser.org/">DB Browser for SQLite</a>.</p>
<p><b> Note:</b> The <code> .srctrldb </code> file is actually a <code> .sqlite </code> database file and can be inspected using the <a href="https://sqlitebrowser.org/">DB Browser for SQLite</a>.</p>
</li>
<li>If logging is enabled, some of the data gets logged into a log file saved in <a href="#Datafolder">data</a>/logs. These logs can be useful to us for fixing bugs. We may ask for log information on bug reports, but you should only provide it, if your source code is not confidental.</li>
<li>If logging is enabled, some of the data gets logged into a log file saved in <a href="#Datafolder">data</a>/logs. These logs can be useful to us for fixing bugs. We may ask for log information on bug reports, but you should only provide it, if your source code is not confidential.</li>
</ol>
</div>
</div>
+1 -1
View File
@@ -1,5 +1,5 @@
#atom-sourcetrail
The Atom plugin is hosted at Github.
The Atom plugin is hosted at GitHub.
Link to the repository: [atom-sourcetrail](https://github.com/CoatiSoftware/atom-sourcetrail).
+1 -1
View File
@@ -1,5 +1,5 @@
#eclipse-sourcetrail
The Eclipse plugin is hosted at Github.
The Eclipse plugin is hosted at GitHub.
Link to the repository: [eSourcetrail](https://github.com/CoatiSoftware/eSourcetrail).
+1 -1
View File
@@ -1,5 +1,5 @@
#emacs-sourcetrail
The Emacs plugin is hosted at Github.
The Emacs plugin is hosted at GitHub.
Link to the repository: [emacs-sourcetrail](https://github.com/CoatiSoftware/emacs-sourcetrail).
+1 -1
View File
@@ -1,5 +1,5 @@
#idea-sourcetrail
The CLion/IntelliJ plugin is hosted at Github.
The CLion/IntelliJ plugin is hosted at GitHub.
Link to the repository: [idea-sourcetrail](https://github.com/CoatiSoftware/idea-sourcetrail).
+1 -1
View File
@@ -1,6 +1,6 @@
#qtc-sourcetrail
The QtCreator plugin is hosted at Github.
The QtCreator plugin is hosted at GitHub.
Link to the repository: [qtc-sourcetrail](https://github.com/CoatiSoftware/qtc-sourcetrail).
+1 -1
View File
@@ -1,5 +1,5 @@
#sublime-sourcetrail
The Sublime plugin is hosted at Github.
The Sublime plugin is hosted at GitHub.
Link to the repository: [sublime-sourcetrail](https://github.com/CoatiSoftware/sublime-sourcetrail).
+1 -1
View File
@@ -1,5 +1,5 @@
#vim-sourcetrail
The Vim plugin is hosted at Github.
The Vim plugin is hosted at GitHub.
Link to the repository: [vim-sourcetrail](https://github.com/CoatiSoftware/vim-sourcetrail).
+1 -1
View File
@@ -1,6 +1,6 @@
#vs-sourcetrail
The Visual Studio extension source code is hosted at Github.
The Visual Studio extension source code is hosted at GitHub.
The extension is available in the Visual Studio Marketplace. To install this extension follow these steps:
* open Visual Studio
+1 -1
View File
@@ -1,6 +1,6 @@
#vsce-sourcetrail
The VS Code extension source code is hosted at Github.
The VS Code extension source code is hosted at GitHub.
The extension is available in the marketplace,
to install it simple use the marketplace inside VS Code
@@ -453,7 +453,7 @@ public abstract class AstVisitor extends ASTVisitor
ReferenceKind.IMPORT, symbolName.toNameHierarchy(), context.toNameHierarchy(), range);
}
// record package symbol kind of current node if appliccable
// record package symbol kind of current node if applicable
if (binding instanceof IPackageBinding)
{
Optional<DeclName> packageName = BindingNameResolver.getQualifiedName(
@@ -7,7 +7,7 @@ import java.util.Optional;
public class NameHierarchy
{
private List<NameElement> m_elements = new ArrayList<>();
private char m_separatpr = '.';
private char m_separator = '.';
public NameHierarchy() {}
@@ -28,7 +28,7 @@ public class NameHierarchy
public void setSeparator(char separator)
{
m_separatpr = separator;
m_separator = separator;
}
public void push(NameElement element)
@@ -55,7 +55,7 @@ public class NameHierarchy
public String serialize()
{
String serialized = m_separatpr + "\tm";
String serialized = m_separator + "\tm";
for (int i = 0; i < m_elements.size(); i++)
{
+3 -3
View File
@@ -38,7 +38,7 @@ function build_type {
echo -e $INFO Starting with buildtype: $1
if [ "$PLATFORM" == "Windows" ]
then
echo -e $INFO Builing the Sourcetrail VS Solution
echo -e $INFO Building the Sourcetrail VS Solution
cmake --build build/win32 --config $1
if [ $? -ne 0 ]
then
@@ -68,7 +68,7 @@ function run_tests {
cd $ROOTDIR
}
# testing before commiting to a publish branch
# testing before committing to a publish branch
if [[ ${BRANCH_NAME:0:9} == "_publish_" ]]
then
echo Try to publish
@@ -87,7 +87,7 @@ fi
if [ $BRANCH_NAME == "master" ]
then
echo -e $ABORT "Commiting to master is prohibited."
echo -e $ABORT "Committing to master is prohibited."
exit 1
fi
+1 -1
View File
@@ -13,7 +13,7 @@ do
then
if [ "$remote_ref" == "refs/heads/master" ]
then
echo -e $FAIL "seriously dont delete the master"
echo -e $FAIL "seriously don't delete the master"
exit 1
else
echo "delete remote branch $remote_ref"
@@ -16,7 +16,7 @@
#include "utility.h"
#include "utilityString.h"
const std::wstring BookmarkController::s_edgeSeperatorToken = L" => ";
const std::wstring BookmarkController::s_edgeSeparatorToken = L" => ";
const std::wstring BookmarkController::s_defaultCategoryName = L"default";
BookmarkController::BookmarkController(StorageAccess* storageAccess)
@@ -509,7 +509,7 @@ std::vector<std::wstring> BookmarkController::getActiveEdgeDisplayNames() const
const StorageEdge activeEdge = m_storageAccess->getEdgeById(activeEdgeId);
const std::wstring sourceDisplayName = getNodeDisplayName(activeEdge.sourceNodeId);
const std::wstring targetDisplayName = getNodeDisplayName(activeEdge.targetNodeId);
activeEdgeDisplayNames.push_back(sourceDisplayName + s_edgeSeperatorToken + targetDisplayName);
activeEdgeDisplayNames.push_back(sourceDisplayName + s_edgeSeparatorToken + targetDisplayName);
}
return activeEdgeDisplayNames;
}
@@ -120,7 +120,7 @@ private:
void update();
static const std::wstring s_edgeSeperatorToken;
static const std::wstring s_edgeSeparatorToken;
static const std::wstring s_defaultCategoryName;
StorageAccess* m_storageAccess;
@@ -1333,7 +1333,7 @@ CodeFileParams* CodeController::addSourceLocations(std::shared_ptr<SourceLocatio
{
return nullptr;
}
else if (oldSnippet.startLineNumber < start || oldSnippet.endLineNumber > end) // overlaping
else if (oldSnippet.startLineNumber < start || oldSnippet.endLineNumber > end) // overlapping
{
newSnippet = CodeSnippetParams::merge(newSnippet, oldSnippet);
}
@@ -2151,7 +2151,7 @@ void GraphController::layoutToGrid(DummyNode* node) const
return;
}
// Increase size of nodes with visible chilren to cover full grid cells
// Increase size of nodes with visible children to cover full grid cells
size_t width = GraphViewStyle::toGridSize(node->size.x);
size_t height = GraphViewStyle::toGridSize(node->size.y);
@@ -2440,7 +2440,7 @@ void GraphController::createLegendGraph()
Node* main = addNode(NODE_CLASS, L"Class", Vec2i(x + 200, y + 130));
Node* derived = addNode(NODE_CLASS, L"Derived Class", Vec2i(x + 210, y + 380));
Node* user = addNode(NODE_TYPE, L"Referencing Type", Vec2i(x - 10, y + 220));
Node* usee = addNode(NODE_TYPE, L"Referenced Type", Vec2i(x + 410, y + 220));
Node* used = addNode(NODE_TYPE, L"Referenced Type", Vec2i(x + 410, y + 220));
addEdge(Edge::EDGE_INHERITANCE, main, base);
addEdge(Edge::EDGE_INHERITANCE, derived, main);
@@ -2457,7 +2457,7 @@ void GraphController::createLegendGraph()
}
{
Edge* edge = addEdge(Edge::EDGE_BUNDLED_EDGES, main, usee);
Edge* edge = addEdge(Edge::EDGE_BUNDLED_EDGES, main, used);
std::shared_ptr<TokenComponentBundledEdges> bundledEdgesComp =
std::make_shared<TokenComponentBundledEdges>();
for (size_t i = 0; i < 10; i++)
@@ -35,7 +35,7 @@ std::deque<SnippetMerger::Range> SnippetMerger::merge(std::vector<SnippetMerger:
// merge children
const int snippetMergeRange = 2 * snippetExpandRange +
1; // +1 since snippets that end/start with consequtive
1; // +1 since snippets that end/start with consecutive
// lines should be merged as well.
merged = Range::mergeAdjacent(merged, snippetMergeRange);
@@ -6,7 +6,7 @@
const char* InterprocessIntermediateStorageManager::s_sharedMemoryNamePrefix = "iist_";
const char* InterprocessIntermediateStorageManager::s_intermediatStoragesKeyName =
const char* InterprocessIntermediateStorageManager::s_intermediateStoragesKeyName =
"intermediate_storages";
InterprocessIntermediateStorageManager::InterprocessIntermediateStorageManager(
@@ -56,7 +56,7 @@ void InterprocessIntermediateStorageManager::pushIntermediateStorage(
SharedMemory::Queue<SharedIntermediateStorage>* queue =
access.accessValueWithAllocator<SharedMemory::Queue<SharedIntermediateStorage>>(
s_intermediatStoragesKeyName);
s_intermediateStoragesKeyName);
if (!queue)
{
return;
@@ -97,7 +97,7 @@ std::shared_ptr<IntermediateStorage> InterprocessIntermediateStorageManager::pop
SharedMemory::Queue<SharedIntermediateStorage>* queue =
access.accessValueWithAllocator<SharedMemory::Queue<SharedIntermediateStorage>>(
s_intermediatStoragesKeyName);
s_intermediateStoragesKeyName);
if (!queue || !queue->size())
{
return nullptr;
@@ -131,7 +131,7 @@ size_t InterprocessIntermediateStorageManager::getIntermediateStorageCount()
SharedMemory::Queue<SharedIntermediateStorage>* queue =
access.accessValueWithAllocator<SharedMemory::Queue<SharedIntermediateStorage>>(
s_intermediatStoragesKeyName);
s_intermediateStoragesKeyName);
if (!queue)
{
return 0;
@@ -18,7 +18,7 @@ public:
private:
static const char* s_sharedMemoryNamePrefix;
static const char* s_intermediatStoragesKeyName;
static const char* s_intermediateStoragesKeyName;
size_t m_insertsWithoutGrowth;
};
@@ -167,11 +167,11 @@ std::set<StorageOccurrence> SharedIntermediateStorage::getStorageOccurrences() c
return result;
}
void SharedIntermediateStorage::setStorageOccurrences(const std::set<StorageOccurrence>& storageOccurences)
void SharedIntermediateStorage::setStorageOccurrences(const std::set<StorageOccurrence>& storageOccurrences)
{
m_storageOccurrences.clear();
for (const StorageOccurrence& occurrence: storageOccurences)
for (const StorageOccurrence& occurrence: storageOccurrences)
{
m_storageOccurrences.push_back(toShared(occurrence, m_allocator));
}
@@ -32,7 +32,7 @@ public:
void setStorageSourceLocations(const std::set<StorageSourceLocation>& storageSourceLocations);
std::set<StorageOccurrence> getStorageOccurrences() const;
void setStorageOccurrences(const std::set<StorageOccurrence>& storageOccurences);
void setStorageOccurrences(const std::set<StorageOccurrence>& storageOccurrences);
std::set<StorageComponentAccess> getStorageComponentAccesses() const;
void setStorageComponentAccesses(const std::set<StorageComponentAccess>& storageComponentAccesses);
+4 -4
View File
@@ -619,7 +619,7 @@ std::shared_ptr<SourceLocationCollection> PersistentStorage::getFullTextSearchLo
{
std::vector<std::shared_ptr<std::thread>> threads;
std::mutex collectionMutex;
for (std::vector<FullTextSearchResult> fileResults: utility::splitToEqualySizedParts(
for (std::vector<FullTextSearchResult> fileResults: utility::splitToEquallySizedParts(
m_fullTextSearchIndex.searchForTerm(searchTerm), utility::getIdealThreadCount()))
{
std::shared_ptr<std::thread> thread = std::make_shared<std::thread>(
@@ -2132,11 +2132,11 @@ std::vector<EdgeBookmark> PersistentStorage::getAllEdgeBookmarks() const
std::vector<BookmarkCategory> PersistentStorage::getAllBookmarkCategories() const
{
std::vector<BookmarkCategory> categories;
for (const StorageBookmarkCategory& storageBookmarkCategoriy:
for (const StorageBookmarkCategory& storageBookmarkCategory:
m_sqliteBookmarkStorage.getAllBookmarkCategories())
{
categories.push_back(
BookmarkCategory(storageBookmarkCategoriy.id, storageBookmarkCategoriy.name));
BookmarkCategory(storageBookmarkCategory.id, storageBookmarkCategory.name));
}
return categories;
}
@@ -3347,7 +3347,7 @@ void PersistentStorage::buildFullTextSearchIndex() const
}
}
for (std::vector<StorageFile> part:
utility::splitToEqualySizedParts(indexedFiles, utility::getIdealThreadCount()))
utility::splitToEquallySizedParts(indexedFiles, utility::getIdealThreadCount()))
{
std::shared_ptr<std::thread> thread = std::make_shared<std::thread>(
[&](const std::vector<StorageFile>& files) {
+1 -1
View File
@@ -241,7 +241,7 @@ private:
void addNodesWithParentsAndEdgesToGraph(
const std::vector<Id>& nodeIds,
const std::vector<Id>& edgeIds,
Graph* graphh,
Graph* graph,
bool addChildCount) const;
inline void addFileNodeToGraph(const StorageNode& storageNode, Graph* const graph) const;
void addNodeToGraph(
+3 -3
View File
@@ -193,12 +193,12 @@ void Storage::inject(Storage* injected)
{
// TRACE("inject occurrences");
const std::set<StorageOccurrence>& oldOccurences = injected->getStorageOccurrences();
const std::set<StorageOccurrence>& oldOccurrences = injected->getStorageOccurrences();
std::vector<StorageOccurrence> occurrences;
occurrences.reserve(oldOccurences.size());
occurrences.reserve(oldOccurrences.size());
for (const StorageOccurrence& occurrence: oldOccurences)
for (const StorageOccurrence& occurrence: oldOccurrences)
{
Id elementId = 0;
Id sourceLocationId = 0;
@@ -395,7 +395,7 @@ bool SqliteIndexStorage::addOccurrence(const StorageOccurrence& data)
bool SqliteIndexStorage::addOccurrences(const std::vector<StorageOccurrence>& occurrences)
{
return m_insertOccurenceBatchStatement.execute(occurrences, this);
return m_insertOccurrenceBatchStatement.execute(occurrences, this);
}
bool SqliteIndexStorage::addComponentAccess(const StorageComponentAccess& componentAccess)
@@ -1293,7 +1293,7 @@ void SqliteIndexStorage::setupTables()
m_database.execDML(
"CREATE TABLE IF NOT EXISTS filecontent("
"id INTERGER, "
"id INTEGER, "
"content TEXT, "
"PRIMARY KEY(id), "
"FOREIGN KEY(id) REFERENCES file(id)"
@@ -1404,7 +1404,7 @@ void SqliteIndexStorage::setupPrecompiledStatements()
stmt.bind(int(index) * 6 + 6, int(location.type));
},
m_database);
m_insertOccurenceBatchStatement.compile(
m_insertOccurrenceBatchStatement.compile(
"INSERT OR IGNORE INTO occurrence(element_id, source_location_id) VALUES",
2,
[](CppSQLite3Statement& stmt, const StorageOccurrence& occurrence, size_t index) {
@@ -357,7 +357,7 @@ private:
InsertBatchStatement<StorageSymbol> m_insertSymbolBatchStatement;
InsertBatchStatement<StorageLocalSymbol> m_insertLocalSymbolBatchStatement;
InsertBatchStatement<StorageSourceLocationData> m_insertSourceLocationBatchStatement;
InsertBatchStatement<StorageOccurrence> m_insertOccurenceBatchStatement;
InsertBatchStatement<StorageOccurrence> m_insertOccurrenceBatchStatement;
InsertBatchStatement<StorageComponentAccess> m_insertComponentAccessBatchStatement;
CppSQLite3Statement m_insertElementStmt;
+1 -1
View File
@@ -102,7 +102,7 @@ RefreshInfo RefreshInfoGenerator::getRefreshInfoForUpdatedFiles(
const std::set<FilePath> staticReferencedFilePaths = storage->getReferenced(staticSourceFiles);
const std::set<FilePath> dynamicReferencedFilePaths = storage->getReferenced(filesToClear);
// 2.3.3) Add "dynamicReferencedFilePaths" to "filesToClear" that are not refenced by static
// 2.3.3) Add "dynamicReferencedFilePaths" to "filesToClear" that are not referenced by static
// paths, because these files may not be
// referenced anymore. If they still are, they will be re-added when encountered during
// re-indexing.
@@ -1,5 +1,5 @@
#ifndef SETTNGS_MIGRATOR_H
#define SETTNGS_MIGRATOR_H
#ifndef SETTINGS_MIGRATOR_H
#define SETTINGS_MIGRATOR_H
#include "Migrator.h"
+2 -2
View File
@@ -247,7 +247,7 @@ private:
/*
* Nodes
*
* These types are used to build the tree structure. They are either branches or leafes and
* These types are used to build the tree structure. They are either branches or leaves and
* contain a StringType
*/
@@ -318,7 +318,7 @@ private:
/*
* StringLeaf
*
* Combines Leaf and StringType to allow for creating leafes of different string lengths, that
* Combines Leaf and StringType to allow for creating leaves of different string lengths, that
* can still be stored in a collection of Node types.
*/
template <typename StringType>
@@ -90,7 +90,7 @@ void CommandlineCommandConfig::setup()
"logging-enabled,l", po::value<bool>(), "Enable file/console logging <true/false>")(
"verbose-indexer-logging-enabled,L",
po::value<bool>(),
"Enable additional log of abstract syntax tree during the indexing. <true/false> WARNINIG "
"Enable additional log of abstract syntax tree during the indexing. <true/false> WARNING "
"Slows down "
"indexing speed")(
"jvm-path,j", po::value<std::string>(), "Path to the location of the jvm library")(
+3 -3
View File
@@ -94,12 +94,12 @@ FilePath utility::getExpandedPath(const FilePath& path)
std::vector<FilePath> utility::getExpandedPaths(const std::vector<FilePath>& paths)
{
std::vector<FilePath> expanedPaths;
std::vector<FilePath> expandedPaths;
for (const FilePath& path: paths)
{
utility::append(expanedPaths, path.expandEnvironmentVariables());
utility::append(expandedPaths, path.expandEnvironmentVariables());
}
return expanedPaths;
return expandedPaths;
}
FilePath utility::getExpandedAndAbsolutePath(const FilePath& path, const FilePath& baseDirectory)
+1 -1
View File
@@ -6,7 +6,7 @@
#include "LogManager.h"
/**
* @brief Makros to simplify usage of the log manager
* @brief Macros to simplify usage of the log manager
*/
#define LOG_INFO(__str__) \
do \
+1 -1
View File
@@ -243,7 +243,7 @@ void MessageQueue::sendMessage(std::shared_ptr<MessageBase> message)
{
std::lock_guard<std::mutex> lock(m_listenersMutex);
// m_listenersLength is saved, so that new listeners registered whithin message handling don't
// m_listenersLength is saved, so that new listeners registered within message handling don't
// get the current message and the length can be reduced when a listener gets unregistered.
m_listenersLength = m_listeners.size();
+2 -2
View File
@@ -17,7 +17,7 @@
namespace utility
{
template <typename T>
std::vector<std::vector<T>> splitToEqualySizedParts(
std::vector<std::vector<T>> splitToEquallySizedParts(
const std::vector<T>& values, const size_t desiredPartCount);
template <typename T>
@@ -131,7 +131,7 @@ size_t digits(size_t n);
} // namespace utility
template <typename T>
std::vector<std::vector<T>> utility::splitToEqualySizedParts(
std::vector<std::vector<T>> utility::splitToEquallySizedParts(
const std::vector<T>& values, const size_t desiredPartCount)
{
const size_t partCount = std::max<size_t>(1, std::min(desiredPartCount, values.size()));
@@ -129,7 +129,7 @@ std::shared_ptr<IndexerCommand> CxxIndexerCommandProvider::consumeCommand()
m_commands.begin();
if (it->second)
{
std::shared_ptr<IndexerCommand> command = represetationToCommand(it->first, it->second);
std::shared_ptr<IndexerCommand> command = representationToCommand(it->first, it->second);
m_commands.erase(it);
return command;
}
@@ -144,7 +144,7 @@ std::shared_ptr<IndexerCommand> CxxIndexerCommandProvider::consumeCommandForSour
filePath);
if (it != m_commands.end() && it->second)
{
std::shared_ptr<IndexerCommand> command = represetationToCommand(it->first, it->second);
std::shared_ptr<IndexerCommand> command = representationToCommand(it->first, it->second);
m_commands.erase(it);
return command;
}
@@ -160,7 +160,7 @@ std::vector<std::shared_ptr<IndexerCommand>> CxxIndexerCommandProvider::consumeA
it != m_commands.end();
it++)
{
commands.emplace_back(represetationToCommand(it->first, it->second));
commands.emplace_back(representationToCommand(it->first, it->second));
}
m_commands.clear();
return commands;
@@ -191,7 +191,7 @@ Id CxxIndexerCommandProvider::getId()
return m_nextId++;
}
std::shared_ptr<IndexerCommandCxx> CxxIndexerCommandProvider::represetationToCommand(
std::shared_ptr<IndexerCommandCxx> CxxIndexerCommandProvider::representationToCommand(
const FilePath& sourceFilePath, std::shared_ptr<CommandRepresentation> representation)
{
std::set<FilePath> indexedPaths;
@@ -35,7 +35,7 @@ private:
};
Id getId();
std::shared_ptr<IndexerCommandCxx> represetationToCommand(
std::shared_ptr<IndexerCommandCxx> representationToCommand(
const FilePath& sourceFilePath, std::shared_ptr<CommandRepresentation> representation);
Id m_nextId;
@@ -8,7 +8,7 @@
// This CxxAstVisitorComponent is responsible for recording and providing the context based
// ReferenceKind for each reference to a type encountered while traversing the AST. Example: class
// Foo: public Bar {}; For this snippet the type "Bar" is used in the context of an inheritence.
// Foo: public Bar {}; For this snippet the type "Bar" is used in the context of an inheritance.
class CxxAstVisitorComponentTypeRefKind: public CxxAstVisitorComponent
{
public:
+4 -4
View File
@@ -38,7 +38,7 @@ std::vector<std::string> appendFilePath(const std::vector<std::string>& args, ll
return utility::concat(args, {filePath.str()});
}
// custom implementation of clang::runToolOnCodeWithArgs which also sets our custon DiagnosticConsumer
// custom implementation of clang::runToolOnCodeWithArgs which also sets our custom DiagnosticConsumer
bool runToolOnCodeWithArgs(
clang::DiagnosticConsumer* DiagConsumer,
std::unique_ptr<clang::FrontendAction> ToolAction,
@@ -107,14 +107,14 @@ std::vector<std::string> CxxParser::getCommandlineArgumentsEssential(
void CxxParser::initializeLLVM()
{
static bool intialized = false;
if (!intialized)
static bool initialized = false;
if (!initialized)
{
llvm::InitializeAllTargets();
llvm::InitializeAllTargetMCs();
llvm::InitializeAllAsmPrinters();
llvm::InitializeAllAsmParsers();
intialized = true;
initialized = true;
}
}
+3 -3
View File
@@ -1,5 +1,5 @@
#ifndef UTILITY_COMPLIATION_DATABASE_H
#define UTILITY_COMPLIATION_DATABASE_H
#ifndef UTILITY_COMPILATION_DATABASE_H
#define UTILITY_COMPILATION_DATABASE_H
#include <string>
#include <vector>
@@ -29,4 +29,4 @@ private:
} // namespace utility
#endif // UTILITY_COMPLIATION_DATABASE_H
#endif // UTILITY_COMPILATION_DATABASE_H
+2 -2
View File
@@ -34,7 +34,7 @@ std::vector<IncludeDirective> IncludeProcessing::getUnresolvedIncludeDirectives(
std::unordered_set<std::wstring> processedFilePaths;
std::set<IncludeDirective, IncludeDirectiveComparator> unresolvedIncludeDirectives;
std::vector<std::vector<FilePath>> parts = utility::splitToEqualySizedParts(
std::vector<std::vector<FilePath>> parts = utility::splitToEquallySizedParts(
utility::toVector(sourceFilePaths), desiredQuantileCount);
for (size_t i = 0; i < parts.size(); i++)
@@ -78,7 +78,7 @@ std::set<FilePath> IncludeProcessing::getHeaderSearchDirectories(
std::set<FilePath> headerSearchDirectories;
std::unordered_set<std::wstring> processedFilePaths;
std::vector<std::vector<FilePath>> parts = utility::splitToEqualySizedParts(
std::vector<std::vector<FilePath>> parts = utility::splitToEquallySizedParts(
utility::toVector(sourceFilePaths), desiredQuantileCount);
for (size_t i = 0; i < parts.size(); i++)
+2 -2
View File
@@ -37,8 +37,8 @@ add_files(
qt/element/code/QtCodeFileTitleBar.h
qt/element/code/QtCodeFileTitleButton.cpp
qt/element/code/QtCodeFileTitleButton.h
qt/element/code/QtCodeNavigateable.cpp
qt/element/code/QtCodeNavigateable.h
qt/element/code/QtCodeNavigable.cpp
qt/element/code/QtCodeNavigable.h
qt/element/code/QtCodeNavigator.cpp
qt/element/code/QtCodeNavigator.h
qt/element/code/QtCodeSnippet.cpp
+2 -2
View File
@@ -1,5 +1,5 @@
#ifndef QT_COREAPPLICTION_H
#define QT_COREAPPLICTION_H
#ifndef QT_COREAPPLICATION_H
#define QT_COREAPPLICATION_H
#include <QCoreApplication>
+1 -1
View File
@@ -34,7 +34,7 @@ void QtTabBar::contextMenuEvent(QContextMenuEvent* event)
menu.addAction(m_closeTabsToRight);
connect(m_closeTabsToRight, &QAction::triggered, this, [&]() {
// We dont want to close tabs right of the current active tab.
// We don't want to close tabs right of the current active tab.
// No, our intend is to close tabs right of the currently hovered tab.
auto tabNum = tabAt(event->pos());
LOG_INFO(
+1 -1
View File
@@ -824,7 +824,7 @@ void QtCodeArea::mouseReleaseEvent(QMouseEvent* event)
viewport()->setCursor(Qt::ArrowCursor);
const int panningThreshold = 5;
if (m_panningDistance < panningThreshold) // dont do anything if mouse is release to end
if (m_panningDistance < panningThreshold) // don't do anything if mouse is release to end
// some real panning action.
{
if (Qt::KeyboardModifier::ControlModifier & QApplication::keyboardModifiers())
+3 -3
View File
@@ -7,7 +7,7 @@
#include <QScrollArea>
#include "CodeSnippetParams.h"
#include "QtCodeNavigateable.h"
#include "QtCodeNavigable.h"
#include "QtScrollSpeedChangeListener.h"
class QtCodeFile;
@@ -23,7 +23,7 @@ protected:
class QtCodeFileList
: public QFrame
, public QtCodeNavigateable
, public QtCodeNavigable
{
Q_OBJECT
@@ -38,7 +38,7 @@ public:
void addFile(const CodeFileParams& params);
// QtCodeNavigatebale implementation
// QtCodeNavigable implementation
QScrollArea* getScrollArea() override;
void updateSourceLocations(const CodeSnippetParams& params) override;
@@ -9,7 +9,7 @@
#include "FilePath.h"
#include "TimeStamp.h"
#include "QtCodeNavigateable.h"
#include "QtCodeNavigable.h"
class QLabel;
class QPushButton;
@@ -19,7 +19,7 @@ class QtCodeNavigator;
class QtCodeFileSingle
: public QFrame
, public QtCodeNavigateable
, public QtCodeNavigable
{
Q_OBJECT
@@ -32,7 +32,7 @@ public:
bool addFile(const CodeFileParams& params, bool useSingleFileCache);
// QtCodeNavigateable implementation
// QtCodeNavigable implementation
QAbstractScrollArea* getScrollArea() override;
void updateSourceLocations(const CodeSnippetParams& params) override;
@@ -1,4 +1,4 @@
#include "QtCodeNavigateable.h"
#include "QtCodeNavigable.h"
#include <QPropertyAnimation>
#include <QScrollArea>
@@ -6,9 +6,9 @@
#include "ApplicationSettings.h"
QtCodeNavigateable::~QtCodeNavigateable() {}
QtCodeNavigable::~QtCodeNavigable() {}
void QtCodeNavigateable::ensureWidgetVisibleAnimated(
void QtCodeNavigable::ensureWidgetVisibleAnimated(
const QWidget* parentWidget,
const QWidget* childWidget,
const QRectF& rect,
@@ -96,7 +96,7 @@ void QtCodeNavigateable::ensureWidgetVisibleAnimated(
}
}
void QtCodeNavigateable::ensurePercentVisibleAnimated(
void QtCodeNavigable::ensurePercentVisibleAnimated(
double percentA, double percentB, bool animated, CodeScrollParams::Target target)
{
QAbstractScrollArea* area = getScrollArea();
@@ -186,7 +186,7 @@ void QtCodeNavigateable::ensurePercentVisibleAnimated(
}
}
QRect QtCodeNavigateable::getFocusRectForWidget(
QRect QtCodeNavigable::getFocusRectForWidget(
const QWidget* childWidget, const QWidget* parentWidget) const
{
const QRect microFocus = childWidget->inputMethodQuery(Qt::ImCursorRectangle).toRect();
@@ -1,5 +1,5 @@
#ifndef QT_CODE_NAVIGATEABLE_H
#define QT_CODE_NAVIGATEABLE_H
#ifndef QT_CODE_NAVIGABLE_H
#define QT_CODE_NAVIGABLE_H
#include <set>
@@ -15,10 +15,10 @@ class QRect;
class QtCodeArea;
class QWidget;
class QtCodeNavigateable
class QtCodeNavigable
{
public:
virtual ~QtCodeNavigateable();
virtual ~QtCodeNavigable();
virtual QAbstractScrollArea* getScrollArea() = 0;
@@ -59,4 +59,4 @@ protected:
QRect getFocusRectForWidget(const QWidget* childWidget, const QWidget* parentWidget) const;
};
#endif // QT_CODE_NAVIGATEABLE_H
#endif // QT_CODE_NAVIGABLE_H
@@ -133,7 +133,7 @@ private:
QtThreadedLambdaFunctor m_onQtThread;
QtCodeNavigateable* m_current;
QtCodeNavigable* m_current;
QtCodeFileList* m_list;
QtCodeFileSingle* m_single;
+1 -1
View File
@@ -40,7 +40,7 @@ void QtRequest::finished(QNetworkReply* reply)
if (reply->error() != QNetworkReply::NoError)
{
LOG_ERROR_STREAM(<< "An error occured during http request. ERRORCODE: " << reply->error());
LOG_ERROR_STREAM(<< "An error occurred during http request. ERRORCODE: " << reply->error());
}
QByteArray bytes = reply->readAll();
@@ -251,7 +251,7 @@ void QtProjectWizardContentPreferences::populate(QGridLayout* layout, int& row)
QStringLiteral(
"<p>Enable additional logs of abstract syntax tree traversal during indexing. This "
"information can help "
"tracking down crashes that occurr during indexing.</p>"
"tracking down crashes that occur during indexing.</p>"
"<p><b>Warning</b>: This slows down indexing performance a lot.</p>"),
layout,
row);
@@ -333,7 +333,7 @@ void QtProjectWizardContentPreferences::populate(QGridLayout* layout, int& row)
QStringLiteral("Run C/C++ indexer threads in different process"),
QStringLiteral(
"<p>Enable C/C++ indexer threads to run in different process.</p>"
"<p>This prevents the application from crashing due to unforseen exceptions while "
"<p>This prevents the application from crashing due to unforeseen exceptions while "
"indexing.</p>"),
layout,
row);
@@ -166,7 +166,7 @@ void QtProjectWizardContentSelect::populate(QGridLayout* layout, int& row)
selectedLanguage = LanguageType(languageTypeInt);
}
bool hasRecommeded = false;
bool hasRecommended = false;
for (auto& it: m_buttons)
{
it.second->setExclusive(false);
@@ -177,7 +177,7 @@ void QtProjectWizardContentSelect::populate(QGridLayout* layout, int& row)
if (it.first == selectedLanguage)
{
hasRecommeded = hasRecommeded | button->property("recommended").toBool();
hasRecommended = hasRecommended | button->property("recommended").toBool();
}
}
it.second->setExclusive(true);
@@ -187,7 +187,7 @@ void QtProjectWizardContentSelect::populate(QGridLayout* layout, int& row)
m_title->setText("Source Group Types - " + m_languages->checkedButton()->text());
m_description->setText(
hasRecommeded ? QStringLiteral("<b>* recommended</b>") : QLatin1String(""));
hasRecommended ? QStringLiteral("<b>* recommended</b>") : QLatin1String(""));
});
QtFlowLayout* flayout = new QtFlowLayout(10, 0, 0);
@@ -23,7 +23,7 @@ void QtProjectWizardContentUnloadable::populate(QGridLayout* layout, int& row)
QLabel* infoLabel = new QLabel(QString::fromStdString(
"<p>The type \"" + m_settings->getTypeString() +
"\" of the selected Source Group is not supportetd by this version of Sourcetrail.</p>"));
"\" of the selected Source Group is not supported by this version of Sourcetrail.</p>"));
infoLabel->setObjectName(QStringLiteral("info"));
infoLabel->setWordWrap(true);
layoutHorz->addWidget(infoLabel);
@@ -76,16 +76,16 @@ void QtProjectWizardContentPathsHeaderSearch::populate(QGridLayout* layout, int&
detectionButton, row, QtProjectWizardWindow::BACK_COL, Qt::AlignLeft | Qt::AlignTop);
}
{
QPushButton* validateionButton = new QPushButton(
QPushButton* validationButton = new QPushButton(
QStringLiteral("validate include directives"));
validateionButton->setObjectName(QStringLiteral("windowButton"));
validationButton->setObjectName(QStringLiteral("windowButton"));
connect(
validateionButton,
validationButton,
&QPushButton::clicked,
this,
&QtProjectWizardContentPathsHeaderSearch::validateIncludesButtonClicked);
layout->addWidget(
validateionButton, row, QtProjectWizardWindow::BACK_COL, Qt::AlignRight | Qt::AlignTop);
validationButton, row, QtProjectWizardWindow::BACK_COL, Qt::AlignRight | Qt::AlignTop);
}
row++;
}
@@ -79,7 +79,7 @@ bool QtProjectWizardContentPathsHeaderSearchGlobal::check()
"Your Global Include Paths contain other paths that hold C/C++ compiler headers, "
"probably those of your local C/C++ compiler. They are possibly in conflict with the "
"compiler headers of "
"Sourcetrail's C/C++ indexer. This can lead to compatiblity errors during indexing. Do "
"Sourcetrail's C/C++ indexer. This can lead to compatibility errors during indexing. Do "
"you want to remove "
"these paths?");
msgBox.setDetailedText(compilerHeaderPaths);
+1 -1
View File
@@ -100,7 +100,7 @@ void QtHighlighter::loadHighlightingRules()
if (doc.isNull() || !doc.isArray())
{
LOG_ERROR_STREAM(
<< "Highlinghting rules in \"" << path.str()
<< "Highlighting rules in \"" << path.str()
<< "\" couldn't be parsed as JSON: "
"offset "
<< error.offset << " - " << error.errorString().toStdString());
+1 -1
View File
@@ -15,7 +15,7 @@ QWidget* QtViewWidgetWrapper::getWidgetOfView(const View* view)
if (!widgetWrapper->getWidget())
{
LOG_ERROR("The QtViewWidgetWrapper is not holdling a QWidget.");
LOG_ERROR("The QtViewWidgetWrapper is not holding a QWidget.");
return nullptr;
}
@@ -37,12 +37,12 @@ void QtKeyboardShortcuts::populateWindow(QWidget* widget)
{
QVBoxLayout* layout = new QVBoxLayout(widget);
QLabel* generelLabel = new QLabel(this);
generelLabel->setObjectName(QStringLiteral("general_label"));
generelLabel->setText(QStringLiteral("General Shortcuts"));
layout->addWidget(generelLabel);
QLabel* generalLabel = new QLabel(this);
generalLabel->setObjectName(QStringLiteral("general_label"));
generalLabel->setText(QStringLiteral("General Shortcuts"));
layout->addWidget(generalLabel);
layout->addWidget(createGenerelShortcutsTable());
layout->addWidget(createGeneralShortcutsTable());
layout->addSpacing(20);
@@ -147,7 +147,7 @@ void QtKeyboardShortcuts::addShortcuts(QtShortcutTable* table, const std::vector
table->updateSize();
}
QTableWidget* QtKeyboardShortcuts::createGenerelShortcutsTable()
QTableWidget* QtKeyboardShortcuts::createGeneralShortcutsTable()
{
QtShortcutTable* table = createTableWidget("table_general");
+1 -1
View File
@@ -48,7 +48,7 @@ private:
QtShortcutTable* createTableWidget(const std::string& objectName);
void addShortcuts(QtShortcutTable* table, const std::vector<Shortcut>& shortcuts) const;
QTableWidget* createGenerelShortcutsTable();
QTableWidget* createGeneralShortcutsTable();
QTableWidget* createCodeViewShortcutsTable();
QTableWidget* createGraphViewShortcutsTable();
};
+1 -1
View File
@@ -49,7 +49,7 @@ void QtLicenseWindow::populateWindow(QWidget* widget)
QLabel* header3rdParties = new QLabel(QStringLiteral(
"<b>Copyrights and Licenses for Third Party Software Distributed with Sourcetrail:</b><br "
"/>"
"Sourcetaril contains code written by the following third parties that have <br />"
"Sourcetrail contains code written by the following third parties that have <br />"
"additional or alternate copyrights, licenses, and/or restrictions:"));
layout->addWidget(header3rdParties);
+1 -1
View File
@@ -146,7 +146,7 @@ QtMainWindow::QtMainWindow()
setupHelpMenu();
// Need to call loadLayout here for right DockWidget size on Linux
// Seconde call is in Application.cpp
// Second call is in Application.cpp
loadLayout();
}
@@ -98,7 +98,7 @@ FilePath CxxVs10To14HeaderPathDetector::getVsInstallPathUsingRegistry() const
FilePath path(value.toStdWString());
if (path.exists())
{
LOG_INFO(L"Found working regestry key for VS install path: " + key.toStdWString());
LOG_INFO(L"Found working registry key for VS install path: " + key.toStdWString());
return path;
}
@@ -79,7 +79,7 @@ void JavaEnvironmentFactory::createInstance(std::string classPath, std::string&
{
if (rc == JNI_EVERSION)
{
errorString = "JVM is oudated and doesn't meet requirements";
errorString = "JVM is outdated and doesn't meet requirements";
}
else if (rc == JNI_ENOMEM)
{
+1 -1
View File
@@ -49,7 +49,7 @@ private:
const std::string& classPath,
std::shared_ptr<TextAccess> textAccess);
// This macro makes available a variable T, the passed-in t. blablabla TODO: write somethign real here
// This macro makes available a variable T, the passed-in t. blablabla TODO: write something real here
#define MAKE_PARAMS_0()
#define MAKE_PARAMS_1(t1) , t1 arg1
#define MAKE_PARAMS_2(t1, t2) , t1 arg1, t2 arg2
+6 -6
View File
@@ -844,7 +844,7 @@ TEST_CASE("cxx parser finds template argument of dependent non type template par
// TS_ASSERT(utility::containsElement<std::wstring>(
// client->typeUses, // TODO: record edge between vector<int, Alloc<int>> and Alloc<int> (this
// is an issue because we dont have any typeloc for this edge -.-
// is an issue because we don't have any typeloc for this edge -.-
// ));
//}
@@ -2785,7 +2785,7 @@ TEST_CASE(
TEST_CASE(
"cxx parser finds type template argument in non default constructor of explicit template "
"instaitiation")
"instantiation")
{
std::shared_ptr<TestStorage> client = parseCode(
"template <typename T>\n"
@@ -2808,7 +2808,7 @@ TEST_CASE(
TEST_CASE(
"cxx parser finds type template argument in default constructor of explicit template "
"instaitiation")
"instantiation")
{
std::shared_ptr<TestStorage> client = parseCode(
"template <typename T>\n"
@@ -2830,7 +2830,7 @@ TEST_CASE(
}
TEST_CASE(
"cxx parser finds type template argument in new expression of explicit template instaitiation")
"cxx parser finds type template argument in new expression of explicit template instantiation")
{
std::shared_ptr<TestStorage> client = parseCode(
"template <typename T>\n"
@@ -4192,8 +4192,8 @@ TEST_CASE("cxx parser finds correct error location after line directive")
TEST_CASE("cxx parser catches error in macro expansion")
{
std::shared_ptr<TestStorage> client = parseCode(
"#define MACRO_WITH_NONEXISTING_PATH \"this_path_does_not_exist.txt\"\n"
"#include MACRO_WITH_NONEXISTING_PATH\n");
"#define MACRO_WITH_NONEXISTENT_PATH \"this_path_does_not_exist.txt\"\n"
"#include MACRO_WITH_NONEXISTENT_PATH\n");
REQUIRE(utility::containsElement<std::wstring>(
client->errors, L"'this_path_does_not_exist.txt' file not found <2:10 2:10>"));
+2 -2
View File
@@ -195,7 +195,7 @@ TEST_CASE("file_path_differs_for_different_existing_files")
REQUIRE(pathA != pathB);
}
TEST_CASE("file_path_differs_for_different_nonexisting_files")
TEST_CASE("file_path_differs_for_different_nonexistent_files")
{
const FilePath pathA(L"data/FilePathTestSuite/a.h");
const FilePath pathB(L"data/FilePathTestSuite/b.c");
@@ -203,7 +203,7 @@ TEST_CASE("file_path_differs_for_different_nonexisting_files")
REQUIRE(pathA != pathB);
}
TEST_CASE("file_path_differs_for_existing_and_nonexisting_files")
TEST_CASE("file_path_differs_for_existing_and_nonexistent_files")
{
const FilePath pathA(L"data/FilePathTestSuite/a.h");
const FilePath pathB(L"data/FilePathTestSuite/b.cc");
+1 -1
View File
@@ -8,7 +8,7 @@ namespace
* C++ functions can't return statically allocated arrays.
* I don't want to use dynamically allocated arrays, so here's my work around for that...
*
* Update: acutally they can... see MatrixBase [] operator (in MatrixBase.cpp)
* Update: actually they can... see MatrixBase [] operator (in MatrixBase.cpp)
*/
template <class T>
struct Array3x5
+1 -1
View File
@@ -8,7 +8,7 @@ TEST_CASE("parse message")
{
std::wstring type = L"setActiveToken";
std::wstring divider = L">>";
std::wstring filePath = L"C:/Users/Manuel/imporant/file/location/fileName.cpp";
std::wstring filePath = L"C:/Users/Manuel/important/file/location/fileName.cpp";
std::wstring endOfMessageToken = L"<EOM>";
int row = 1;
int column = 2;
+3 -3
View File
@@ -343,7 +343,7 @@ TEST_CASE("refresh info for updated files is empty for empty storage and empty s
// file may be a source file sourcefile / headerfile
// file may now be indexed by the source group nottoindex / toindex
//
// We now wite a TEST_CASE that checks for the expected result for every possible combination.
// We now write a TEST_CASE that checks for the expected result for every possible combination.
// Example: test_unknown_unchanged_sourcefile_that_is_nottoindex
namespace
{
@@ -571,7 +571,7 @@ TEST_CASE("nonindexed changed headerfile that is nottoindex")
const RefreshInfo refreshInfo = getRefreshInfo(NON_INDEXED, CHANGED, HEADER_FILE, NOT_TO_INDEX);
REQUIRE(REFRESH_UPDATED_FILES == refreshInfo.mode);
REQUIRE(1 == refreshInfo.nonIndexedFilesToClear.size());
; // must be cleard here and will be re-indexed on demand
; // must be cleared here and will be re-indexed on demand
REQUIRE(0 == refreshInfo.filesToClear.size());
REQUIRE(0 == refreshInfo.filesToIndex.size());
}
@@ -848,7 +848,7 @@ TEST_CASE("refresh info for updated files does not clear unknown uptodate header
}
TEST_CASE(
"refresh info for updated files clears outdated source file and referened uptodate header file")
"refresh info for updated files clears outdated source file and referenced uptodate header file")
{
cleanup();
{
+14 -14
View File
@@ -60,15 +60,15 @@ TEST_CASE("storage saves file")
std::wstring filePath = L"path/to/test.h";
std::shared_ptr<IntermediateStorage> intermetiateStorage = std::make_shared<IntermediateStorage>();
Id id = intermetiateStorage
std::shared_ptr<IntermediateStorage> intermediateStorage = std::make_shared<IntermediateStorage>();
Id id = intermediateStorage
->addNode(StorageNodeData(
nodeKindToInt(NODE_FILE),
NameHierarchy::serialize(NameHierarchy(filePath, NAME_DELIMITER_FILE))))
.first;
intermetiateStorage->addFile(StorageFile(id, filePath, L"someLanguage", "someTime", true, true));
intermediateStorage->addFile(StorageFile(id, filePath, L"someLanguage", "someTime", true, true));
storage.inject(intermetiateStorage.get());
storage.inject(intermediateStorage.get());
REQUIRE(storage.getNameHierarchyForNodeId(id).getQualifiedName() == filePath);
REQUIRE(storage.getNodeTypeForNodeWithId(id).isFile());
@@ -80,11 +80,11 @@ TEST_CASE("storage saves node")
TestStorage storage;
std::shared_ptr<IntermediateStorage> intermetiateStorage = std::make_shared<IntermediateStorage>();
intermetiateStorage->addNode(
std::shared_ptr<IntermediateStorage> intermediateStorage = std::make_shared<IntermediateStorage>();
intermediateStorage->addNode(
StorageNodeData(nodeKindToInt(NODE_TYPEDEF), NameHierarchy::serialize(a)));
storage.inject(intermetiateStorage.get());
storage.inject(intermediateStorage.get());
Id storedId = storage.getNodeIdForNameHierarchy(a);
@@ -99,20 +99,20 @@ TEST_CASE("storage saves field as member")
TestStorage storage;
std::shared_ptr<IntermediateStorage> intermetiateStorage = std::make_shared<IntermediateStorage>();
std::shared_ptr<IntermediateStorage> intermediateStorage = std::make_shared<IntermediateStorage>();
Id aId = intermetiateStorage
Id aId = intermediateStorage
->addNode(StorageNodeData(nodeKindToInt(NODE_STRUCT), NameHierarchy::serialize(a)))
.first;
intermetiateStorage->addSymbol(StorageSymbol(aId, DEFINITION_EXPLICIT));
intermediateStorage->addSymbol(StorageSymbol(aId, DEFINITION_EXPLICIT));
Id bId = intermetiateStorage
Id bId = intermediateStorage
->addNode(StorageNodeData(nodeKindToInt(NODE_FIELD), NameHierarchy::serialize(b)))
.first;
intermetiateStorage->addSymbol(StorageSymbol(bId, DEFINITION_EXPLICIT));
intermetiateStorage->addEdge(StorageEdgeData(Edge::typeToInt(Edge::EDGE_MEMBER), aId, bId));
intermediateStorage->addSymbol(StorageSymbol(bId, DEFINITION_EXPLICIT));
intermediateStorage->addEdge(StorageEdgeData(Edge::typeToInt(Edge::EDGE_MEMBER), aId, bId));
storage.inject(intermetiateStorage.get());
storage.inject(intermediateStorage.get());
bool foundEdge = false;
const Id sourceId = storage.getNodeIdForNameHierarchy(a);
+8 -8
View File
@@ -13,10 +13,10 @@ namespace
{
void executeTask(Task& task)
{
std::shared_ptr<Blackboard> blakboard = std::make_shared<Blackboard>();
std::shared_ptr<Blackboard> blackboard = std::make_shared<Blackboard>();
while (true)
{
if (task.update(blakboard) != Task::STATE_RUNNING)
if (task.update(blackboard) != Task::STATE_RUNNING)
{
return;
}
@@ -37,12 +37,12 @@ public:
{
}
virtual void doEnter(std::shared_ptr<Blackboard> blakboard)
virtual void doEnter(std::shared_ptr<Blackboard> blackboard)
{
enterCallOrder = ++orderCount;
}
virtual TaskState doUpdate(std::shared_ptr<Blackboard> blakboard)
virtual TaskState doUpdate(std::shared_ptr<Blackboard> blackboard)
{
updateCallOrder = ++orderCount;
@@ -61,12 +61,12 @@ public:
return returnState;
}
virtual void doExit(std::shared_ptr<Blackboard> blakboard)
virtual void doExit(std::shared_ptr<Blackboard> blackboard)
{
exitCallOrder = ++orderCount;
}
virtual void doReset(std::shared_ptr<Blackboard> blakboard)
virtual void doReset(std::shared_ptr<Blackboard> blackboard)
{
resetCallOrder = ++orderCount;
}
@@ -89,12 +89,12 @@ public:
{
}
virtual TaskState doUpdate(std::shared_ptr<Blackboard> blakboard)
virtual TaskState doUpdate(std::shared_ptr<Blackboard> blackboard)
{
subTask = std::make_shared<TestTask>(&orderCount, 1);
scheduler->pushTask(subTask);
return TestTask::doUpdate(blakboard);
return TestTask::doUpdate(blackboard);
}
TaskScheduler* scheduler;
+1 -1
View File
@@ -138,7 +138,7 @@ TEST_CASE("textAccessFile lines content")
REQUIRE(
lines[3] ==
"... \"What? Harmless! Is that all it's got to say? Harmless! One word! ... Well, for "
"God's sake I hope you managed to recitify that a bit.\"\n");
"God's sake I hope you managed to rectify that a bit.\"\n");
}
TEST_CASE("textAccessFile get filePath")
+9 -9
View File
@@ -153,17 +153,17 @@ TEST_CASE("tokenize with deque")
REQUIRE(result.at(6) == "D");
}
TEST_CASE("substr before first with single delimiter occurence")
TEST_CASE("substr before first with single delimiter occurrence")
{
REQUIRE(utility::substrBeforeFirst("foo bar", ' ') == "foo");
}
TEST_CASE("substr before first with multiple delimiter occurences")
TEST_CASE("substr before first with multiple delimiter occurrences")
{
REQUIRE(utility::substrBeforeFirst("foo bar foo", ' ') == "foo");
}
TEST_CASE("substr before first with no delimiter occurence")
TEST_CASE("substr before first with no delimiter occurrence")
{
REQUIRE(utility::substrBeforeFirst("foobar", ' ') == "foobar");
}
@@ -178,17 +178,17 @@ TEST_CASE("substr before first with delimiter at end")
REQUIRE(utility::substrBeforeFirst("foobar ", ' ') == "foobar");
}
TEST_CASE("substr before last with single delimiter occurence")
TEST_CASE("substr before last with single delimiter occurrence")
{
REQUIRE(utility::substrBeforeLast("foo bar", ' ') == "foo");
}
TEST_CASE("substr before last with multiple delimiter occurences")
TEST_CASE("substr before last with multiple delimiter occurrences")
{
REQUIRE(utility::substrBeforeLast("foo bar foo", ' ') == "foo bar");
}
TEST_CASE("substr before last with no delimiter occurence")
TEST_CASE("substr before last with no delimiter occurrence")
{
REQUIRE(utility::substrBeforeLast("foobar", ' ') == "foobar");
}
@@ -203,17 +203,17 @@ TEST_CASE("substr before last with delimiter at end")
REQUIRE(utility::substrBeforeLast("foobar ", ' ') == "foobar");
}
TEST_CASE("substr after with single delimiter occurence")
TEST_CASE("substr after with single delimiter occurrence")
{
REQUIRE(utility::substrAfter("foo bar", ' ') == "bar");
}
TEST_CASE("substr after with multiple delimiter occurences")
TEST_CASE("substr after with multiple delimiter occurrences")
{
REQUIRE(utility::substrAfter("foo bar foo", ' ') == "bar foo");
}
TEST_CASE("substr after with no delimiter occurence")
TEST_CASE("substr after with no delimiter occurrence")
{
REQUIRE(utility::substrAfter("foobar", ' ') == "foobar");
}
+2 -2
View File
@@ -37,9 +37,9 @@ public:
}
std::multimap<Id, Id> occurrenceMap;
for (const StorageOccurrence& occurence: storage->getStorageOccurrences())
for (const StorageOccurrence& occurrence: storage->getStorageOccurrences())
{
occurrenceMap.emplace(occurence.sourceLocationId, occurence.elementId);
occurrenceMap.emplace(occurrence.sourceLocationId, occurrence.elementId);
}
std::multimap<Id, StorageSourceLocation> tokenLocationMap;
+2 -2
View File
@@ -119,7 +119,7 @@ Sample s;
// TEST: clicking on overriden method activates it immediately
// TEST: clicking on overridden method activates it immediately
// START ----------------------------------------------------------------------
class Base
{
@@ -218,7 +218,7 @@ uint b = 12; // <- ACTION 1: hover uint
// TEST: horizontal panning
// START ----------------------------------------------------------------------
void very_long_function_name_with_three_parameters_that_is_so_long_it_doesnt_fit_on_the_screen(const std::vector<std::string>& strings, size_t number, bool flag);
void very_long_function_name_with_three_parameters_that_is_so_long_it_does_not_fit_on_the_screen(const std::vector<std::string>& strings, size_t number, bool flag);
// ACTION 1: Hold SHIFT and drag code left and right
@@ -90,7 +90,7 @@ void level_0_func1()
// - horizontal layout using bezier curve edges
// - nodes from level 0 to 4 displayed
// - layout contains override edge shown horizontally
// - layout contains eplicit template class (dead end)
// - layout contains explicit template class (dead end)
// - layout contains implicit template class
// END ------------------------------------------------------------------------
@@ -214,7 +214,7 @@ void func5() { func1(); func2(); func3(); func4(); func5(); }
#include "depth_files/level_5_file_1.h" // <- ACTION 1: activate
// ACTION 2: show includee graph '<'
// ACTION 2: show included graph '<'
// RESULT 2: horizontal layout with bezier curve edges
#include "depth_files/level_1_file_1.h" // <- ACTION 3: activate
+2 -2
View File
@@ -96,7 +96,7 @@ enum Category // <- ACTION 1: activate
};
// RESULTS 1:
// - enum shows all chilren
// - enum shows all children
// - enum is expandable/collapsable
// - children layouted in nameless access frame
@@ -116,7 +116,7 @@ void foobar() // <- ACTION 1: activate
}
// RESULTS 1:
// - function shows all chilren
// - function shows all children
// - function is not expandable/collapsable
// - children layouted in nameless access frame
+1 -1
View File
@@ -72,7 +72,7 @@ typedef bool Seven;
// RESULTS:
// - symbol name goes up
// - dropdown position goes up
// - history menu: current symbl always on top, end result:
// - history menu: current symbol always on top, end result:
// SIX, FIVE, Four, Three, Seven, two, One
// END ------------------------------------------------------------------------
+2 -2
View File
@@ -133,7 +133,7 @@
// ACTION 2: Search for 'io::stringOut()'
// ACTION 3: Minimize 2nd and 3rd snippet
// ACTION 4: Expand last snippet
// ACTION 5: Scroll to recognizeable position
// ACTION 5: Scroll to recognizable position
// ACTION 6: Activate other symbol
// ACTION 7: go back
@@ -165,7 +165,7 @@
// ACTION 1: Switch to code single file mode
// ACTION 2: Search for 'Field::SameInRow()'
// ACTION 3: Scroll to recognizeable position
// ACTION 3: Scroll to recognizable position
// ACTION 4; Activate other symbol
// ACTION 5: go back
+1 -1
View File
@@ -110,7 +110,7 @@ int cube(int a)
// ACTION: Hold Shift and navigate with keyboard
// RESULTS:
// - focus is moved between the active locations of 'square'
// - focus is moved between the active local locations of 'r' inbetween
// - focus is moved between the active local locations of 'r'
// END ------------------------------------------------------------------------
@@ -29,7 +29,7 @@ public class AppTest
}
/**
* Rigourous Test :-)
* Rigorous Test :-)
*/
public void testApp()
{