-
Notifications
You must be signed in to change notification settings - Fork 26
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #147 from mhutch/warning-codes
Add support for warning codes
- Loading branch information
Showing
39 changed files
with
2,180 additions
and
368 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| // Copyright (c) Microsoft. All rights reserved. | ||
| // Licensed under the MIT license. See LICENSE file in the project root for full license information. | ||
|
|
||
| using System.Collections.Generic; | ||
| using System.IO; | ||
|
|
||
| using MonoDevelop.MSBuild.Schema; | ||
|
|
||
| namespace MonoDevelop.MSBuild.Tests.Analyzers | ||
| { | ||
| class TestSchemaProvider : MSBuildSchemaProvider | ||
| { | ||
| readonly Dictionary<(string filename, string sdk), MSBuildSchema> schemas = new (); | ||
|
|
||
| public void AddTestSchema (string filename, string sdk, MSBuildSchema schema) | ||
| { | ||
| schemas.Add ((filename, sdk), schema); | ||
| } | ||
|
|
||
| public override MSBuildSchema GetSchema (string path, string sdk, out IList<MSBuildSchemaLoadError> loadErrors) | ||
| { | ||
| if (schemas.TryGetValue ((Path.GetFileName (path), sdk), out MSBuildSchema schema)) { | ||
| loadErrors = null; | ||
| return schema; | ||
| } | ||
|
|
||
| return base.GetSchema (path, sdk, out loadErrors); | ||
| } | ||
|
|
||
| public override ICollection<MSBuildSchema> GetFallbackSchemas () => []; | ||
| } | ||
| } |
47 changes: 47 additions & 0 deletions
47
MonoDevelop.MSBuild.Tests/Completion/ExxpressionCompletionTests.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| // Copyright (c) Microsoft. All rights reserved. | ||
| // Licensed under the MIT license. See LICENSE file in the project root for full license information. | ||
|
|
||
| using System.Collections.Immutable; | ||
| using System.Linq; | ||
|
|
||
| using MonoDevelop.MSBuild.Analysis; | ||
| using MonoDevelop.MSBuild.Language; | ||
| using MonoDevelop.MSBuild.Language.Typesystem; | ||
| using MonoDevelop.MSBuild.Schema; | ||
|
|
||
| using NUnit.Framework; | ||
|
|
||
| namespace MonoDevelop.MSBuild.Tests.Completion; | ||
|
|
||
| [TestFixture] | ||
| class ExpressionCompletionTests : MSBuildExpressionCompletionTest | ||
| { | ||
| [Test] | ||
| public void WarningCodes () | ||
| { | ||
| var source = @"<Project> | ||
| <PropertyGroup> | ||
| <NoWarn>|</NoWarn> | ||
| </PropertyGroup> | ||
| </Project>"; | ||
|
|
||
|
|
||
| var schema = new MSBuildSchema () { | ||
| new CustomTypeInfo ( | ||
| [ | ||
| new CustomTypeValue ("CS123", null), | ||
| new CustomTypeValue ("CS456", null) | ||
| ], | ||
| "csharp-warnings", | ||
| baseKind: MSBuildValueKind.WarningCode | ||
| ), | ||
| new PropertyInfo ("NoWarn", "", MSBuildValueKind.WarningCode) | ||
| }; | ||
|
|
||
| var completions = GetExpressionCompletion (source, out _, schema: schema).ToArray (); | ||
|
|
||
| Assert.AreEqual (2, completions.Length); | ||
| Assert.AreEqual ("CS123", completions[0].Name); | ||
| Assert.AreEqual ("CS456", completions[1].Name); | ||
| } | ||
| } |
175 changes: 175 additions & 0 deletions
175
MonoDevelop.MSBuild.Tests/Completion/MSBuildExpressionCompletionTest.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,175 @@ | ||
| // Copyright (c) Microsoft. All rights reserved. | ||
| // Licensed under the MIT license. See LICENSE file in the project root for full license information. | ||
|
|
||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Threading; | ||
| using System.Threading.Tasks; | ||
|
|
||
| using MonoDevelop.MSBuild.Language; | ||
| using MonoDevelop.MSBuild.Language.Expressions; | ||
| using MonoDevelop.MSBuild.Language.Typesystem; | ||
| using MonoDevelop.MSBuild.Schema; | ||
| using MonoDevelop.MSBuild.Util; | ||
| using MonoDevelop.Xml.Dom; | ||
| using MonoDevelop.Xml.Parser; | ||
| using MonoDevelop.Xml.Tests; | ||
|
|
||
| using NUnit.Framework; | ||
|
|
||
| namespace MonoDevelop.MSBuild.Tests.Completion; | ||
|
|
||
| class MSBuildExpressionCompletionTest | ||
| { | ||
| [OneTimeSetUp] | ||
| public void LoadMSBuild () => MSBuildTestHelpers.RegisterMSBuildAssemblies (); | ||
|
|
||
| protected IEnumerable<ISymbol> GetExpressionCompletion ( | ||
| string sourceWithMarkers, | ||
| out MSBuildRootDocument parsedDocument, | ||
| char triggerChar = '\0', | ||
| ExpressionCompletion.ExpressionTriggerReason reason = ExpressionCompletion.ExpressionTriggerReason.Invocation, | ||
| MSBuildSchema schema = null | ||
| ) | ||
| { | ||
| const string projectFileName = "FakeProject.csproj"; | ||
|
|
||
| var token = CancellationToken.None; | ||
|
|
||
| var schemas = new Analyzers.TestSchemaProvider (); | ||
| if (schema is not null) { | ||
| schemas.AddTestSchema (projectFileName, null, schema); | ||
| } | ||
|
|
||
| var environment = new NullMSBuildEnvironment (); | ||
| var taskMetadataBuilder = new NoopTaskMetadataBuilder (); | ||
|
|
||
| // internal errors should cause test failure | ||
| var logger = TestLoggerFactory.CreateTestMethodLogger ().RethrowExceptions (); | ||
|
|
||
| var textWithMarkers = TextWithMarkers.Parse (sourceWithMarkers, '|'); | ||
| var source = textWithMarkers.Text; | ||
| int caretPos = textWithMarkers.GetMarkedPosition (); | ||
| var textSource = new StringTextSource (source); | ||
|
|
||
| parsedDocument = MSBuildRootDocument.Parse ( | ||
| textSource, | ||
| projectFileName, | ||
| null, | ||
| schemas, | ||
| environment, | ||
| taskMetadataBuilder, | ||
| logger, | ||
| token); | ||
|
|
||
| var spineParser = XmlSpineParser.FromDocumentPosition (new XmlRootState (), parsedDocument.XDocument, caretPos); | ||
|
|
||
| var functionTypeProvider = new TestFunctionTypeProvider (); | ||
| var rr = MSBuildResolver.Resolve (spineParser.Clone (), textSource, parsedDocument, functionTypeProvider, logger); | ||
|
|
||
| Assert.NotNull (rr); | ||
|
|
||
| if (triggerChar == '\0' && reason == ExpressionCompletion.ExpressionTriggerReason.Invocation) { | ||
| reason = ExpressionCompletion.ExpressionTriggerReason.TypedChar; | ||
| } | ||
|
|
||
| // based on MSBuildCompletionSource.{GetExpressionCompletionsAsync,GetAdditionalCompletionsAsync} | ||
| // eventually we can factor out into a shared method | ||
|
|
||
| string expression = GetIncompleteValue (spineParser, textSource); | ||
| int exprStartPos = caretPos - expression.Length; | ||
| var triggerState = ExpressionCompletion.GetTriggerState (expression, caretPos - exprStartPos, reason, triggerChar, rr.IsCondition (), | ||
| out int spanStart, out int spanLength, out ExpressionNode triggerExpression, out var listKind, out IReadOnlyList<ExpressionNode> comparandVariables, | ||
| logger | ||
| ); | ||
|
|
||
| if (triggerState == ExpressionCompletion.TriggerState.None) { | ||
| return []; | ||
| } | ||
|
|
||
| var valueSymbol = rr.GetElementOrAttributeValueInfo (parsedDocument); | ||
| if (valueSymbol is null || valueSymbol.ValueKind == MSBuildValueKind.Nothing) { | ||
| return []; | ||
| } | ||
|
|
||
| var kind = valueSymbol.ValueKind; | ||
| if (!ExpressionCompletion.ValidateListPermitted (listKind, kind)) { | ||
| return []; | ||
| } | ||
| kind = kind.WithoutModifiers (); | ||
| if (kind == MSBuildValueKind.Data || kind == MSBuildValueKind.Nothing) { | ||
| return null; | ||
| } | ||
|
|
||
| var fileSystem = new TestFilesystem (); | ||
|
|
||
| bool isValue = triggerState == ExpressionCompletion.TriggerState.Value; | ||
| if (comparandVariables != null && isValue) { | ||
| return ExpressionCompletion.GetComparandCompletions (parsedDocument, fileSystem, comparandVariables, logger); | ||
| } | ||
|
|
||
| return ExpressionCompletion.GetCompletionInfos (rr, triggerState, valueSymbol, triggerExpression, spanLength, parsedDocument, functionTypeProvider, fileSystem, logger); | ||
| } | ||
|
|
||
| // copied from XmlParserSnapshotExtensions, modified to use ITextSource instead of ITextSnapshot | ||
| static string GetIncompleteValue (XmlSpineParser spineAtCaret, ITextSource textSource) | ||
| { | ||
| int caretPosition = spineAtCaret.Position; | ||
| var node = spineAtCaret.Spine.Peek (); | ||
|
|
||
| int valueStart; | ||
| if (node is XText t) { | ||
| valueStart = t.Span.Start; | ||
| } else if (node is XElement el && el.IsEnded) { | ||
| valueStart = el.Span.End; | ||
| } else { | ||
| int lineStart = GetLineStart (textSource, caretPosition); | ||
| valueStart = spineAtCaret.Position - spineAtCaret.CurrentStateLength; | ||
| if (spineAtCaret.GetAttributeValueDelimiter ().HasValue) { | ||
| valueStart += 1; | ||
| } | ||
| valueStart = Math.Min (Math.Max (valueStart, lineStart), caretPosition); | ||
| } | ||
|
|
||
| return textSource.GetText (valueStart, caretPosition - valueStart); | ||
|
|
||
| static int GetLineStart (ITextSource textSource, int caretPosition) | ||
| { | ||
| if (caretPosition < 1) { | ||
| return caretPosition; | ||
| } | ||
| int lineStart = caretPosition - 1; | ||
| for (; lineStart >= 0; lineStart--) { | ||
| switch (textSource[caretPosition]) { | ||
| case '\r': | ||
| case '\n': | ||
| return lineStart + 1; | ||
| } | ||
| } | ||
| return lineStart; | ||
| } | ||
| } | ||
|
|
||
| class TestFunctionTypeProvider : IFunctionTypeProvider | ||
| { | ||
| public Task EnsureInitialized (CancellationToken token) => Task.CompletedTask; | ||
| public ClassInfo GetClassInfo (string name) => null; | ||
| public IEnumerable<ClassInfo> GetClassNameCompletions () => []; | ||
| public ISymbol GetEnumInfo (string reference) => null; | ||
| public FunctionInfo GetItemFunctionInfo (string name) => null; | ||
| public IEnumerable<FunctionInfo> GetItemFunctionNameCompletions () => []; | ||
| public FunctionInfo GetPropertyFunctionInfo (MSBuildValueKind valueKind, string name) => null; | ||
| public IEnumerable<FunctionInfo> GetPropertyFunctionNameCompletions (ExpressionNode triggerExpression) => []; | ||
| public FunctionInfo GetStaticPropertyFunctionInfo (string className, string name) => null; | ||
| public MSBuildValueKind ResolveType (ExpressionPropertyNode node) => MSBuildValueKind.Unknown; | ||
| } | ||
|
|
||
| class TestFilesystem : IMSBuildFileSystem | ||
| { | ||
| public bool DirectoryExists (string basePath) => false; | ||
|
|
||
| public IEnumerable<string> GetDirectories (string basePath) => []; | ||
|
|
||
| public IEnumerable<string> GetFiles (string basePath) => []; | ||
| } | ||
| } |
Oops, something went wrong.