Skip to content

sync with main repo #134

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jun 28, 2016
Merged

sync with main repo #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d1eaa39
Merge pull request #1921 from retailcoder/next
Hosch250 Jun 27, 2016
e052769
Fix hard-coded declarations for form parameters (make them be byref i…
Hosch250 Jun 27, 2016
c7f5c08
Hard-code aliases as functions for resolver
Hosch250 Jun 28, 2016
753825f
Prevent hard-coded declarations from having their references cleared …
Hosch250 Jun 28, 2016
507ee65
Close #1405
Hosch250 Jun 28, 2016
c751d9c
Update README.md
retailcoder Jun 28, 2016
fe4fe8d
Merge pull request #1923 from Hosch250/bugs
retailcoder Jun 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
![Rubberduck](http://i.stack.imgur.com/vmqXM.png)
<img src="http://i.stack.imgur.com/vmqXM.png" width="320" />

| Branch | Build Status |
|------------|--------------|
| **master** | ![master branch build status][masterBuildStatus] |
| **next** | ![next branch build status][nextBuildStatus] |
Branch | Description | Build Status |
|------------|---|--------------|
| **master** | The last released build | ![master branch build status][masterBuildStatus] |
| **next** | The current build (dev) | ![next branch build status][nextBuildStatus] |

[nextBuildStatus]:https://ci.appveyor.com/api/projects/status/we3pdnkeebo4nlck/branch/next?svg=true
[masterBuildStatus]:https://ci.appveyor.com/api/projects/status/we3pdnkeebo4nlck/branch/master?svg=true
Expand Down
3 changes: 1 addition & 2 deletions RetailCoder.VBE/Inspections/UntypedFunctionUsageInspection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,9 @@ public UntypedFunctionUsageInspection(RubberduckParserState state)
public override IEnumerable<InspectionResultBase> GetInspectionResults()
{
var declarations = BuiltInDeclarations
// note: these *should* be functions, but somehow they're not defined as such
.Where(item =>
_tokens.Any(token => item.IdentifierName == token || item.IdentifierName == "_B_var_" + token) &&
item.References.Any(reference => _tokens.Contains(reference.IdentifierName)));
item.Scope.StartsWith("VBE7.DLL;"));

return declarations.SelectMany(declaration => declaration.References
.Where(item => _tokens.Contains(item.IdentifierName))
Expand Down
3 changes: 2 additions & 1 deletion RetailCoder.VBE/Inspections/UntypedFunctionUsageInspectionResult.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@ public override void Fix()
var module = Selection.QualifiedName.Component.CodeModule;
var lines = module.Lines[selection.StartLine, selection.LineCount];

var result = lines.Replace(originalInstruction, newInstruction);
var result = lines.Remove(Context.Start.Column, originalInstruction.Length)
.Insert(Context.Start.Column, newInstruction);
module.ReplaceLine(selection.StartLine, result);
}

Expand Down
1 change: 1 addition & 0 deletions Rubberduck.Parsing/Rubberduck.Parsing.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@
<Compile Include="Symbols\CommentNode.cs" />
<Compile Include="Symbols\ComParameter.cs" />
<Compile Include="Symbols\DebugDeclarations.cs" />
<Compile Include="Symbols\AliasDeclarations.cs" />
<Compile Include="Symbols\FormEventDeclarations.cs" />
<Compile Include="Symbols\ICustomDelarationLoader.cs" />
<Compile Include="Symbols\Identifier.cs" />
Expand Down
Loading