summaryrefslogtreecommitdiff
path: root/Util
diff options
context:
space:
mode:
authorGravatar rustanleino <unknown>2010-11-17 17:45:36 +0000
committerGravatar rustanleino <unknown>2010-11-17 17:45:36 +0000
commitfe84a26cd7367c359bda19f67940f51259a61c6e (patch)
treed642a65b51b688f0f199213c3d848d57fa39e9be /Util
parentf3cd67af3c2c7f99b8e75dd5660fc1c7a0b3114d (diff)
VSIP integration into VS: Changed idle delay to 300ms (from 1s). Distinguish warnings/errors in Chalice.
Diffstat (limited to 'Util')
-rw-r--r--Util/VS2010/Boogie/..svnbridge/BoogieLanguageService.suo1
-rw-r--r--Util/VS2010/Boogie/..svnbridge/DafnyLanguageService.suo1
-rw-r--r--Util/VS2010/Boogie/BoogieLanguageService.suobin32256 -> 0 bytes
-rw-r--r--Util/VS2010/Boogie/BoogieLanguageService/Integration/Package.cs2
-rw-r--r--Util/VS2010/Boogie/DafnyLanguageService.suobin23040 -> 0 bytes
-rw-r--r--Util/VS2010/Chalice/ChaliceLanguageService/Integration/IronyLanguageService.cs7
-rw-r--r--Util/VS2010/Chalice/ChaliceLanguageService/Integration/Package.cs2
-rw-r--r--Util/VS2010/Dafny/DafnyLanguageService/Integration/Package.cs2
8 files changed, 8 insertions, 7 deletions
diff --git a/Util/VS2010/Boogie/..svnbridge/BoogieLanguageService.suo b/Util/VS2010/Boogie/..svnbridge/BoogieLanguageService.suo
deleted file mode 100644
index 08149303..00000000
--- a/Util/VS2010/Boogie/..svnbridge/BoogieLanguageService.suo
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><ItemProperties xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><Properties><Property><Name>svn:mime-type</Name><Value>application/octet-stream</Value></Property></Properties></ItemProperties> \ No newline at end of file
diff --git a/Util/VS2010/Boogie/..svnbridge/DafnyLanguageService.suo b/Util/VS2010/Boogie/..svnbridge/DafnyLanguageService.suo
deleted file mode 100644
index 08149303..00000000
--- a/Util/VS2010/Boogie/..svnbridge/DafnyLanguageService.suo
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><ItemProperties xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><Properties><Property><Name>svn:mime-type</Name><Value>application/octet-stream</Value></Property></Properties></ItemProperties> \ No newline at end of file
diff --git a/Util/VS2010/Boogie/BoogieLanguageService.suo b/Util/VS2010/Boogie/BoogieLanguageService.suo
deleted file mode 100644
index bc7c3622..00000000
--- a/Util/VS2010/Boogie/BoogieLanguageService.suo
+++ /dev/null
Binary files differ
diff --git a/Util/VS2010/Boogie/BoogieLanguageService/Integration/Package.cs b/Util/VS2010/Boogie/BoogieLanguageService/Integration/Package.cs
index ae9c00c4..dc1244d6 100644
--- a/Util/VS2010/Boogie/BoogieLanguageService/Integration/Package.cs
+++ b/Util/VS2010/Boogie/BoogieLanguageService/Integration/Package.cs
@@ -32,7 +32,7 @@ namespace Demo
crinfo[0].grfcadvf = (uint)_OLECADVF.olecadvfModal |
(uint)_OLECADVF.olecadvfRedrawOff |
(uint)_OLECADVF.olecadvfWarningsOff;
- crinfo[0].uIdleTimeInterval = 1000;
+ crinfo[0].uIdleTimeInterval = 300;
int hr = mgr.FRegisterComponent(this, crinfo, out componentID);
}
diff --git a/Util/VS2010/Boogie/DafnyLanguageService.suo b/Util/VS2010/Boogie/DafnyLanguageService.suo
deleted file mode 100644
index aef52746..00000000
--- a/Util/VS2010/Boogie/DafnyLanguageService.suo
+++ /dev/null
Binary files differ
diff --git a/Util/VS2010/Chalice/ChaliceLanguageService/Integration/IronyLanguageService.cs b/Util/VS2010/Chalice/ChaliceLanguageService/Integration/IronyLanguageService.cs
index 281040ca..8519e467 100644
--- a/Util/VS2010/Chalice/ChaliceLanguageService/Integration/IronyLanguageService.cs
+++ b/Util/VS2010/Chalice/ChaliceLanguageService/Integration/IronyLanguageService.cs
@@ -178,7 +178,7 @@ namespace Demo
continue;
if (line.StartsWith("Boogie program verifier")) {
if (!Regex.IsMatch(line, "Boogie program verifier finished with [0-9]* verified, 0 errors"))
- AddErrorBecauseOfToolProblems(req, line);
+ AddErrorBecauseOfToolProblems(req, line, false);
continue;
}
@@ -256,11 +256,14 @@ namespace Demo
}
private static void AddErrorBecauseOfToolProblems(ParseRequest req, string msg) {
+ AddErrorBecauseOfToolProblems(req, msg, true);
+ }
+ private static void AddErrorBecauseOfToolProblems(ParseRequest req, string msg, bool error) {
TextSpan span = new TextSpan();
span.iStartLine = span.iEndLine = 0;
span.iStartIndex = 0;
span.iEndIndex = 5;
- req.Sink.AddError(req.FileName, msg, span, Severity.Error);
+ req.Sink.AddError(req.FileName, msg, span, error ? Severity.Error : Severity.Hint);
}
/// <summary>
diff --git a/Util/VS2010/Chalice/ChaliceLanguageService/Integration/Package.cs b/Util/VS2010/Chalice/ChaliceLanguageService/Integration/Package.cs
index ae9c00c4..dc1244d6 100644
--- a/Util/VS2010/Chalice/ChaliceLanguageService/Integration/Package.cs
+++ b/Util/VS2010/Chalice/ChaliceLanguageService/Integration/Package.cs
@@ -32,7 +32,7 @@ namespace Demo
crinfo[0].grfcadvf = (uint)_OLECADVF.olecadvfModal |
(uint)_OLECADVF.olecadvfRedrawOff |
(uint)_OLECADVF.olecadvfWarningsOff;
- crinfo[0].uIdleTimeInterval = 1000;
+ crinfo[0].uIdleTimeInterval = 300;
int hr = mgr.FRegisterComponent(this, crinfo, out componentID);
}
diff --git a/Util/VS2010/Dafny/DafnyLanguageService/Integration/Package.cs b/Util/VS2010/Dafny/DafnyLanguageService/Integration/Package.cs
index ae9c00c4..dc1244d6 100644
--- a/Util/VS2010/Dafny/DafnyLanguageService/Integration/Package.cs
+++ b/Util/VS2010/Dafny/DafnyLanguageService/Integration/Package.cs
@@ -32,7 +32,7 @@ namespace Demo
crinfo[0].grfcadvf = (uint)_OLECADVF.olecadvfModal |
(uint)_OLECADVF.olecadvfRedrawOff |
(uint)_OLECADVF.olecadvfWarningsOff;
- crinfo[0].uIdleTimeInterval = 1000;
+ crinfo[0].uIdleTimeInterval = 300;
int hr = mgr.FRegisterComponent(this, crinfo, out componentID);
}