repo
string | commit
string | message
string | diff
string |
|---|---|---|---|
mikehelmick/SIGCSE2011-Web-Site
|
d40b2f227bcebbeddc346aceefa96aea4d78825f
|
Add instructions for calendar subscription
|
diff --git a/attendees/calendar.php b/attendees/calendar.php
index 95177df..9a35c53 100644
--- a/attendees/calendar.php
+++ b/attendees/calendar.php
@@ -1,27 +1,34 @@
<?php
$title = "SIGCSE 2011 - Calendar";
$menu = "attendees";
include("../parts/top.php");
?> <!-- <h2>Important Dates</h2> -->
<!-- right area -->
<h1>SIGCSE 2011 Calendar</h1>
<ul>
<li>View below or subscribe. Subscribing in Google calendar makes it easy to sync this calendar to your Android or iOS device.
<ul>
- <li><a href="http://www.google.com/calendar/ical/abs97af8r10qelmu18ugihhiuk%40group.calendar.google.com/public/basic.ics">http://www.google.com/calendar/ical/abs97af8r10qelmu18ugihhiuk%40group.calendar.google.com/public/basic.ics</a></li>
+ <li><a href="https://www.google.com/calendar/b/0/[email protected]&pli=1">Click Here</a> to add this calendar to your Google calendar.</li>
+ <li>Other formats: <a href="http://www.google.com/support/calendar/bin/answer.py?answer=34578&ctx=tltp">Help with subscribing to calendars with other clients.</a>
+ <ul>
+ <li><a href="http://www.google.com/calendar/feeds/abs97af8r10qelmu18ugihhiuk%40group.calendar.google.com/public/basic">XML Format</a></li>
+ <li><a href="http://www.google.com/calendar/ical/abs97af8r10qelmu18ugihhiuk%40group.calendar.google.com/public/basic.ics">ICS (iCal) Format</a></li>
+ </ul>
+ </li>
</ul>
</li>
</ul>
+
<iframe src="https://www.google.com/calendar/b/0/embed?title=SIGCSE%202011&mode=WEEK&height=600&wkst=2&bgcolor=%23cccccc&src=abs97af8r10qelmu18ugihhiuk%40group.calendar.google.com&color=%23A32929&ctz=America%2FChicago" style=" border:solid 1px #777 " width="800" height="600" frameborder="0" scrolling="auto"></iframe>
<?php include("../parts/middle.php"); ?>
<?php include("../parts/attendees_right.php"); ?>
<?php
$updated = filemtime( $_SERVER["SCRIPT_FILENAME"] );
include("../parts/footer.php");
?>
\ No newline at end of file
|
mikehelmick/SIGCSE2011-Web-Site
|
ce0af78bef7e9589bd044936202ef920c454a71e
|
add calendar
|
diff --git a/attendees/calendar.php b/attendees/calendar.php
new file mode 100644
index 0000000..95177df
--- /dev/null
+++ b/attendees/calendar.php
@@ -0,0 +1,27 @@
+<?php
+ $title = "SIGCSE 2011 - Calendar";
+ $menu = "attendees";
+ include("../parts/top.php");
+?> <!-- <h2>Important Dates</h2> -->
+
+
+ <!-- right area -->
+<h1>SIGCSE 2011 Calendar</h1>
+
+<ul>
+ <li>View below or subscribe. Subscribing in Google calendar makes it easy to sync this calendar to your Android or iOS device.
+ <ul>
+ <li><a href="http://www.google.com/calendar/ical/abs97af8r10qelmu18ugihhiuk%40group.calendar.google.com/public/basic.ics">http://www.google.com/calendar/ical/abs97af8r10qelmu18ugihhiuk%40group.calendar.google.com/public/basic.ics</a></li>
+ </ul>
+ </li>
+</ul>
+
+<iframe src="https://www.google.com/calendar/b/0/embed?title=SIGCSE%202011&mode=WEEK&height=600&wkst=2&bgcolor=%23cccccc&src=abs97af8r10qelmu18ugihhiuk%40group.calendar.google.com&color=%23A32929&ctz=America%2FChicago" style=" border:solid 1px #777 " width="800" height="600" frameborder="0" scrolling="auto"></iframe>
+
+<?php include("../parts/middle.php"); ?>
+<?php include("../parts/attendees_right.php"); ?>
+
+<?php
+ $updated = filemtime( $_SERVER["SCRIPT_FILENAME"] );
+ include("../parts/footer.php");
+ ?>
\ No newline at end of file
diff --git a/attendees/index.php b/attendees/index.php
index 61da9d8..ba822c7 100644
--- a/attendees/index.php
+++ b/attendees/index.php
@@ -1,68 +1,69 @@
<?php
$title = "SIGCSE 2011 - Information for Symposium Attendees";
$menu = "attendees";
$submenu = "cfp";
include("../parts/top.php");
?> <!-- <h2>Important Dates</h2> -->
<div class="SectionHeader" style="clear:left;"><div class="Full">
<h2>Information for SIGCSE 2011 Symposium Attendees</h2>
</div></div>
<p><strong>All conference activities will be at the Sheraton hotel and its attached conference center.</strong> The Sheraton Dallas Hotel and conference center is located at 400 North Olive Street, Dallas, TX 75201. More information can be found on our <a href="/sigcse2011/attendees/accommodations.php">accommodations page</a>.</p>
<p>A number of room changes have been posted in the online program for
workshops and preconference events. Please check the program just before
you arrive for updated room assignments.</p>
<table cellspacing="5px" width="100%">
<tr>
<td valign="top" align="left">
<ul>
- <li><a href="http://db.grinnell.edu/sigcse/sigcse2011/Program/Program.asp"><img src="/sigcse2011/images/report.png" align="absmiddle" /> Symposium Program</a></li>
+ <li><a href="http://db.grinnell.edu/sigcse/sigcse2011/Program/Program.asp"><img src="/sigcse2011/images/report.png" align="absmiddle" /> Symposium Program</a> |
+ <a href="/sigcse2011/attendees/calendar.php">Calendar</a></li>
<li><a href="/sigcse2011/attendees/keynotes.php"><img src="/sigcse2011/images/user_suit.png" align="absmiddle" /> Keynote Speakers</a></li>
<li><a href="/sigcse2011/attendees/supporter_sessions.php"><img src="/sigcse2011/images/building.png" align="absmiddle"/> Supporter Sessions</a></li>
<li><a href="/sigcse2011/attendees/pre_symposium_events.php"><img src="/sigcse2011/images/calendar.png" align="absmiddle"/> Pre-Symposium Events</a></li>
<li><a href="/sigcse2011/attendees/nsf_showcase.php"><img src="/sigcse2011/images/images.png" align="absmiddle"/> NSF Showcase</a></li>
<li><a href="/sigcse2011/attendees/video_program.php"><img src="/sigcse2011/images/television.png" align="absmiddle"/> Video Program</a></li>
<li><a href="http://elvis.rowan.edu/~kay/sigcse/rodeo.html"><img src="/sigcse2011/images/bricks.png" align="absmiddle"/> SIGCSE 2011 Robot Hoedown and Rodeo</a> <strong>New for 2011!</strong>
<ul><li><a href="http://elvis.rowan.edu/~kay/sigcse/cfw.html">Call for Wranglers</a></li></ul>
</li>
<li><a href="/sigcse2011/attendees/k12_highlights.php"><img src="/sigcse2011/images/house.png" align="absmiddle"/> Highlights for K-12 Teachers</a></li>
<li><a href="/sigcse2011/attendees/student_research.php"><img src="/sigcse2011/images/award_star_gold_3.png" align="absmiddle"/> Student Research Competition</a></li>
<li><a href="/sigcse2011/attendees/registration.php"><img src="/sigcse2011/images/vcard_add.png" align="absmiddle"/> Registration</a> <strong>NOW OPEN!</strong>
<ul><li><a href="/sigcse2011/attendees/fees.php"><img src="/sigcse2011/images/money.png" align="absmiddle"/> A Sneak Peak at Fees</a></li></ul>
</li>
<li><a href="/sigcse2011/attendees/pokens.php"><img src="/sigcse2011/images/vcard.png" align="absmiddle"> Pokens: A new way to connect at SIGCSE 2011</a></li>
<li><a href="/sigcse2011/attendees/travel_information.php"><img src="/sigcse2011/images/tag_orange.png" align="absmiddle"/> Travel Information</a></li>
<li><a href="/sigcse2011/attendees/accommodations.php"><img src="/sigcse2011/images/clock.png" align="absmiddle"/> Accommodations</a></li>
<li><a href="http://www.visitdallas.com/WelcomeSIGCSE2011" target="_blank"><img src="/sigcse2011/images/weather_sun.png" align="absmiddle"/> Local Attractions</a> (<em>opens in new window</em>)</li>
<li><a href="/sigcse2011/attendees/kids_camp.php"><img src="/sigcse2011/images/group.png" align="absmiddle"/> Kids Camp</a></li>
<li><a href="/sigcse2011/attendees/visas.php"><img src="/sigcse2011/images/folder_database.png" align="absmiddle"/> Visa Information</a></li>
<li><a href="/sigcse2011/attendees/floor_plans.php"><img src="/sigcse2011/images/map.png" align="absmiddle"/> Floor Plans</a></li>
<li><a href="/sigcse2011/faq/#attendees"><img src="/sigcse2011/images/help.png" align="absmiddle" /> FAQ</a></li>
<!--
<li><a href="/sigcse2011/attendees/reception.php"><img src="/sigcse2011/images/cake.png" align="absmiddle"/> Reception</a></li>
<li><a href="/sigcse2011/attendees/special_projects.php"><img src="/sigcse2011/images/bricks.png" align="absmiddle"/> SIGCSE Special Projects</a></li>
<li><a href="/sigcse2011/attendees/video_program.php"><img src="/sigcse2011/images/television.png" align="absmiddle"/> Video Program</a></li>
<li><a href="/sigcse2011/attendees/k12_highlights.php"><img src="/sigcse2011/images/house.png" align="absmiddle"/> Highlights for K-12 Teachers</a></li>
-->
</ul>
</td>
<td nowrap="nowrap" valign="top" align="right">
<div style='width: 240px; height: 420px; background-image: url( http://vortex.accuweather.com/adcbin/netweather_v2/backgrounds/spring1_240x420_bg.jpg ); background-repeat: no-repeat; background-color: #607041;' ><div id='NetweatherContainer' style='height: 405px;' ><script src='http://netweather.accuweather.com/adcbin/netweather_v2/netweatherV2ex.asp?partner=netweather&tStyle=normal&logo=1&zipcode=75202&lang=eng&size=12&theme=spring1&metric=0&target=_self'></script></div><div style='text-align: center; font-family: arial, helvetica, verdana, sans-serif; font-size: 10px; line-height: 15px; color: #FDEA11;' ><a style='font-size: 10px; color: #FDEA11' href='http://www.accuweather.com/us/TX/DALLAS/75202/city-weather-forecast.asp?partner=accuweather&traveler=0' >Weather Forecast</a>Â |Â <a style='color: #FDEA11' href='http://www.accuweather.com/maps-satellite.asp' >Weather Maps</a>Â |Â <a style='color: #FDEA11' href='http://www.accuweather.com/index-radar.asp?partner=accuweather&traveler=0&zipcode=75202' >Weather Radar</a></div></div>
</td>
</tr>
</table>
<?php include("../parts/middle.php"); ?>
<?php include("../parts/attendees_right.php"); ?>
<?php
$updated = filemtime( $_SERVER["SCRIPT_FILENAME"] );
include("../parts/footer.php");
?>
\ No newline at end of file
diff --git a/parts/attendees_right.php b/parts/attendees_right.php
index f6ecd35..c9bb1bb 100644
--- a/parts/attendees_right.php
+++ b/parts/attendees_right.php
@@ -1,33 +1,25 @@
<ul>
- <li><a href="http://db.grinnell.edu/sigcse/sigcse2011/Program/Program.asp"><img src="/sigcse2011/images/report.png" align="absmiddle" /> Symposium Program</a></li>
+ <li><a href="http://db.grinnell.edu/sigcse/sigcse2011/Program/Program.asp"><img src="/sigcse2011/images/report.png" align="absmiddle" /> Symposium Program</a> |
+ <a href="/sigcse2011/attendees/calendar.php">Calendar</a></li>
<li><a href="/sigcse2011/attendees/keynotes.php"><img src="/sigcse2011/images/user_suit.png" align="absmiddle" /> Keynote Speakers</a></li>
<li><a href="/sigcse2011/attendees/supporter_sessions.php"><img src="/sigcse2011/images/building.png" align="absmiddle"/> Supporter Sessions</a></li>
<li><a href="/sigcse2011/attendees/pre_symposium_events.php"><img src="/sigcse2011/images/calendar.png" align="absmiddle"/> Pre-Symposium Events</a></li>
<li><a href="/sigcse2011/attendees/nsf_showcase.php"><img src="/sigcse2011/images/images.png" align="absmiddle"/> NSF Showcase</a></li>
<li><a href="/sigcse2011/attendees/video_program.php"><img src="/sigcse2011/images/television.png" align="absmiddle"/> Video Program</a></li>
<li><a href="http://elvis.rowan.edu/~kay/sigcse/rodeo.html"><img src="/sigcse2011/images/bricks.png" align="absmiddle"/> SIGCSE 2011 Robot Hoedown and Rodeo</a> <strong>New!</strong>
<ul><li><a href="http://elvis.rowan.edu/~kay/sigcse/cfw.html">Call for Wranglers</a></li></ul>
</li>
<li><a href="/sigcse2011/attendees/k12_highlights.php"><img src="/sigcse2011/images/house.png" align="absmiddle"/> Highlights for K-12 Teachers</a></li>
<li><a href="/sigcse2011/attendees/student_research.php"><img src="/sigcse2011/images/award_star_gold_3.png" align="absmiddle"/> Student Research Competition</a></li>
<li><a href="/sigcse2011/attendees/registration.php"><img src="/sigcse2011/images/vcard_add.png" align="absmiddle"/> Registration</a>
<ul><li><a href="/sigcse2011/attendees/fees.php"><img src="/sigcse2011/images/money.png" align="absmiddle"/> A Sneak Peak at Fees</a></li></ul>
</li>
<li><a href="/sigcse2011/attendees/pokens.php"><img src="/sigcse2011/images/vcard.png" align="absmiddle"> Pokens: A new way to connect at SIGCSE 2011</a></li>
<li><a href="/sigcse2011/attendees/travel_information.php"><img src="/sigcse2011/images/tag_orange.png" align="absmiddle"/> Travel Information</a></li>
<li><a href="/sigcse2011/attendees/accommodations.php"><img src="/sigcse2011/images/clock.png" align="absmiddle"/> Accommodations</a></li>
<li><a href="http://www.visitdallas.com/WelcomeSIGCSE2011" target="_blank"><img src="/sigcse2011/images/weather_sun.png" align="absmiddle"/> Local Attractions</a></li>
<li><a href="/sigcse2011/attendees/kids_camp.php"><img src="/sigcse2011/images/group.png" align="absmiddle"/> Kids Camp</a></li>
<li><a href="/sigcse2011/attendees/visas.php"><img src="/sigcse2011/images/folder_database.png" align="absmiddle"/> Visa Information</a></li>
<li><a href="/sigcse2011/attendees/floor_plans.php"><img src="/sigcse2011/images/map.png" align="absmiddle"/> Floor Plans</a></li>
<li><a href="/sigcse2011/faq/#attendees"><img src="/sigcse2011/images/help.png" align="absmiddle" /> FAQ</a></li>
-
- <!--
- <li><a href="/sigcse2011/attendees/reception.php"><img src="/sigcse2011/images/cake.png" align="absmiddle"/> Reception</a></li>
- <li><a href="/sigcse2011/attendees/supporter_sessions.php"><img src="/sigcse2011/images/building.png" align="absmiddle"/> Supporter Sessions</a></li>
- <li><a href="/sigcse2011/attendees/special_projects.php"><img src="/sigcse2011/images/bricks.png" align="absmiddle"/> SIGCSE Special Projects</a></li>
- <li><a href="/sigcse2011/attendees/video_program.php"><img src="/sigcse2011/images/television.png" align="absmiddle"/> Video Program</a></li>
- <li><a href="/sigcse2011/attendees/k12_highlights.php"><img src="/sigcse2011/images/house.png" align="absmiddle"/> Highlights for K-12 Teachers</a></li>
- <li><a href="/sigcse2011/attendees/kids_camp.php"><img src="/sigcse2011/images/group.png" align="absmiddle"/> Kids Camp</a></li>
- -->
</ul>
\ No newline at end of file
|
mikehelmick/SIGCSE2011-Web-Site
|
b83415b875c2f5eb7825d5a2a1fcceb6ac0d4b26
|
add weather + add link to flickr site
|
diff --git a/attendees/index.php b/attendees/index.php
index 158e0af..61da9d8 100644
--- a/attendees/index.php
+++ b/attendees/index.php
@@ -1,70 +1,68 @@
<?php
$title = "SIGCSE 2011 - Information for Symposium Attendees";
$menu = "attendees";
$submenu = "cfp";
include("../parts/top.php");
?> <!-- <h2>Important Dates</h2> -->
<div class="SectionHeader" style="clear:left;"><div class="Full">
<h2>Information for SIGCSE 2011 Symposium Attendees</h2>
</div></div>
<p><strong>All conference activities will be at the Sheraton hotel and its attached conference center.</strong> The Sheraton Dallas Hotel and conference center is located at 400 North Olive Street, Dallas, TX 75201. More information can be found on our <a href="/sigcse2011/attendees/accommodations.php">accommodations page</a>.</p>
<p>A number of room changes have been posted in the online program for
workshops and preconference events. Please check the program just before
you arrive for updated room assignments.</p>
<table cellspacing="5px" width="100%">
<tr>
<td valign="top" align="left">
<ul>
<li><a href="http://db.grinnell.edu/sigcse/sigcse2011/Program/Program.asp"><img src="/sigcse2011/images/report.png" align="absmiddle" /> Symposium Program</a></li>
<li><a href="/sigcse2011/attendees/keynotes.php"><img src="/sigcse2011/images/user_suit.png" align="absmiddle" /> Keynote Speakers</a></li>
<li><a href="/sigcse2011/attendees/supporter_sessions.php"><img src="/sigcse2011/images/building.png" align="absmiddle"/> Supporter Sessions</a></li>
<li><a href="/sigcse2011/attendees/pre_symposium_events.php"><img src="/sigcse2011/images/calendar.png" align="absmiddle"/> Pre-Symposium Events</a></li>
<li><a href="/sigcse2011/attendees/nsf_showcase.php"><img src="/sigcse2011/images/images.png" align="absmiddle"/> NSF Showcase</a></li>
<li><a href="/sigcse2011/attendees/video_program.php"><img src="/sigcse2011/images/television.png" align="absmiddle"/> Video Program</a></li>
<li><a href="http://elvis.rowan.edu/~kay/sigcse/rodeo.html"><img src="/sigcse2011/images/bricks.png" align="absmiddle"/> SIGCSE 2011 Robot Hoedown and Rodeo</a> <strong>New for 2011!</strong>
<ul><li><a href="http://elvis.rowan.edu/~kay/sigcse/cfw.html">Call for Wranglers</a></li></ul>
</li>
<li><a href="/sigcse2011/attendees/k12_highlights.php"><img src="/sigcse2011/images/house.png" align="absmiddle"/> Highlights for K-12 Teachers</a></li>
<li><a href="/sigcse2011/attendees/student_research.php"><img src="/sigcse2011/images/award_star_gold_3.png" align="absmiddle"/> Student Research Competition</a></li>
<li><a href="/sigcse2011/attendees/registration.php"><img src="/sigcse2011/images/vcard_add.png" align="absmiddle"/> Registration</a> <strong>NOW OPEN!</strong>
<ul><li><a href="/sigcse2011/attendees/fees.php"><img src="/sigcse2011/images/money.png" align="absmiddle"/> A Sneak Peak at Fees</a></li></ul>
</li>
<li><a href="/sigcse2011/attendees/pokens.php"><img src="/sigcse2011/images/vcard.png" align="absmiddle"> Pokens: A new way to connect at SIGCSE 2011</a></li>
<li><a href="/sigcse2011/attendees/travel_information.php"><img src="/sigcse2011/images/tag_orange.png" align="absmiddle"/> Travel Information</a></li>
<li><a href="/sigcse2011/attendees/accommodations.php"><img src="/sigcse2011/images/clock.png" align="absmiddle"/> Accommodations</a></li>
<li><a href="http://www.visitdallas.com/WelcomeSIGCSE2011" target="_blank"><img src="/sigcse2011/images/weather_sun.png" align="absmiddle"/> Local Attractions</a> (<em>opens in new window</em>)</li>
<li><a href="/sigcse2011/attendees/kids_camp.php"><img src="/sigcse2011/images/group.png" align="absmiddle"/> Kids Camp</a></li>
<li><a href="/sigcse2011/attendees/visas.php"><img src="/sigcse2011/images/folder_database.png" align="absmiddle"/> Visa Information</a></li>
<li><a href="/sigcse2011/attendees/floor_plans.php"><img src="/sigcse2011/images/map.png" align="absmiddle"/> Floor Plans</a></li>
<li><a href="/sigcse2011/faq/#attendees"><img src="/sigcse2011/images/help.png" align="absmiddle" /> FAQ</a></li>
<!--
<li><a href="/sigcse2011/attendees/reception.php"><img src="/sigcse2011/images/cake.png" align="absmiddle"/> Reception</a></li>
<li><a href="/sigcse2011/attendees/special_projects.php"><img src="/sigcse2011/images/bricks.png" align="absmiddle"/> SIGCSE Special Projects</a></li>
<li><a href="/sigcse2011/attendees/video_program.php"><img src="/sigcse2011/images/television.png" align="absmiddle"/> Video Program</a></li>
<li><a href="/sigcse2011/attendees/k12_highlights.php"><img src="/sigcse2011/images/house.png" align="absmiddle"/> Highlights for K-12 Teachers</a></li>
-->
</ul>
</td>
<td nowrap="nowrap" valign="top" align="right">
-<!--
-<div style='width: 500px; height: 440px; background-image: url( http://vortex.accuweather.com/adcbin/netweather_v2/backgrounds/fall4_500x440_bg.jpg ); background-repeat: no-repeat; background-color: #DA9375;' ><div id='NetweatherContainer' style='height: 420px;' ><script src='http://netweather.accuweather.com/adcbin/netweather_v2/netweatherV2ex.asp?partner=netweather&tStyle=normal&logo=1&zipcode=75202&lang=eng&size=13&theme=fall4&metric=0&target=_self'></script></div><div style='text-align: center; font-family: arial, helvetica, verdana, sans-serif; font-size: 12px; line-height: 20px; color: #0000FF;' ><a style='color: #0000FF' href='http://www.accuweather.com/us/TX/DALLAS/75202/city-weather-forecast.asp?partner=accuweather&traveler=0' >Weather Forecast</a>Â |Â <a style='color: #0000FF' href='http://www.accuweather.com/maps-satellite.asp' >Weather Maps</a>Â |Â <a style='color: #0000FF' href='http://www.accuweather.com/index-radar.asp?partner=accuweather&traveler=0&zipcode=75202' >Weather Radar</a>Â |Â <a style='color: #0000FF' href='http://hurricane.accuweather.com/hurricane/index.asp' >Hurricane Center</a></div></div>
--->
- </td>
+<div style='width: 240px; height: 420px; background-image: url( http://vortex.accuweather.com/adcbin/netweather_v2/backgrounds/spring1_240x420_bg.jpg ); background-repeat: no-repeat; background-color: #607041;' ><div id='NetweatherContainer' style='height: 405px;' ><script src='http://netweather.accuweather.com/adcbin/netweather_v2/netweatherV2ex.asp?partner=netweather&tStyle=normal&logo=1&zipcode=75202&lang=eng&size=12&theme=spring1&metric=0&target=_self'></script></div><div style='text-align: center; font-family: arial, helvetica, verdana, sans-serif; font-size: 10px; line-height: 15px; color: #FDEA11;' ><a style='font-size: 10px; color: #FDEA11' href='http://www.accuweather.com/us/TX/DALLAS/75202/city-weather-forecast.asp?partner=accuweather&traveler=0' >Weather Forecast</a>Â |Â <a style='color: #FDEA11' href='http://www.accuweather.com/maps-satellite.asp' >Weather Maps</a>Â |Â <a style='color: #FDEA11' href='http://www.accuweather.com/index-radar.asp?partner=accuweather&traveler=0&zipcode=75202' >Weather Radar</a></div></div>
+ </td>
</tr>
</table>
<?php include("../parts/middle.php"); ?>
<?php include("../parts/attendees_right.php"); ?>
<?php
$updated = filemtime( $_SERVER["SCRIPT_FILENAME"] );
include("../parts/footer.php");
?>
\ No newline at end of file
diff --git a/parts/main_right.php b/parts/main_right.php
index d71a17b..4edebbf 100644
--- a/parts/main_right.php
+++ b/parts/main_right.php
@@ -1,13 +1,16 @@
<h2>News</h2>
<ul>
<li>The following workshops have been canceled: #25, #28, #31, #32, #34.</li>
<li><a href="/sigcse2011/attendees/registration.php">Online registration is now open.</a></li>
<li>New event for 2011! <a href="http://elvis.rowan.edu/~kay/sigcse/rodeo.html">Robot Hoedown and Rodeo</a>. No experience necessary, but if you have robots and experience, <a href="http://elvis.rowan.edu/~kay/sigcse/cfw.html">we could use you as a wrangler</a>!</li>
</ul>
<h2>Connect</h2>
<ul>
- <li>Twitter: <a href="http://twitter.com/sigcse2011">twitter.com/sigcse2011</a></li>
+ <li>Twitter: <a href="http://twitter.com/sigcse2011">twitter.com/sigcse2011</a>
+ <ul><li>Tag your tweets with <code>#sigcse</code></li></ul>
+ </li>
<li>Facebook: <a href="http://www.facebook.com/group.php?gid=373261951323">SIGCSE 2011 Group</a></li>
+ <li>Flickr: <a href="http://www.flickr.com/groups/sigcse2011/">Share your photos!</a></li>
</ul>
|
mikehelmick/SIGCSE2011-Web-Site
|
075fb7cb749418e438dbe9f3f5a8218d60bb58df
|
add 2011 exhibit guide
|
diff --git a/exhibitors/downloads/sigcse_eg2011.pdf b/exhibitors/downloads/sigcse_eg2011.pdf
new file mode 100644
index 0000000..22d84f5
Binary files /dev/null and b/exhibitors/downloads/sigcse_eg2011.pdf differ
diff --git a/exhibitors/index.php b/exhibitors/index.php
index b25f4f9..9e258fa 100644
--- a/exhibitors/index.php
+++ b/exhibitors/index.php
@@ -1,235 +1,241 @@
<?php
$title = "SIGCSE 2011 - Exhibitors and Supporters";
$menu = "exhibitors";
include("../parts/top.php");
?> <!-- <h2>Important Dates</h2> -->
+
+<div class="GoodMessage">
+<p>SIGCSE 2011 <a href="/sigcse2011/exhibitors/downloads/sigcse_eg2011.pdf" target="_blank"> SIGCSE 2011 Exhibit Guide (PDF)</a> |
+<a href="http://docs.google.com/viewer?url=http%3A%2F%2Fwww.sigcse.org%2Fsigcse2011%2Fexhibitors%2Fdownloads%sigcse_eg2011.pdf">View online with Google docs Viewer</a>
+</p>
+</div>
<div class="GoodMessage">
<p>SIGCSE 2011 <a href="/sigcse2011/exhibitors/downloads/SIGCSE_EP11.pdf" target="_blank"> Invitation to Exhibit / Conference Support Opportunities (PDF)</a> |
<a href="http://docs.google.com/viewer?url=http%3A%2F%2Fwww.sigcse.org%2Fsigcse2011%2Fexhibitors%2Fdownloads%2FSIGCSE_EP11.pdf">View online with Google docs Viewer</a>
</p>
</div>
<div class="SectionHeader"><div class="Full">
<h2>Exhibitors and Supporters</h2>
</div></div>
<p>
The Association for Computing Machinery
(<a href="http://www.acm.org">ACM</a>)
Special Interest Group on Computer Science Education
(<a href="http://www.sigcse.org">SIGCSE</a>)
is a community of approximately 2,600 educators and students
possessing a passion for studying and improving the state
of computer science education at all levels.
The annual SIGCSE Technical Symposium is the flagship conference
of our organization, and is attended by approximately
1,300 people. Conference attendees travel from across the globe
to learn new educational techniques, to examine the latest
textbooks, to share ideas with colleagues, to talk with
computing professionals, and to acquire hands-on experience
with new hardware and software, including software development
environments, classroom presentation technologies, on-line
collaboration tools, and robotics.
</p>
<!--
<p>
The exhibit hall hours will be:
</p>
<table style="width: 35%;">
<tbody>
<tr>
<td> </td>
<td style="font-size: 1.0em"> Thursday, March 5th </td>
<td style="font-size: 1.0em"> 10 a.m. - 6 p.m. </td>
</tr>
<tr>
<td> </td>
<td style="font-size: 1.0em"> Friday, March 6th </td>
<td style="font-size: 1.0em"> 10 a.m. - 6 p.m. </td>
</tr>
<tr>
<td> </td>
<td style="font-size: 1.0em"> Saturday, March 7th </td>
<td style="font-size: 1.0em"> 9:30 a.m. - Noon </td>
</tr>
</tbody>
</table>
-->
<div class="SectionHeader"><div class="Full">
<h2>Are You Interested in Becoming a Supporter and/or Exhibitor?</h2>
</div></div>
<ul>
<li>The <a href="/sigcse2011/exhibitors/downloads/SIGCSE_EP11.pdf" target="_blank">SIGCSE 2011 Invitation to Exhibit / Conference Support Opportunities</a> document (PDF; opens in new window) provides details on how your organization can connect with our community. </li>
<li><a href="/sigcse2011/exhibitors/downloads/acm_sigcse_2011_floorplan.pdf">Download the SIGCSE 2011 exhibit hall plan</a> or <a href="http://docs.google.com/viewer?url=http%3A%2F%2Fwww.sigcse.org%2Fsigcse2011%2Fexhibitors%2Fdownloads%2Facm_sigcse_2011_floorplan.pdf">View with Google docs Viewer</a>.</li>
<li>Here are two views of the SIGCSE 2008 Exhibit Hall. The 2011 conference is in a different location, but we hope that these views will give you a sense of what the 2011 exhibition space will look like. (Click on each for a larger version.)</li>
<table border="0" align="center">
<tr>
<td><a href="images/2008Hall01.jpg" rel="lightbox[students]" title="2008 Exhibit Hall"><img src="images/2008Hall01_thumb.jpg" /></a></td>
<td><a href="images/2008Hall02.jpg" rel="lightbox[students]" title="2008 Exhibit Hall"><img src="images/2008Hall02_thumb.jpg" /></a></td>
</tr>
</table>
</ul>
<div class="SectionHeader"><div class="Full">
<h2>SIGCSE 2011 Supporters and Exhibitors</h2>
</div></div>
<table width="100%">
<tr>
<td align="center" valign="top" colspan="5"><h3>Platinum Plus Supporter</h3></td>
</tr>
<tr>
<td> </td>
<?php include("../parts/sponsor_microsoft.php"); ?>
<td> </td>
</tr>
<tr>
<td align="center" valign="top" colspan="5"><h3>Platinum Supporters</h3></td>
</tr>
<tr>
<td> </td>
<?php
$sponsors = array("../parts/sponsor_google.php", "../parts/sponsor_intel.php");
shuffle($sponsors);
$doEcho = true;
foreach ($sponsors as $sponsor) {
include($sponsor);
if ($doEcho) {
echo "<td> </td>";
$doEcho = false;
}
}
?>
<td> </td>
</tr>
<tr>
<td align="center" valign="top" colspan="5"><h3>Gold Supporters</h3></td>
</tr>
<tr>
<td> </td>
<?php
$sponsors = array("../parts/sponsor_amazon.php", "../parts/sponsor_ibm.php");
shuffle($sponsors);
$doEcho = true;
foreach ($sponsors as $sponsor) {
include($sponsor);
if ($doEcho) {
echo "<td> </td>";
$doEcho = false;
}
}
?>
<td> </td>
</tr>
</table>
<div class="SectionHeader"><div class="Full">
<h2>Exhibitors</h2>
</div></div>
<table><tr>
<td valign="top" align="left">
<ul>
<li>ACM SIGADA</li>
<li>ACM-W</li>
<li>Aldebaran Robotics</li>
<li>AlgoViz.org/ Ensemble Projects</li>
<li>Amazon Web Services</li>
<li>Auburn University</li>
<li>Broadening Participation in Computing</li>
<li>Council for International Exchange of Scholars</li>
<li>Course Technology Cengage Learning</li>
<li>CRC Press- Taylor & Francis Group LLC</li>
<li>Educational Alliance for a Parallel Future</li>
<li>Franklin, Beedle & Associated Incorporated</li>
<li>Google</li>
<li>IBM / Academic Initiative</li>
<li>Intel Corporation</li>
</ul>
</td>
<td valign="top" align="left">
<ul>
<li>Intersystems Corporation</li>
<li>Jones and Bartlett</li>
<li>Microsoft</li>
<li>Morgan Kaufmann</li>
<li>NSF</li>
<li>Pearson Higher Education</li>
<li>Research In Motion Corporation</li>
<li>Piazzza</li>
<li>RidgeSoft</li>
<li>Springer</li>
<li>The College Board</li>
<li>The MIT Press</li>
<li>Turingâs Craft</li>
<li>Wilberforce University</li>
<li>Wiley</li>
</ul>
</td></tr></table>
<div class="SectionHeader"><div class="Full">
<h2>In-Kind Donations</h2>
</div></div>
<table><tr>
<td valign="top" align="left"><ul>
<li>Microsoft - Computers and t-shirts for Kids Camp</li>
<li>Morgan Kaufman - Conference bags</li>
<li>Pearson - Lanyards</li>
<li>School of Computer Science, Carnegie Mellon University - Conference signage</li>
<li>Turing's Craft - Student Volunteer T-shirts</li>
<li>UPE - Pizza Party for student volunteers</li>
</ul></td>
<td valign="top" align="left">
</td>
</tr></table>
<div class="SectionHeader"><div class="Full">
<h2>Questions?</h2>
</div></div>
<p>Questions about supporting and exhibiting at SIGCSE 2011 can be
directed to the Exhibit Manager or our Supporter / Exhibitor Liaison.</p>
<h3>Supporter/Exhibitor Liaison</h3>
<p>Prof. Susan Rodger at Duke University is a long time attendee of SIGCSE and
was a Symposium Co-Chair for SIGCSE 2008.<br />
<br />
Email: [email protected]<br />
Phone: 919-660-6595<br />
</p>
<h3>Exhibit Manager</h3>
<p>
Dorothea Heck<br />
D. Lawrence Planners LLC<br />
SIGCSE Exhibition Management<br />
1125 Atlantic Avenue STE 634<br />
Atlantic City, NJ 08401<br />
tel. 609.344.1333 <br />
fax. 609.348.4433<br />
E-mail: <script>write_email( "SIGCSE", "dlplan.com" );</script>
</p>
<?php include("../parts/middle.php"); ?>
<h2>Have a question?</h2>
<p>Find the appropriate SIGCSE 2011
<a href="/sigcse2011/committee/">program committee member</a>
and send us an email.</p>
<?php
$updated = filemtime( $_SERVER["SCRIPT_FILENAME"] );
include("../parts/footer.php");
?>
\ No newline at end of file
|
mikehelmick/SIGCSE2011-Web-Site
|
7c8d24b8d58151937947df6f9330897117d02bd7
|
post the last date for online registration
|
diff --git a/attendees/registration.php b/attendees/registration.php
index 2d71841..3e917f1 100644
--- a/attendees/registration.php
+++ b/attendees/registration.php
@@ -1,60 +1,60 @@
<?php
$title = "SIGCSE 2011 - Registration";
$menu = "attendees";
include("../parts/top.php");
?>
-<div id="GoodMessage"><strong>Online registration is open!.</strong></div>
+<div id="GoodMessage"><strong>Online registration is open, and will remain open through Thursday, March 3.</strong></div>
<h1>SIGCSE 2011 Registration Gateway</h1>
<div class="SectionHeader"><div class="Full">
<h2>Registration</h2>
</div></div>
<br/>
<p>As with past SIGCSE symposia, we are offering attendees three registration options: On-line, off-line, and on-site. Early registration for SIGCSE members is just $235 for registrations made by January 31, 2011. Details about late registration and many other symposium activity fees are available from our Symposium Fees page.</p>
<p><b>Parents</b>: Interested in bringing your kids to SIGCSE? We will continue the tradition of "Kids' Camp" for fun and educational child care during SIGCSE.</p>
<p><strong>WIN A FREE UPGRADE</strong>: Every attendee that preregisters for SIGCSE 2011 at
the regular conference rate and <a href="accommodations.php">reserves a room at the Sheraton Dallas</a>
will be entered into a drawing to win a complimentary upgrade to a suite.
(Free upgrade drawing not available with exhibits-only, teacher or student
rates.)</p>
<div class="SectionHeader"><div class="Full">
<h2>Online and Offline (Remote) Registration</h2>
</div></div><br/>
<div class="errorExplanation">In order to register for two half-day <a href="pre_symposium_events.php">pre-symposium events</a> (Wednesday), you must select the combination of the two events that you wish to addend, rather then select the two events individually.</div>
<ul>
<li><a href="http://www.regonline.com/sigcse2011">Online Registration</a> via regonline.com</li>
<li>Register by Mail</li>
<ul>
<li><img src="/sigcse2011/images/page_white_acrobat.png" /><a href="/sigcse2011/downloads/RegistrationForm.pdf">Registration Form (PDF)</a></li>
<li><img src="/sigcse2011/images/page_white_word.png" /><a href="/sigcse2011/downloads/RegistrationForm.docx">Registration Form (Microsoft Word - docx format)</a></li>
</ul>
</ul>
<div class="SectionHeader"><div class="Full">
<h2>On-Site Registration</h2>
</div></div><br/>
<p>Onsite registration will be open the following times:
<ul><li>Wed - 3:00 PM - 9:30 PM</li>
<li>Thu - 7:30 AM - 4:00 PM</li>
<li>Fri - 7:30 AM - 5:00 PM</li>
<li>Sat - 8:00 AM - 12:15 PM and 2:30 PM - 3:00 PM</li>
</ul>
</p>
-
+<br/>
<?php include("../parts/middle.php"); ?>
<?php include("../parts/attendees_right.php"); ?>
<?php
$updated = filemtime( $_SERVER["SCRIPT_FILENAME"] );
include("../parts/footer.php");
?>
diff --git a/index.php b/index.php
index ab24210..f7c9379 100644
--- a/index.php
+++ b/index.php
@@ -1,89 +1,89 @@
<?php
$title = "SIGCSE 2011 - Home";
$menu = "home";
include("parts/top.php");
?>
-<div id="GoodMessage"><strong><a href="/sigcse2011/attendees/registration.php">Online registration is now open</a>!</strong></div>
+<div id="GoodMessage"><strong><a href="/sigcse2011/attendees/registration.php">Online registration is now open</a>! <em>Online registration is only through Thursday, March 3.</em></strong></div>
<div class="SectionHeader"><div class="Full">
<h2>Welcome to SIGCSE 2011</h2>
</div></div>
<p>SIGCSE 2011 continues our long tradition of bringing together colleagues from around the
world to present papers, panels, posters, special sessions, and workshops, and to discuss
computer science education in birds-of-a-feather sessions and informal settings at breaks
and meals. The SIGCSE Technical Symposium addresses problems common among educators working
to develop, implement and/or evaluate computing programs, curricula, and courses.
The symposium provides a forum for sharing new ideas for syllabi, laboratories,
and other elements of teaching and pedagogy, at all levels of instruction.</p>
<p>We encourage participation that addresses our theme, "reaching out". We need to reach out to colleagues in other fields, to develop interdisciplinary courses and research projects that integrate computer science and other fields, which enriches both. We need to reach out to create programs that attract and educate the next generation of computer scientists, especially currently underserved populations. We need to reach out to policy makers, educating them on the importance and promise of our discipline. Finally, we need to reach out to each other, as always sharing our best ideas and experiences with the SIGCSE community. We invite those interested in computer science education and computer science education research to contribute to SIGCSE 2011.</p>
<div class="SectionHeader"><div class="Full">
<h2>Our Venue : Sheraton Dallas Hotel</h2>
</div></div>
<p>All conference activities will be at the Sheraton hotel and its attached conference center. The Sheraton Dallas Hotel and conference center is located at 400 North Olive Street, Dallas, TX 75201. More information can be found on our <a href="/sigcse2011/attendees/accommodations.php">accommodations page</a>.</p>
<div class="SectionHeader"><div class="Full">
<h2>SIGCSE 2011 Supporters</h2>
</div></div>
<table width="100%">
<tr>
<td align="center" valign="top" colspan="5"><h3>Platinum Plus Supporter</h3></td>
</tr>
<tr>
<td> </td>
<?php include("parts/sponsor_microsoft.php"); ?>
<td> </td>
</tr>
<tr>
<td align="center" valign="top" colspan="5"><h3>Platinum Supporters</h3></td>
</tr>
<tr>
<td> </td>
<?php
$sponsors = array("parts/sponsor_google.php", "parts/sponsor_intel.php");
shuffle($sponsors);
$doEcho = true;
foreach ($sponsors as $sponsor) {
include($sponsor);
if ($doEcho) {
echo "<td> </td>";
$doEcho = false;
}
}
?>
<td> </td>
</tr>
<tr>
<td align="center" valign="top" colspan="5"><h3>Gold Supporters</h3></td>
</tr>
<tr>
<td> </td>
<?php
$sponsors = array("parts/sponsor_amazon.php", "parts/sponsor_ibm.php");
shuffle($sponsors);
$doEcho = true;
foreach ($sponsors as $sponsor) {
include($sponsor);
if ($doEcho) {
echo "<td> </td>";
$doEcho = false;
}
}
?>
<td> </td>
</tr>
</table>
<?php include("parts/middle.php"); ?>
<?php include("parts/main_right.php"); ?>
<?php
$updated = filemtime( $_SERVER["SCRIPT_FILENAME"] );
$mainPage = true;
include("parts/footer.php");
?>
\ No newline at end of file
diff --git a/parts/main_right.php b/parts/main_right.php
index 60f25a5..c4e95cd 100644
--- a/parts/main_right.php
+++ b/parts/main_right.php
@@ -1,14 +1,13 @@
<h2>News</h2>
<ul>
- <li>The special <a href="/sigcse2011/attendees/accommodations.php">SIGCSE rate for the Dallas Sheraton</a> is available through February 15.</li>
<li>The following workshops have been canceled: #25, #31, #32, #34.</li>
<li><a href="/sigcse2011/attendees/registration.php">Online registration is now open.</a></li>
<li>New event for 2011! <a href="http://elvis.rowan.edu/~kay/sigcse/rodeo.html">Robot Hoedown and Rodeo</a>. No experience necessary, but if you have robots and experience, <a href="http://elvis.rowan.edu/~kay/sigcse/cfw.html">we could use you as a wrangler</a>!</li>
</ul>
<h2>Connect</h2>
<ul>
<li>Twitter: <a href="http://twitter.com/sigcse2011">twitter.com/sigcse2011</a></li>
<li>Facebook: <a href="http://www.facebook.com/group.php?gid=373261951323">SIGCSE 2011 Group</a></li>
</ul>
|
mikehelmick/SIGCSE2011-Web-Site
|
f6c013eedeb8f5007e0a61b6c2cf0d95cabdaefc
|
add Aldebaran Robotics as exhibitor
|
diff --git a/exhibitors/index.php b/exhibitors/index.php
index 3a95508..1929de8 100644
--- a/exhibitors/index.php
+++ b/exhibitors/index.php
@@ -1,233 +1,234 @@
<?php
$title = "SIGCSE 2011 - Exhibitors and Supporters";
$menu = "exhibitors";
include("../parts/top.php");
?> <!-- <h2>Important Dates</h2> -->
<div class="GoodMessage">
<p>SIGCSE 2011 <a href="/sigcse2011/exhibitors/downloads/SIGCSE_EP11.pdf" target="_blank"> Invitation to Exhibit / Conference Support Opportunities (PDF)</a> |
<a href="http://docs.google.com/viewer?url=http%3A%2F%2Fwww.sigcse.org%2Fsigcse2011%2Fexhibitors%2Fdownloads%2FSIGCSE_EP11.pdf">View online with Google docs Viewer</a>
</p>
</div>
<div class="SectionHeader"><div class="Full">
<h2>Exhibitors and Supporters</h2>
</div></div>
<p>
The Association for Computing Machinery
(<a href="http://www.acm.org">ACM</a>)
Special Interest Group on Computer Science Education
(<a href="http://www.sigcse.org">SIGCSE</a>)
is a community of approximately 2,600 educators and students
possessing a passion for studying and improving the state
of computer science education at all levels.
The annual SIGCSE Technical Symposium is the flagship conference
of our organization, and is attended by approximately
1,300 people. Conference attendees travel from across the globe
to learn new educational techniques, to examine the latest
textbooks, to share ideas with colleagues, to talk with
computing professionals, and to acquire hands-on experience
with new hardware and software, including software development
environments, classroom presentation technologies, on-line
collaboration tools, and robotics.
</p>
<!--
<p>
The exhibit hall hours will be:
</p>
<table style="width: 35%;">
<tbody>
<tr>
<td> </td>
<td style="font-size: 1.0em"> Thursday, March 5th </td>
<td style="font-size: 1.0em"> 10 a.m. - 6 p.m. </td>
</tr>
<tr>
<td> </td>
<td style="font-size: 1.0em"> Friday, March 6th </td>
<td style="font-size: 1.0em"> 10 a.m. - 6 p.m. </td>
</tr>
<tr>
<td> </td>
<td style="font-size: 1.0em"> Saturday, March 7th </td>
<td style="font-size: 1.0em"> 9:30 a.m. - Noon </td>
</tr>
</tbody>
</table>
-->
<div class="SectionHeader"><div class="Full">
<h2>Are You Interested in Becoming a Supporter and/or Exhibitor?</h2>
</div></div>
<ul>
<li>The <a href="/sigcse2011/exhibitors/downloads/SIGCSE_EP11.pdf" target="_blank">SIGCSE 2011 Invitation to Exhibit / Conference Support Opportunities</a> document (PDF; opens in new window) provides details on how your organization can connect with our community. </li>
<li><a href="/sigcse2011/exhibitors/downloads/acm_sigcse_2011_floorplan.pdf">Download the SIGCSE 2011 exhibit hall plan</a> or <a href="http://docs.google.com/viewer?url=http%3A%2F%2Fwww.sigcse.org%2Fsigcse2011%2Fexhibitors%2Fdownloads%2Facm_sigcse_2011_floorplan.pdf">View with Google docs Viewer</a>.</li>
<li>Here are two views of the SIGCSE 2008 Exhibit Hall. The 2011 conference is in a different location, but we hope that these views will give you a sense of what the 2011 exhibition space will look like. (Click on each for a larger version.)</li>
<table border="0" align="center">
<tr>
<td><a href="images/2008Hall01.jpg" rel="lightbox[students]" title="2008 Exhibit Hall"><img src="images/2008Hall01_thumb.jpg" /></a></td>
<td><a href="images/2008Hall02.jpg" rel="lightbox[students]" title="2008 Exhibit Hall"><img src="images/2008Hall02_thumb.jpg" /></a></td>
</tr>
</table>
</ul>
<div class="SectionHeader"><div class="Full">
<h2>SIGCSE 2011 Supporters and Exhibitors</h2>
</div></div>
<table width="100%">
<tr>
<td align="center" valign="top" colspan="5"><h3>Platinum Plus Supporter</h3></td>
</tr>
<tr>
<td> </td>
<?php include("../parts/sponsor_microsoft.php"); ?>
<td> </td>
</tr>
<tr>
<td align="center" valign="top" colspan="5"><h3>Platinum Supporters</h3></td>
</tr>
<tr>
<td> </td>
<?php
$sponsors = array("../parts/sponsor_google.php", "../parts/sponsor_intel.php");
shuffle($sponsors);
$doEcho = true;
foreach ($sponsors as $sponsor) {
include($sponsor);
if ($doEcho) {
echo "<td> </td>";
$doEcho = false;
}
}
?>
<td> </td>
</tr>
<tr>
<td align="center" valign="top" colspan="5"><h3>Gold Supporters</h3></td>
</tr>
<tr>
<td> </td>
<?php
$sponsors = array("../parts/sponsor_amazon.php", "../parts/sponsor_ibm.php");
shuffle($sponsors);
$doEcho = true;
foreach ($sponsors as $sponsor) {
include($sponsor);
if ($doEcho) {
echo "<td> </td>";
$doEcho = false;
}
}
?>
<td> </td>
</tr>
</table>
<div class="SectionHeader"><div class="Full">
<h2>Exhibitors</h2>
</div></div>
<table><tr>
<td valign="top" align="left">
<ul>
<li>ACM SIGADA</li>
<li>ACM-W</li>
+ <li>Aldebaran Robotics</li>
<li>AlgoViz.org/ Ensemble Projects</li>
<li>Amazon Web Services</li>
<li>Auburn University</li>
<li>Broadening Participation in Computing</li>
<li>Council for International Exchange of Scholars</li>
<li>Course Technology Cengage Learning</li>
<li>CRC Press- Taylor & Francis Group LLC</li>
<li>Educational Alliance for a Parallel Future</li>
<li>Franklin, Beedle & Associated Incorporated</li>
<li>Google</li>
<li>IBM / Academic Initiative</li>
<li>Intel Corporation</li>
- <li>Intersystems Corporation</li>
</ul>
</td>
<td valign="top" align="left">
<ul>
+ <li>Intersystems Corporation</li>
<li>Jones and Bartlett</li>
<li>Microsoft</li>
<li>Morgan Kaufmann</li>
<li>NSF</li>
<li>Pearson Higher Education</li>
<li>Research In Motion Corporation</li>
<li>Piazzza</li>
<li>RidgeSoft</li>
<li>Springer</li>
<li>The College Board</li>
<li>The MIT Press</li>
<li>Turingâs Craft</li>
<li>Wiley</li>
</ul>
</td></tr></table>
<div class="SectionHeader"><div class="Full">
<h2>In-Kind Donations</h2>
</div></div>
<table><tr>
<td valign="top" align="left"><ul>
<li>Microsoft - Computers and t-shirts for Kids Camp</li>
<li>Morgan Kaufman - Conference bags</li>
<li>Pearson - Lanyards</li>
<li>School of Computer Science, Carnegie Mellon University - Conference signage</li>
<li>Turing's Craft - Student Volunteer T-shirts</li>
<li>UPE - Pizza Party for student volunteers</li>
</ul></td>
<td valign="top" align="left">
</td>
</tr></table>
<div class="SectionHeader"><div class="Full">
<h2>Questions?</h2>
</div></div>
<p>Questions about supporting and exhibiting at SIGCSE 2011 can be
directed to the Exhibit Manager or our Supporter / Exhibitor Liaison.</p>
<h3>Supporter/Exhibitor Liaison</h3>
<p>Prof. Susan Rodger at Duke University is a long time attendee of SIGCSE and
was a Symposium Co-Chair for SIGCSE 2008.<br />
<br />
Email: [email protected]<br />
Phone: 919-660-6595<br />
</p>
<h3>Exhibit Manager</h3>
<p>
Dorothea Heck<br />
D. Lawrence Planners LLC<br />
SIGCSE Exhibition Management<br />
1125 Atlantic Avenue STE 634<br />
Atlantic City, NJ 08401<br />
tel. 609.344.1333 <br />
fax. 609.348.4433<br />
E-mail: <script>write_email( "SIGCSE", "dlplan.com" );</script>
</p>
<?php include("../parts/middle.php"); ?>
<h2>Have a question?</h2>
<p>Find the appropriate SIGCSE 2011
<a href="/sigcse2011/committee/">program committee member</a>
and send us an email.</p>
<?php
$updated = filemtime( $_SERVER["SCRIPT_FILENAME"] );
include("../parts/footer.php");
?>
\ No newline at end of file
|
mikehelmick/SIGCSE2011-Web-Site
|
92e210d5735ebde5672cff4a16babb6649cb4b79
|
mark pokens as no longer available
|
diff --git a/attendees/pokens.php b/attendees/pokens.php
index f4ede46..5afae7c 100644
--- a/attendees/pokens.php
+++ b/attendees/pokens.php
@@ -1,37 +1,37 @@
<?php
$title = "SIGCSE 2011 - Pokens";
$menu = "attendees";
include("../parts/top.php");
?>
<br/>
<div class="errorExplanation">
-Friday, Feb 11 is the last day to order Pokens at our reduced rate.
+Pokens are no longer available through SIGCSE 2011. You can still <a href="http://www.google.com/search?sourceid=chrome&ie=UTF-8&q=poken#q=poken&um=1&ie=UTF-8&tbo=u&tbs=shop:1&source=og&sa=N&hl=en&tab=wf&biw=1237&bih=680&fp=cd7d50a1d6257d3">buy your own Poken before the conference</a>.
</div>
<div class="SectionHeader" style="clear:left;"><div class="Full">
<h2>Pokens: A new way to connect at SIGCSE 2011</h2>
</div></div>
<p><img src="/sigcse2011/images/poken.jpg" width="200" align="left" class="headshot" />
Pokens are the latest in electronic "social business cards", and we'll
have them available at SIGCSE 2011! If you have a poken and meet someone
else with a poken, simply hold the palms on the pokens together and you're
connected! You can configure them to share whatever information you'd
like... it's fully customizable so you can decide how much information you
want to share about yourself. You can connect to people you meet at SIGCSE
2011 on social networks without having to search for them, and so much
more.<br/> <br/>
For SIGCSE 2011, all of our exhibitors will have pokens, so get one of
your own so you can connect easily with them as well as other attendees.
You can order a poken when you pre-register for SIGCSE 2011, at a special
discounted price of $15 per poken. (Styles will vary based on
availability.)<br/> <br/>
To find out more about pokens, visit <a href="http://www.poken.com/">http://www.poken.com/</a>
<br/> <br/>
The special discounted price of $15 per poken is available through
February 1, 2011 (the preregistration deadline).</p>
<?php include("../parts/middle.php"); ?>
<?php include("../parts/attendees_right.php"); ?>
<?php
$updated = filemtime( $_SERVER["SCRIPT_FILENAME"] );
include("../parts/footer.php");
?>
diff --git a/parts/main_right.php b/parts/main_right.php
index 6985cba..60f25a5 100644
--- a/parts/main_right.php
+++ b/parts/main_right.php
@@ -1,15 +1,14 @@
<h2>News</h2>
<ul>
- <li>Friday, Feb 11 is the last day to <a href="/sigcse2011/attendees/pokens.php">order Pokens</a> at our reduced rate.</li>
<li>The special <a href="/sigcse2011/attendees/accommodations.php">SIGCSE rate for the Dallas Sheraton</a> is available through February 15.</li>
<li>The following workshops have been canceled: #25, #31, #32, #34.</li>
<li><a href="/sigcse2011/attendees/registration.php">Online registration is now open.</a></li>
<li>New event for 2011! <a href="http://elvis.rowan.edu/~kay/sigcse/rodeo.html">Robot Hoedown and Rodeo</a>. No experience necessary, but if you have robots and experience, <a href="http://elvis.rowan.edu/~kay/sigcse/cfw.html">we could use you as a wrangler</a>!</li>
</ul>
<h2>Connect</h2>
<ul>
<li>Twitter: <a href="http://twitter.com/sigcse2011">twitter.com/sigcse2011</a></li>
<li>Facebook: <a href="http://www.facebook.com/group.php?gid=373261951323">SIGCSE 2011 Group</a></li>
</ul>
|
mikehelmick/SIGCSE2011-Web-Site
|
54f833cfbb8f48e35477e30fb0063d4b987ccc0a
|
add k-12 teacher highlights
|
diff --git a/attendees/index.php b/attendees/index.php
index 7116013..21e47f0 100644
--- a/attendees/index.php
+++ b/attendees/index.php
@@ -1,65 +1,66 @@
<?php
$title = "SIGCSE 2011 - Information for Symposium Attendees";
$menu = "attendees";
$submenu = "cfp";
include("../parts/top.php");
?> <!-- <h2>Important Dates</h2> -->
<div class="SectionHeader" style="clear:left;"><div class="Full">
<h2>Information for SIGCSE 2011 Symposium Attendees</h2>
</div></div>
<p><strong>All conference activities will be at the Sheraton hotel and its attached conference center.</strong> The Sheraton Dallas Hotel and conference center is located at 400 North Olive Street, Dallas, TX 75201. More information can be found on our <a href="/sigcse2011/attendees/accommodations.php">accommodations page</a>.</p>
<table cellspacing="5px" width="100%">
<tr>
<td valign="top" align="left">
<ul>
<li><a href="http://db.grinnell.edu/sigcse/sigcse2011/Program/Program.asp"><img src="/sigcse2011/images/report.png" align="absmiddle" /> Symposium Program</a></li>
<li><a href="/sigcse2011/attendees/keynotes.php"><img src="/sigcse2011/images/user_suit.png" align="absmiddle" /> Keynote Speakers</a></li>
<li><a href="/sigcse2011/attendees/supporter_sessions.php"><img src="/sigcse2011/images/building.png" align="absmiddle"/> Supporter Sessions</a></li>
<li><a href="/sigcse2011/attendees/pre_symposium_events.php"><img src="/sigcse2011/images/calendar.png" align="absmiddle"/> Pre-Symposium Events</a></li>
<li><a href="/sigcse2011/attendees/nsf_showcase.php"><img src="/sigcse2011/images/images.png" align="absmiddle"/> NSF Showcase</a></li>
<li><a href="/sigcse2011/attendees/video_program.php"><img src="/sigcse2011/images/television.png" align="absmiddle"/> Video Program</a></li>
<li><a href="http://elvis.rowan.edu/~kay/sigcse/rodeo.html"><img src="/sigcse2011/images/bricks.png" align="absmiddle"/> SIGCSE 2011 Robot Hoedown and Rodeo</a> <strong>New for 2011!</strong>
<ul><li><a href="http://elvis.rowan.edu/~kay/sigcse/cfw.html">Call for Wranglers</a></li></ul>
</li>
+ <li><a href="/sigcse2011/attendees/k12_highlights.php"><img src="/sigcse2011/images/house.png" align="absmiddle"/> Highlights for K-12 Teachers</a></li>
<li><a href="/sigcse2011/attendees/student_research.php"><img src="/sigcse2011/images/award_star_gold_3.png" align="absmiddle"/> Student Research Competition</a></li>
<li><a href="/sigcse2011/attendees/registration.php"><img src="/sigcse2011/images/vcard_add.png" align="absmiddle"/> Registration</a> <strong>NOW OPEN!</strong>
<ul><li><a href="/sigcse2011/attendees/fees.php"><img src="/sigcse2011/images/money.png" align="absmiddle"/> A Sneak Peak at Fees</a></li></ul>
</li>
<li><a href="/sigcse2011/attendees/pokens.php"><img src="/sigcse2011/images/vcard.png" align="absmiddle"> Pokens: A new way to connect at SIGCSE 2011</a></li>
<li><a href="/sigcse2011/attendees/travel_information.php"><img src="/sigcse2011/images/tag_orange.png" align="absmiddle"/> Travel Information</a></li>
<li><a href="/sigcse2011/attendees/accommodations.php"><img src="/sigcse2011/images/clock.png" align="absmiddle"/> Accommodations</a></li>
<li><a href="http://www.visitdallas.com/WelcomeSIGCSE2011" target="_blank"><img src="/sigcse2011/images/weather_sun.png" align="absmiddle"/> Local Attractions</a> (<em>opens in new window</em>)</li>
<li><a href="/sigcse2011/attendees/kids_camp.php"><img src="/sigcse2011/images/group.png" align="absmiddle"/> Kids Camp</a></li>
<li><a href="/sigcse2011/attendees/visas.php"><img src="/sigcse2011/images/folder_database.png" align="absmiddle"/> Visa Information</a></li>
<li><a href="/sigcse2011/attendees/floor_plans.php"><img src="/sigcse2011/images/map.png" align="absmiddle"/> Floor Plans</a></li>
<li><a href="/sigcse2011/faq/#attendees"><img src="/sigcse2011/images/help.png" align="absmiddle" /> FAQ</a></li>
<!--
<li><a href="/sigcse2011/attendees/reception.php"><img src="/sigcse2011/images/cake.png" align="absmiddle"/> Reception</a></li>
<li><a href="/sigcse2011/attendees/special_projects.php"><img src="/sigcse2011/images/bricks.png" align="absmiddle"/> SIGCSE Special Projects</a></li>
<li><a href="/sigcse2011/attendees/video_program.php"><img src="/sigcse2011/images/television.png" align="absmiddle"/> Video Program</a></li>
<li><a href="/sigcse2011/attendees/k12_highlights.php"><img src="/sigcse2011/images/house.png" align="absmiddle"/> Highlights for K-12 Teachers</a></li>
-->
</ul>
</td>
<td nowrap="nowrap" valign="top" align="right">
<!--
<div style='width: 500px; height: 440px; background-image: url( http://vortex.accuweather.com/adcbin/netweather_v2/backgrounds/fall4_500x440_bg.jpg ); background-repeat: no-repeat; background-color: #DA9375;' ><div id='NetweatherContainer' style='height: 420px;' ><script src='http://netweather.accuweather.com/adcbin/netweather_v2/netweatherV2ex.asp?partner=netweather&tStyle=normal&logo=1&zipcode=75202&lang=eng&size=13&theme=fall4&metric=0&target=_self'></script></div><div style='text-align: center; font-family: arial, helvetica, verdana, sans-serif; font-size: 12px; line-height: 20px; color: #0000FF;' ><a style='color: #0000FF' href='http://www.accuweather.com/us/TX/DALLAS/75202/city-weather-forecast.asp?partner=accuweather&traveler=0' >Weather Forecast</a>Â |Â <a style='color: #0000FF' href='http://www.accuweather.com/maps-satellite.asp' >Weather Maps</a>Â |Â <a style='color: #0000FF' href='http://www.accuweather.com/index-radar.asp?partner=accuweather&traveler=0&zipcode=75202' >Weather Radar</a>Â |Â <a style='color: #0000FF' href='http://hurricane.accuweather.com/hurricane/index.asp' >Hurricane Center</a></div></div>
-->
</td>
</tr>
</table>
<?php include("../parts/middle.php"); ?>
<?php include("../parts/attendees_right.php"); ?>
<?php
$updated = filemtime( $_SERVER["SCRIPT_FILENAME"] );
include("../parts/footer.php");
?>
\ No newline at end of file
diff --git a/attendees/k12_highlights.php b/attendees/k12_highlights.php
new file mode 100644
index 0000000..7338fd2
--- /dev/null
+++ b/attendees/k12_highlights.php
@@ -0,0 +1,74 @@
+<?php
+ $title = "SIGCSE 2011 - Highlights for K-12 Teachers";
+ $menu = "attendees";
+ include("../parts/top.php");
+?>
+<br/>
+<div class="SectionHeader" style="clear:left;"><div class="Full">
+<h2>Highlights for K-12 Teachers</h2>
+</div></div>
+<p>Calling all High School teachers! SIGCSE 2011 is being held in Dallas on March 9 â 12, and has a great program that will appeal to K - 12 teachers. Listed below are sessions that may be of particular interest to you:</p>
+
+<div class="SectionHeader" style="clear:left;"><div class="Full">
+<h3>Thursday, March 10, 2011</h3>
+</div></div>
+<ul>
+<li><em>Paper Session:</em> <a href="http://db.grinnell.edu/sigcse/sigcse2011/Program/viewAcceptedSession.asp?sessionID=215">Learning Objects and Modules</a> (10:45 â 12:00)</li>
+<li><em>Microsoft Session:</em> <a href="/sigcse2011/attendees/supporter_sessions.php#microsoft">F# - From Foundations to Modern Parallel and Data Rich Functional Programming</a> (10:45 â 12:00)</li>
+<li><em>Special Session:</em> <a href="https://docs.google.com/viewer?url=http://db.grinnell.edu/sigcse/sigcse2011/Program/viewAcceptedProposal.pdf%3FsessionType%3DspecialSession%26sessionNumber%3D14">The CS10K Project: Mobilizing the Community to Transform High School Computing</a> (1:45 to 3:00)</li>
+<li><em>Paper Session:</em> <a href="http://db.grinnell.edu/sigcse/sigcse2011/Program/viewAcceptedSession.asp?sessionID=233">Teaching Programming: Non-Traditional Approaches</a> (1:45 to 3:00)</li>
+<li><em>Paper Session:</em> <a href="http://db.grinnell.edu/sigcse/sigcse2011/Program/viewAcceptedSession.asp?sessionID=235">Algorithms</a> (1:45 to 3:00)</li>
+<li><em>Panel Session:</em> <a href="https://docs.google.com/viewer?url=http://db.grinnell.edu/sigcse/sigcse2011/Program/viewAcceptedProposal.pdf%3FsessionType%3Dpanel%26sessionNumber%3D8">Successful K-12 Outreach Strategies</a> (3:45 to 5:00)</li>
+<li><em>Panel Session:</em> <a href="https://docs.google.com/viewer?url=http://db.grinnell.edu/sigcse/sigcse2011/Program/viewAcceptedProposal.pdf%3FsessionType%3Dpanel%26sessionNumber%3D10">Setting the Stage for Computing Curricula 2013: Computer Science the ACM/IEEE-CS Joint Task Force</a> (3:45 to 5:00)</li>
+<li><em>Paper Session:</em> <a href="http://db.grinnell.edu/sigcse/sigcse2011/Program/viewAcceptedSession.asp?sessionID=255">Peer Teaching and Tutoring</a> (3:45 to 5:00)</li>
+<li><em>Birds of a Feather Sessions:</em> <a href="http://db.grinnell.edu/sigcse/sigcse2011/Program/viewAcceptedDayTime.asp?timeID=217101800">Flock I</a> (5:10 to 6:00) and <a href="http://db.grinnell.edu/sigcse/sigcse2011/Program/viewAcceptedDayTime.asp?timeID=218101900">Flock II</a> (6:10 to 7:00) </li>
+</ul>
+
+<div class="SectionHeader" style="clear:left;"><div class="Full">
+<h3>Friday, March 11, 2011</h3>
+</div></div>
+<p><em>This is the official High School Teachers' Day</em></p>
+
+<ul>
+<li><em>Special Session:</em> <a href="https://docs.google.com/viewer?url=http://db.grinnell.edu/sigcse/sigcse2011/Program/viewAcceptedProposal.pdf%3FsessionType%3DspecialSession%26sessionNumber%3D17">NCATE Standards for Preparation of Secondary Computer Science Teachers</a> (10:45 to 12:00)</li>
+<li><em>Paper Session:</em> <a href="http://db.grinnell.edu/sigcse/sigcse2011/Program/viewAcceptedSession.asp?sessionID=323">Computational Thinking</a> (10:45 to 12:00)</li>
+<li><em>Paper Session:</em> <a href="http://db.grinnell.edu/sigcse/sigcse2011/Program/viewAcceptedSession.asp?sessionID=324">Discrete Mathematics</a> (10:45 to 12:00)</li>
+<li><em>Paper Session:</em> <a href="http://db.grinnell.edu/sigcse/sigcse2011/Program/viewAcceptedSession.asp?sessionID=326">CS 1: Tools</a> (10:45 to 12:00)</li>
+<li><em>Special Event:</em> Alice Tea Party (12:50 to 1:30)</li>
+<li><em>Panel Session:</em> <a href="https://docs.google.com/viewer?url=http://db.grinnell.edu/sigcse/sigcse2011/Program/viewAcceptedProposal.pdf%3FsessionType%3Dpanel%26sessionNumber%3D16">Teaching Tips We Wish They'd Told Us Before We Started, Small College Class Edition</a> (1:45 to 3:00)</li>
+<li><em>Paper Session:</em> <a herf="http://db.grinnell.edu/sigcse/sigcse2011/Program/viewAcceptedSession.asp?sessionID=343">Computing in the Arts and Sciences</a> (1:45 to 3:00)</li>
+<li><em>Paper Session:</em> <a href="http://db.grinnell.edu/sigcse/sigcse2011/Program/viewAcceptedSession.asp?sessionID=344">Data Structures / CS2</a> (1:45 to 3:00)</li>
+<li><em>Supporter Session:</em> <a href="/sigcse2011/attendees/supporter_sessions.php#google">Google Education Initiatives in 2011</a> (1:45 to 3:00)</li>
+<li><em>Special Session:</em> <a href="https://docs.google.com/viewer?url=http://db.grinnell.edu/sigcse/sigcse2011/Program/viewAcceptedProposal.pdf%3FsessionType%3DspecialSession%26sessionNumber%3D11">CS Principles: Piloting a New Course at a National Scale</a> (3:45 to 5:00)</li>
+<li><em>Paper Session:</em> <a href="http://db.grinnell.edu/sigcse/sigcse2011/Program/viewAcceptedSession.asp?sessionID=363">Relevant Computing</a> (3:45 to 5:00)</li>
+<li><em>Paper Session:</em> <a href="http://db.grinnell.edu/sigcse/sigcse2011/Program/viewAcceptedSession.asp?sessionID=365">K-12 Instruction</a> (3:45 to 5:00)</li>
+<li><em>Paper Session:</em> <a href="http://db.grinnell.edu/sigcse/sigcse2011/Program/viewAcceptedSession.asp?sessionID=366">Web Based Tools</a> (3:45 to 5:00)</li>
+<li><em>Supporter Session:</em> <a href="/sigcse2011/attendees/supporter_sessions.php#microsoft">Microsoft - Microsoft .NET Gadgeteer: A New Way To Create Electronic Devices</a> (3:45 to 5:00)</li>
+<li><em>Supporter Session:</em> <a href="/sigcse2011/attendees/supporter_sessions.php#google">Google - Talk in Depth with Representatives from Googleâs Education Programs</a> (3:45 to 5:00)</li>
+</ul>
+
+<div class="SectionHeader" style="clear:left;"><div class="Full">
+<h3>Saturday, March 12, 2011</h3>
+</div></div>
+
+<ul>
+<li><em>Ancillary Event:</em> Greenfoot Breakfast Club (7:00 to 8:15)</li>
+<li><em>Panel Session:</em> <a href="https://docs.google.com/viewer?url=http://db.grinnell.edu/sigcse/sigcse2011/Program/viewAcceptedProposal.pdf%3FsessionType%3Dpanel%26sessionNumber%3D7">Scratching the Subject Surface: Infusing Computing into the K12 Curriculum</a> (8:30 to 9:45)</li>
+<li><em>Special Session:</em> <a href="https://docs.google.com/viewer?url=http://db.grinnell.edu/sigcse/sigcse2011/Program/viewAcceptedProposal.pdf%3FsessionType%3DspecialSession%26sessionNumber%3D23">Nifty Assignments</a> (8:30 to 9:45)</li>
+<li><em>Paper Session:</em> <a href="http://db.grinnell.edu/sigcse/sigcse2011/Program/viewAcceptedSession.asp?sessionID=410">Teaching and Studying Novice Programmers</a> (8:30 to 10:10)</li>
+<li><em>Paper Session:</em> <a href="http://db.grinnell.edu/sigcse/sigcse2011/Program/viewAcceptedSession.asp?sessionID=412">Teacher Endorsement and Preparation</a> (8:30 to 10:10)</li>
+<li><em>Paper Session:</em> <a href="http://db.grinnell.edu/sigcse/sigcse2011/Program/viewAcceptedSession.asp?sessionID=413">Expanding the Community</a> (8:30 to 10:10)</li>
+<li><em>Paper Session:</em> <a href="http://db.grinnell.edu/sigcse/sigcse2011/Program/viewAcceptedSession.asp?sessionID=414">Mobile Computing</a> (8:30 to 10:10)</li>
+<li><em>Panel Session:</em> <a href="https://docs.google.com/viewer?url=http://db.grinnell.edu/sigcse/sigcse2011/Program/viewAcceptedProposal.pdf%3FsessionType%3Dpanel%26sessionNumber%3D14">Rediscovering the Passion, Beauty, Joy, and Awe: Making Computing Fun Again, Part 4</a> (10:55 to 12:10)</li>
+<li><em>Special Session:</em> <a href="https://docs.google.com/viewer?url=http://db.grinnell.edu/sigcse/sigcse2011/Program/viewAcceptedProposal.pdf%3FsessionType%3DspecialSession%26sessionNumber%3D13">Progress in Surfacing Computer Science for STEM</a> (10:55 to 12:10)</li>
+<li><em>Paper Session:</em> <a href="http://db.grinnell.edu/sigcse/sigcse2011/Program/viewAcceptedSession.asp?sessionID=444">Intro CS: Panoptic Views</a> (10:55 to 12:10)</li>
+<li><em>Paper Session:</em> <a href="http://db.grinnell.edu/sigcse/sigcse2011/Program/viewAcceptedSession.asp?sessionID=446">Cooperative Learning</a> (10:55 to 12:10)</li>
+</ul>
+
+
+<?php include("../parts/middle.php"); ?>
+<?php include("../parts/attendees_right.php"); ?>
+<?php
+ $updated = filemtime( $_SERVER["SCRIPT_FILENAME"] );
+ include("../parts/footer.php");
+ ?>
diff --git a/parts/attendees_right.php b/parts/attendees_right.php
index 3c46b60..f6ecd35 100644
--- a/parts/attendees_right.php
+++ b/parts/attendees_right.php
@@ -1,32 +1,33 @@
<ul>
<li><a href="http://db.grinnell.edu/sigcse/sigcse2011/Program/Program.asp"><img src="/sigcse2011/images/report.png" align="absmiddle" /> Symposium Program</a></li>
<li><a href="/sigcse2011/attendees/keynotes.php"><img src="/sigcse2011/images/user_suit.png" align="absmiddle" /> Keynote Speakers</a></li>
<li><a href="/sigcse2011/attendees/supporter_sessions.php"><img src="/sigcse2011/images/building.png" align="absmiddle"/> Supporter Sessions</a></li>
<li><a href="/sigcse2011/attendees/pre_symposium_events.php"><img src="/sigcse2011/images/calendar.png" align="absmiddle"/> Pre-Symposium Events</a></li>
<li><a href="/sigcse2011/attendees/nsf_showcase.php"><img src="/sigcse2011/images/images.png" align="absmiddle"/> NSF Showcase</a></li>
<li><a href="/sigcse2011/attendees/video_program.php"><img src="/sigcse2011/images/television.png" align="absmiddle"/> Video Program</a></li>
<li><a href="http://elvis.rowan.edu/~kay/sigcse/rodeo.html"><img src="/sigcse2011/images/bricks.png" align="absmiddle"/> SIGCSE 2011 Robot Hoedown and Rodeo</a> <strong>New!</strong>
<ul><li><a href="http://elvis.rowan.edu/~kay/sigcse/cfw.html">Call for Wranglers</a></li></ul>
</li>
+ <li><a href="/sigcse2011/attendees/k12_highlights.php"><img src="/sigcse2011/images/house.png" align="absmiddle"/> Highlights for K-12 Teachers</a></li>
<li><a href="/sigcse2011/attendees/student_research.php"><img src="/sigcse2011/images/award_star_gold_3.png" align="absmiddle"/> Student Research Competition</a></li>
<li><a href="/sigcse2011/attendees/registration.php"><img src="/sigcse2011/images/vcard_add.png" align="absmiddle"/> Registration</a>
<ul><li><a href="/sigcse2011/attendees/fees.php"><img src="/sigcse2011/images/money.png" align="absmiddle"/> A Sneak Peak at Fees</a></li></ul>
</li>
<li><a href="/sigcse2011/attendees/pokens.php"><img src="/sigcse2011/images/vcard.png" align="absmiddle"> Pokens: A new way to connect at SIGCSE 2011</a></li>
<li><a href="/sigcse2011/attendees/travel_information.php"><img src="/sigcse2011/images/tag_orange.png" align="absmiddle"/> Travel Information</a></li>
<li><a href="/sigcse2011/attendees/accommodations.php"><img src="/sigcse2011/images/clock.png" align="absmiddle"/> Accommodations</a></li>
<li><a href="http://www.visitdallas.com/WelcomeSIGCSE2011" target="_blank"><img src="/sigcse2011/images/weather_sun.png" align="absmiddle"/> Local Attractions</a></li>
<li><a href="/sigcse2011/attendees/kids_camp.php"><img src="/sigcse2011/images/group.png" align="absmiddle"/> Kids Camp</a></li>
<li><a href="/sigcse2011/attendees/visas.php"><img src="/sigcse2011/images/folder_database.png" align="absmiddle"/> Visa Information</a></li>
<li><a href="/sigcse2011/attendees/floor_plans.php"><img src="/sigcse2011/images/map.png" align="absmiddle"/> Floor Plans</a></li>
<li><a href="/sigcse2011/faq/#attendees"><img src="/sigcse2011/images/help.png" align="absmiddle" /> FAQ</a></li>
<!--
<li><a href="/sigcse2011/attendees/reception.php"><img src="/sigcse2011/images/cake.png" align="absmiddle"/> Reception</a></li>
<li><a href="/sigcse2011/attendees/supporter_sessions.php"><img src="/sigcse2011/images/building.png" align="absmiddle"/> Supporter Sessions</a></li>
<li><a href="/sigcse2011/attendees/special_projects.php"><img src="/sigcse2011/images/bricks.png" align="absmiddle"/> SIGCSE Special Projects</a></li>
<li><a href="/sigcse2011/attendees/video_program.php"><img src="/sigcse2011/images/television.png" align="absmiddle"/> Video Program</a></li>
<li><a href="/sigcse2011/attendees/k12_highlights.php"><img src="/sigcse2011/images/house.png" align="absmiddle"/> Highlights for K-12 Teachers</a></li>
<li><a href="/sigcse2011/attendees/kids_camp.php"><img src="/sigcse2011/images/group.png" align="absmiddle"/> Kids Camp</a></li>
-->
</ul>
\ No newline at end of file
|
mikehelmick/SIGCSE2011-Web-Site
|
9a913a9f05b795e281e671eb8086e1524c96c515
|
added student research competition entries
|
diff --git a/attendees/index.php b/attendees/index.php
index 120aa38..7116013 100644
--- a/attendees/index.php
+++ b/attendees/index.php
@@ -1,64 +1,65 @@
<?php
$title = "SIGCSE 2011 - Information for Symposium Attendees";
$menu = "attendees";
$submenu = "cfp";
include("../parts/top.php");
?> <!-- <h2>Important Dates</h2> -->
<div class="SectionHeader" style="clear:left;"><div class="Full">
<h2>Information for SIGCSE 2011 Symposium Attendees</h2>
</div></div>
<p><strong>All conference activities will be at the Sheraton hotel and its attached conference center.</strong> The Sheraton Dallas Hotel and conference center is located at 400 North Olive Street, Dallas, TX 75201. More information can be found on our <a href="/sigcse2011/attendees/accommodations.php">accommodations page</a>.</p>
<table cellspacing="5px" width="100%">
<tr>
<td valign="top" align="left">
<ul>
<li><a href="http://db.grinnell.edu/sigcse/sigcse2011/Program/Program.asp"><img src="/sigcse2011/images/report.png" align="absmiddle" /> Symposium Program</a></li>
<li><a href="/sigcse2011/attendees/keynotes.php"><img src="/sigcse2011/images/user_suit.png" align="absmiddle" /> Keynote Speakers</a></li>
<li><a href="/sigcse2011/attendees/supporter_sessions.php"><img src="/sigcse2011/images/building.png" align="absmiddle"/> Supporter Sessions</a></li>
<li><a href="/sigcse2011/attendees/pre_symposium_events.php"><img src="/sigcse2011/images/calendar.png" align="absmiddle"/> Pre-Symposium Events</a></li>
<li><a href="/sigcse2011/attendees/nsf_showcase.php"><img src="/sigcse2011/images/images.png" align="absmiddle"/> NSF Showcase</a></li>
<li><a href="/sigcse2011/attendees/video_program.php"><img src="/sigcse2011/images/television.png" align="absmiddle"/> Video Program</a></li>
<li><a href="http://elvis.rowan.edu/~kay/sigcse/rodeo.html"><img src="/sigcse2011/images/bricks.png" align="absmiddle"/> SIGCSE 2011 Robot Hoedown and Rodeo</a> <strong>New for 2011!</strong>
<ul><li><a href="http://elvis.rowan.edu/~kay/sigcse/cfw.html">Call for Wranglers</a></li></ul>
</li>
+ <li><a href="/sigcse2011/attendees/student_research.php"><img src="/sigcse2011/images/award_star_gold_3.png" align="absmiddle"/> Student Research Competition</a></li>
<li><a href="/sigcse2011/attendees/registration.php"><img src="/sigcse2011/images/vcard_add.png" align="absmiddle"/> Registration</a> <strong>NOW OPEN!</strong>
<ul><li><a href="/sigcse2011/attendees/fees.php"><img src="/sigcse2011/images/money.png" align="absmiddle"/> A Sneak Peak at Fees</a></li></ul>
</li>
<li><a href="/sigcse2011/attendees/pokens.php"><img src="/sigcse2011/images/vcard.png" align="absmiddle"> Pokens: A new way to connect at SIGCSE 2011</a></li>
<li><a href="/sigcse2011/attendees/travel_information.php"><img src="/sigcse2011/images/tag_orange.png" align="absmiddle"/> Travel Information</a></li>
<li><a href="/sigcse2011/attendees/accommodations.php"><img src="/sigcse2011/images/clock.png" align="absmiddle"/> Accommodations</a></li>
<li><a href="http://www.visitdallas.com/WelcomeSIGCSE2011" target="_blank"><img src="/sigcse2011/images/weather_sun.png" align="absmiddle"/> Local Attractions</a> (<em>opens in new window</em>)</li>
<li><a href="/sigcse2011/attendees/kids_camp.php"><img src="/sigcse2011/images/group.png" align="absmiddle"/> Kids Camp</a></li>
<li><a href="/sigcse2011/attendees/visas.php"><img src="/sigcse2011/images/folder_database.png" align="absmiddle"/> Visa Information</a></li>
<li><a href="/sigcse2011/attendees/floor_plans.php"><img src="/sigcse2011/images/map.png" align="absmiddle"/> Floor Plans</a></li>
<li><a href="/sigcse2011/faq/#attendees"><img src="/sigcse2011/images/help.png" align="absmiddle" /> FAQ</a></li>
<!--
<li><a href="/sigcse2011/attendees/reception.php"><img src="/sigcse2011/images/cake.png" align="absmiddle"/> Reception</a></li>
<li><a href="/sigcse2011/attendees/special_projects.php"><img src="/sigcse2011/images/bricks.png" align="absmiddle"/> SIGCSE Special Projects</a></li>
<li><a href="/sigcse2011/attendees/video_program.php"><img src="/sigcse2011/images/television.png" align="absmiddle"/> Video Program</a></li>
<li><a href="/sigcse2011/attendees/k12_highlights.php"><img src="/sigcse2011/images/house.png" align="absmiddle"/> Highlights for K-12 Teachers</a></li>
-->
</ul>
</td>
<td nowrap="nowrap" valign="top" align="right">
<!--
<div style='width: 500px; height: 440px; background-image: url( http://vortex.accuweather.com/adcbin/netweather_v2/backgrounds/fall4_500x440_bg.jpg ); background-repeat: no-repeat; background-color: #DA9375;' ><div id='NetweatherContainer' style='height: 420px;' ><script src='http://netweather.accuweather.com/adcbin/netweather_v2/netweatherV2ex.asp?partner=netweather&tStyle=normal&logo=1&zipcode=75202&lang=eng&size=13&theme=fall4&metric=0&target=_self'></script></div><div style='text-align: center; font-family: arial, helvetica, verdana, sans-serif; font-size: 12px; line-height: 20px; color: #0000FF;' ><a style='color: #0000FF' href='http://www.accuweather.com/us/TX/DALLAS/75202/city-weather-forecast.asp?partner=accuweather&traveler=0' >Weather Forecast</a>Â |Â <a style='color: #0000FF' href='http://www.accuweather.com/maps-satellite.asp' >Weather Maps</a>Â |Â <a style='color: #0000FF' href='http://www.accuweather.com/index-radar.asp?partner=accuweather&traveler=0&zipcode=75202' >Weather Radar</a>Â |Â <a style='color: #0000FF' href='http://hurricane.accuweather.com/hurricane/index.asp' >Hurricane Center</a></div></div>
-->
</td>
</tr>
</table>
<?php include("../parts/middle.php"); ?>
<?php include("../parts/attendees_right.php"); ?>
<?php
$updated = filemtime( $_SERVER["SCRIPT_FILENAME"] );
include("../parts/footer.php");
?>
\ No newline at end of file
diff --git a/attendees/student_research.php b/attendees/student_research.php
new file mode 100644
index 0000000..1d28884
--- /dev/null
+++ b/attendees/student_research.php
@@ -0,0 +1,37 @@
+<?php
+ $title = "SIGCSE 2011 - Student Research Competition";
+ $menu = "attendees";
+ include("../parts/top.php");
+?>
+<div class="SectionHeader" style="clear:left;"><div class="Full">
+<h2>Student Research Competition</h2>
+</div></div>
+
+<div class="SectionHeader" style="clear:left;"><div class="Full">
+<h3>SIGCSE 2011 Student Research Competition - Graduate Entries</h3>
+</div></div>
+<ul><li><em>Automatic Semantics Discovery for Adaptive Web-based Educational Courses</em> Marian Simko, Slovak University of Technology</li>
+<li><em>Augmenting Educational Tools through Conversion to Games</em> Acey Boyce, University of North Carolina at Charlotte</li>
+<li><em>Adaptive Peer-Review in Computer Science Education</em> I-Han Hsiao, University of Pittsburgh</li>
+</ul>
+
+<div class="SectionHeader" style="clear:left;"><div class="Full">
+<h3>SIGCSE 2011 Student Research Competition - Undergraduate Entries</h3>
+</div></div>
+<ul>
+<li><em>Hiding In Images</em> Justin Babey, Central Connecticut State University</li>
+<li><em>Investigating Computational Methods for Evaluating Putative Substrate Conformations in Cytochrome P450s</em> Zachary Zappala, The College of New Jersey</li>
+<li><em>TheCave: Using GPUs and Classical Philosophy to Data-Mine Images</em> Charles Stolper, Furman University</li>
+<li><em>A Computational Clustering Approach to Studying Metagenomics</em> Shanti Bramhacharya, Hiram College</li>
+<li><em>Looking for Novel Subgroups in Mammography Data using a Modified Distance Metric for Clustering</em> Elizabeth Ellis, Hiram College</li>
+<li><em>Metaphor: A Declarative Approach to Computational Art</em> Shrutarshi Basu, Lafayette College</li>
+<li><em>Implementing Ruppertâs Algorithm for Generic Curves in 2D</em> Matthew Flatau, Southwestern University</li>
+<li><em>Dance Tool: Creation of a New Culturally Situated Educational Game</em> Shaun Pickford, University of</li> North Carolina at Charlotte
+</ul>
+
+<?php include("../parts/middle.php"); ?>
+<?php include("../parts/attendees_right.php"); ?>
+<?php
+ $updated = filemtime( $_SERVER["SCRIPT_FILENAME"] );
+ include("../parts/footer.php");
+ ?>
diff --git a/parts/attendees_right.php b/parts/attendees_right.php
index 0e29526..3c46b60 100644
--- a/parts/attendees_right.php
+++ b/parts/attendees_right.php
@@ -1,31 +1,32 @@
<ul>
<li><a href="http://db.grinnell.edu/sigcse/sigcse2011/Program/Program.asp"><img src="/sigcse2011/images/report.png" align="absmiddle" /> Symposium Program</a></li>
<li><a href="/sigcse2011/attendees/keynotes.php"><img src="/sigcse2011/images/user_suit.png" align="absmiddle" /> Keynote Speakers</a></li>
<li><a href="/sigcse2011/attendees/supporter_sessions.php"><img src="/sigcse2011/images/building.png" align="absmiddle"/> Supporter Sessions</a></li>
<li><a href="/sigcse2011/attendees/pre_symposium_events.php"><img src="/sigcse2011/images/calendar.png" align="absmiddle"/> Pre-Symposium Events</a></li>
<li><a href="/sigcse2011/attendees/nsf_showcase.php"><img src="/sigcse2011/images/images.png" align="absmiddle"/> NSF Showcase</a></li>
<li><a href="/sigcse2011/attendees/video_program.php"><img src="/sigcse2011/images/television.png" align="absmiddle"/> Video Program</a></li>
<li><a href="http://elvis.rowan.edu/~kay/sigcse/rodeo.html"><img src="/sigcse2011/images/bricks.png" align="absmiddle"/> SIGCSE 2011 Robot Hoedown and Rodeo</a> <strong>New!</strong>
<ul><li><a href="http://elvis.rowan.edu/~kay/sigcse/cfw.html">Call for Wranglers</a></li></ul>
</li>
+ <li><a href="/sigcse2011/attendees/student_research.php"><img src="/sigcse2011/images/award_star_gold_3.png" align="absmiddle"/> Student Research Competition</a></li>
<li><a href="/sigcse2011/attendees/registration.php"><img src="/sigcse2011/images/vcard_add.png" align="absmiddle"/> Registration</a>
<ul><li><a href="/sigcse2011/attendees/fees.php"><img src="/sigcse2011/images/money.png" align="absmiddle"/> A Sneak Peak at Fees</a></li></ul>
</li>
<li><a href="/sigcse2011/attendees/pokens.php"><img src="/sigcse2011/images/vcard.png" align="absmiddle"> Pokens: A new way to connect at SIGCSE 2011</a></li>
<li><a href="/sigcse2011/attendees/travel_information.php"><img src="/sigcse2011/images/tag_orange.png" align="absmiddle"/> Travel Information</a></li>
<li><a href="/sigcse2011/attendees/accommodations.php"><img src="/sigcse2011/images/clock.png" align="absmiddle"/> Accommodations</a></li>
<li><a href="http://www.visitdallas.com/WelcomeSIGCSE2011" target="_blank"><img src="/sigcse2011/images/weather_sun.png" align="absmiddle"/> Local Attractions</a></li>
<li><a href="/sigcse2011/attendees/kids_camp.php"><img src="/sigcse2011/images/group.png" align="absmiddle"/> Kids Camp</a></li>
<li><a href="/sigcse2011/attendees/visas.php"><img src="/sigcse2011/images/folder_database.png" align="absmiddle"/> Visa Information</a></li>
<li><a href="/sigcse2011/attendees/floor_plans.php"><img src="/sigcse2011/images/map.png" align="absmiddle"/> Floor Plans</a></li>
<li><a href="/sigcse2011/faq/#attendees"><img src="/sigcse2011/images/help.png" align="absmiddle" /> FAQ</a></li>
<!--
<li><a href="/sigcse2011/attendees/reception.php"><img src="/sigcse2011/images/cake.png" align="absmiddle"/> Reception</a></li>
<li><a href="/sigcse2011/attendees/supporter_sessions.php"><img src="/sigcse2011/images/building.png" align="absmiddle"/> Supporter Sessions</a></li>
<li><a href="/sigcse2011/attendees/special_projects.php"><img src="/sigcse2011/images/bricks.png" align="absmiddle"/> SIGCSE Special Projects</a></li>
<li><a href="/sigcse2011/attendees/video_program.php"><img src="/sigcse2011/images/television.png" align="absmiddle"/> Video Program</a></li>
<li><a href="/sigcse2011/attendees/k12_highlights.php"><img src="/sigcse2011/images/house.png" align="absmiddle"/> Highlights for K-12 Teachers</a></li>
<li><a href="/sigcse2011/attendees/kids_camp.php"><img src="/sigcse2011/images/group.png" align="absmiddle"/> Kids Camp</a></li>
-->
</ul>
\ No newline at end of file
|
mikehelmick/SIGCSE2011-Web-Site
|
5202003792262acdf3daf10c90509b19219bfe96
|
add photos to students page
|
diff --git a/students/images/IMG_5695.JPG b/students/images/IMG_5695.JPG
new file mode 100644
index 0000000..cf1766a
Binary files /dev/null and b/students/images/IMG_5695.JPG differ
diff --git a/students/images/IMG_5695_thumb.jpg b/students/images/IMG_5695_thumb.jpg
new file mode 100644
index 0000000..b985430
Binary files /dev/null and b/students/images/IMG_5695_thumb.jpg differ
diff --git a/students/images/IMG_5767.JPG b/students/images/IMG_5767.JPG
new file mode 100644
index 0000000..65e5f6e
Binary files /dev/null and b/students/images/IMG_5767.JPG differ
diff --git a/students/images/IMG_5767_thumb.jpg b/students/images/IMG_5767_thumb.jpg
new file mode 100644
index 0000000..47b15da
Binary files /dev/null and b/students/images/IMG_5767_thumb.jpg differ
diff --git a/students/images/IMG_5782.JPG b/students/images/IMG_5782.JPG
new file mode 100644
index 0000000..ab0cdcd
Binary files /dev/null and b/students/images/IMG_5782.JPG differ
diff --git a/students/images/IMG_5782_thumb.jpg b/students/images/IMG_5782_thumb.jpg
new file mode 100644
index 0000000..d2ec58d
Binary files /dev/null and b/students/images/IMG_5782_thumb.jpg differ
diff --git a/students/images/IMG_5864.JPG b/students/images/IMG_5864.JPG
new file mode 100644
index 0000000..a143b06
Binary files /dev/null and b/students/images/IMG_5864.JPG differ
diff --git a/students/images/IMG_5864_thumb.jpg b/students/images/IMG_5864_thumb.jpg
new file mode 100644
index 0000000..a016e0e
Binary files /dev/null and b/students/images/IMG_5864_thumb.jpg differ
diff --git a/students/images/sigcse020.jpg b/students/images/sigcse020.jpg
new file mode 100644
index 0000000..b97ff38
Binary files /dev/null and b/students/images/sigcse020.jpg differ
diff --git a/students/images/sigcse020_thumb.jpg b/students/images/sigcse020_thumb.jpg
new file mode 100644
index 0000000..bc03536
Binary files /dev/null and b/students/images/sigcse020_thumb.jpg differ
diff --git a/students/images/sigcse027.jpg b/students/images/sigcse027.jpg
new file mode 100644
index 0000000..26b7261
Binary files /dev/null and b/students/images/sigcse027.jpg differ
diff --git a/students/images/sigcse027_thumb.jpg b/students/images/sigcse027_thumb.jpg
new file mode 100644
index 0000000..78ad475
Binary files /dev/null and b/students/images/sigcse027_thumb.jpg differ
diff --git a/students/images/sigcse033.jpg b/students/images/sigcse033.jpg
new file mode 100644
index 0000000..9e09c0f
Binary files /dev/null and b/students/images/sigcse033.jpg differ
diff --git a/students/images/sigcse033_thumb.jpg b/students/images/sigcse033_thumb.jpg
new file mode 100644
index 0000000..38fe39f
Binary files /dev/null and b/students/images/sigcse033_thumb.jpg differ
diff --git a/students/index.php b/students/index.php
index cb4a5fd..19b432b 100644
--- a/students/index.php
+++ b/students/index.php
@@ -1,21 +1,41 @@
<?php
$title = "SIGCSE 2011 - Information for Students";
$menu = "students";
$submenu = "cfp";
include("../parts/top.php");
?> <!-- <h2>Important Dates</h2> -->
<h1>How can students get involved?</h1>
<p>We're glad you asked - students can get involved in several ways:
<ul>
<li><img src="/sigcse2011/images/chart_curve.png" align="absmiddle" /><a href="/sigcse2011/students/research.php">Student Research Competition</a></li>
<li>Of course, students can also become <a href="/sigcse2011/authors/">authors</a> or regular <a href="/sigcse2011/attendees/">conference attendees</a> (at a reduced registration rate).</li>
<li><img src="/sigcse2011/images/vcard_add.png" align="absmiddle" /><a href="/sigcse2011/students/volunteer.php">Volunteer at SIGCSE</a></li>
</ul>
+<p>Students at SIGCSE 2008</p>
+<table border="0" align="center">
+<tr>
+ <td><a href="images/IMG_5695.JPG" rel="lightbox[students]" title="Students having FUN at SIGCSE 2008"><img src="images/IMG_5695_thumb.jpg" /></a></td>
+ <td><a href="images/IMG_5767.JPG" rel="lightbox[students]" title="Students having FUN at SIGCSE 2008"><img src="images/IMG_5767_thumb.jpg" /></a></td>
+ <td><a href="images/IMG_5782.JPG" rel="lightbox[students]" title="Students having FUN at SIGCSE 2008"><img src="images/IMG_5782_thumb.jpg" /></a></td>
+ <td><a href="images/IMG_5864.JPG" rel="lightbox[students]" title="Students having FUN at SIGCSE 2008"><img src="images/IMG_5864_thumb.jpg" /></a></td>
+</tr>
+</table>
+
+<p>Students at SIGCSE 2007</p>
+
+<table border="0" align="center">
+<tr>
+ <td><a href="images/sigcse020.jpg" rel="lightbox[students]" title="Students having FUN at SIGCSE 2007"><img src="images/sigcse020_thumb.jpg" /></a></td>
+ <td><a href="images/sigcse027.jpg" rel="lightbox[students]" title="Students having FUN at SIGCSE 2007"><img src="images/sigcse027_thumb.jpg" /></a></td>
+ <td><a href="images/sigcse033.jpg" rel="lightbox[students]" title="Students having FUN at SIGCSE 2007"><img src="images/sigcse033_thumb.jpg" /></a></td>
+</tr>
+</table>
+
<?php include("../parts/middle.php"); ?>
<?php include("../parts/students_right.php"); ?>
<?php
$updated = filemtime( $_SERVER["SCRIPT_FILENAME"] );
include("../parts/footer.php");
?>
\ No newline at end of file
|
mikehelmick/SIGCSE2011-Web-Site
|
585ad55d6d863846db8f6f6def70b17282333828
|
mark program by design as full
|
diff --git a/attendees/pre_symposium_events.php b/attendees/pre_symposium_events.php
index 71f3e93..082ac5c 100644
--- a/attendees/pre_symposium_events.php
+++ b/attendees/pre_symposium_events.php
@@ -1,210 +1,212 @@
<?php
$title = "SIGCSE 2011 - Pre-Symposium Events";
$menu = "attendees";
include("../parts/top.php");
?>
<h1>SIGCSE 2011 Pre-Symposium Events</h1>
<div class="SectionHeader"><div class="Full">
<h2><a name="csta">CSTA Source Web Repository Cataloging Workshop</a></h2>
</div></div>
<img src="/sigcse2011/images/clock.png" align="absmiddle" />Wednesday, March 9, 2011, 8:00am to 3:00pm.
<p>Chris Stephenson, CSTA Executive Director</p>
<p>Participants will learn how to appropriately review and classify resources submitted for entry in to the
Source Web Repository.</p>
<p>Contact: Christina San Filippo <script>write_email("sanfilippo", "hq.acm.org");</script></p>
<div class="SectionHeader"><div class="Full">
<h2><a name="department_chairs">Department Chairs' Pre-Symposium Workshop</a></h2>
</div></div>
<img src="/sigcse2011/images/clock.png" align="absmiddle" />Wednesday, March 9, 2011, TBA
<p>The Pre-Symposium Workshop for Department Chairs is an opportunity for all department chairs (experienced and inexperienced) to improve their understanding of their duties and their ability to perform them. Participants should also include those interested in becoming department chairs. Four experienced former department chairs will serve as resources for the group as the participants review and discuss the duties of the department chair and explore ways that chairs can do their jobs efficiently and effectively. Some specific discussion topics will include leadership styles, time management, legal issues, academic program assessment, and faculty promotion and tenure.
</p>
<div class="SectionHeader"><div class="Full">
<h2><a name="hawaii">Hawaii - Project companion for cloud-enabled mobile computing courses</a></h2>
</div></div>
<img src="/sigcse2011/images/clock.png" align="absmiddle" />Wednesday, March 9, 2011, 1:00pm - 5:00pm
<p>Microsoft Research's Project Hawaii is an academic outreach and research dissemination project.
The academic goal of Hawaii is to enable graduate and undergraduate university students to gain
understanding and expertise in developing cloud-enabled mobile applications using the Microsoft Mobile
and Cloud infrastructure. Project Hawaii is a collection of cloud services, hosted in Windows Azure;
a Visual Studio 2010 based development SDK and sample application code; a community forum for
exchange of ideas; and, mobile platform hardware (Windows Phone 7). Project Hawaii started in Spring
2010 when it was offered as a pilot project in USC, Duke and Wisconsin-Madison. In Fall 2010 Project
Hawaii was offered in MSU, CMU, Michigan, Maryland, Arkansas, UCSB and Singapore Management U.
Its third offering would be in Spring 2011 in more than 15 schools internationally. Prominent among the
Spring 2011 schools are Stanford, UCSB, Purdue, University College London; to name a few.</p>
<p>In this session Project Hawaii team will provide an overview of the project, with an emphasis on its use
as a project companion for teaching mobile and cloud computing courses. Instructors who have been
associated with Project Hawaii will be invited to talk about their experiences using Hawaii as a course
companion for teaching cloud-enabled mobile computing courses to graduate and undergraduate
computer science and engineering students. Demonstrations of projects by students using Hawaii will be
featured in the demo session.</p>
<div class="SectionHeader"><div class="Full">
<h2><a name="innovativeApproaches">Innovative approaches to introducing Computer Science</a></h2>
</div></div>
<img src="/sigcse2011/images/clock.png" align="absmiddle" />Wednesday, March 9, 2011, 11:00am - 5:30pm
<p>This pre-conference workshop will bring together faculty to discuss
innovative approaches to introducing computer science using novel problem
domains. The innovation may be primarily through pedagogy. For example,
an instructor may use problem-based learning to build a course around
real, domain-specific problems and the techniques necessary to solve
them, rather than addressing a list of topics. Alternatively, a novel
approach may address a new context such as the modeling and analysis of
social networks. The workshop will address approaches that seek to change
the culture and practice of computer science by addressing the pipeline
at its early stages, specifically in introductory college courses in
computer science, mathematics, statistics, and the social and natural
sciences.</p>
<p>More information at <a href="http://harambeenet.org/sigcse11">http://harambeenet.org/sigcse11</a></p>
<p>Organizers and affiliations:
<ul>
<li>Jeff Forbes, Duke University - <script>write_email("jforbes", "duke.edu");</script></li>
<li>Owen Astrachan, Duke University - <script>write_email("ola", "cs.duke.edu");</script></li>
</ul>
</p>
<div class="SectionHeader"><div class="Full">
<h2><a name="womenFaculty">Managing the Academic Career for Women Faculty in Undergraduate Computing Programs</a></h2>
</div></div>
<img src="/sigcse2011/images/clock.png" align="absmiddle" />Wednesday, March 9, 2011, 8:00am - 5:30pm
<p>Women in Computer Science and Engineering (CSE) face particular challenges in pursuing and
maintaining academic careers at primarily undergraduate academic institutions. Women academicians
in CSE typically have few female colleagues to provide critical information about the culture and content
required for successful academic careers. To help this situation, the Computing Research Association
Committee on the Status of Women in Computing Research (CRA-W) will sponsor a career/mentoring
workshop titled "Managing the Academic Career for Women Faculty in Undergraduate Computing
Programs". The day-long workshop, to be held on Wednesday, March 9, will be co-located with the
SIGCSE 2011 conference in Dallas. The goal of the workshop is to provide critical mentoring information
for women at all career levels in undergraduate teaching. The target audiences of the workshop are
pre-tenure faculty and graduate students in Computer Science and Engineering who are interested in an
academic career, as well as post-tenure (senior) faculty seeking to improve their teaching and mentoring
skills.</p>
<p>More information at <a href="http://cra-w.org/ArticleDetails/tabid/77/ArticleID/75/Default.aspx">http://cra-w.org/ArticleDetails/tabid/77/ArticleID/75/Default.aspx</a></p>
<p>
<ul>
<li>Susan Rodger, Duke University - <script>write_email("rodger", "cs.duke.edu");</script></li>
<li>Sheila Castaneda, Clarke University - <script>write_email("Sheila.Castaneda", "clarke.edu");</script></li>
</ul>
</p>
<div class="SectionHeader"><div class="Full">
<h2><a name="new_faculty">New Educators Roundtable</a></h2>
</div></div>
<img src="/sigcse2011/images/clock.png" align="absmiddle" />Wednesday, March 9, 2011, 12:30 - 5:00pm
<p><em>When registering, this event is available as a single choice or as a combo with another half-day event.</em></p>
<p>New to teaching? Seeking advice and mentorship? Join us at the New Educators Roundtable (NER), a half-day workshop designed to mentor college and university faculty who are new to teaching. We welcome participants from across the entire teaching spectrum: tenure-track faculty at institutions where teaching is central, teaching-track faculty and lecturers, and graduate students who currently teach or are looking forward to an academic career. Come with your questions and concerns, learn from the experiences and best practices of sage elders, and build an international support group for your career.</p>
<p>More information at <a href="http://dave-reed.com/NER">http://dave-reed.com/NER</a></p>
<p><ul>
<li>Julie Zelenski, Stanford University</li>
<li>David Reed, Creighton University</li>
</ul></p>
<div class="SectionHeader"><div class="Full">
<h2><a name="sigcas">Open meeting of the Special Interest Group on Computers and Society (SIGCAS)</a></h2>
</div></div>
<img src="/sigcse2011/images/clock.png" align="absmiddle" />Wednesday, March 9, 2011, 8:00am - 12:00pm
<p><em>When registering, this event is available as a single choice or as a combo with another half-day event.</em></p>
<p>This open meeting of ACM's Special Interest Group on Computers and Society (SIGCAS) is
an opportunity for SIGCAS members and supporters to provide input into the future direction
of the SIG. Particular attention will be paid to issues of interest to SIGCAS members who are
primarily computer science educators.</p>
<p>Organizers and affiliations: SIGCAS, Florence Appel, Saint Xavier University</p>
<div class="SectionHeader"><div class="Full">
<h2><a name="programByDesign">Program by Design: Bootstrap, TeachScheme, ReachJava, and Beyond</a></h2>
</div></div>
+<div class="errorExplanation">This event is full.</div>
+
<img src="/sigcse2011/images/clock.png" align="absmiddle" />Wednesday, March 9, 2011, 8:00am to 5:30pm
<p>More information at <a href="http://www.programbydesign.org/events/sigcse2011">http://www.programbydesign.org/events/sigcse2011</a></p>
<p>Want to create excitement without sacrificing principles or losing a
clear connection to mainstream CS? Check out Program by Design, which
is what TeachScheme! has grown up to become. See how you can program
animations, the Web, and mobile phone apps from week 1; learn about
the smooth transition to Java; and acquaint yourself with the
middle-school component, used in inner-city after-school programs
nationwide. This one-day workshop gives a detailed overview of the
high-school/college curriculum, including the path to Java. A
late-afternoon session includes demos of different assignments,
discussion of the middle-school program, and a chance to interact with
current users of the curriculum.</p>
<p>Contact: Viera Proulx, <script>write_email("vkp", "ccs.neu.edu");</script></p>
<div class="SectionHeader"><div class="Full">
<h2><a name="alice2.2">Programming with Alice Workshop (Alice 2.2)</a></h2>
</div></div>
<img src="/sigcse2011/images/clock.png" align="absmiddle" />Wednesday, March 9, 2011, 8:00am - 5:30pm
<p>This workshop is intended for teachers who have little or no experience in teaching with Alice. The workshop will provide hands-on experience with learning to use Alice 2.2 and in learning to teach with Alice. Alice 2.2 is a powerful program visualization environment where students are engaged in building virtual worlds to create animations and simple games. Instructional materials, software, and a complimentary copy of the 3rd edition of the text, <em>Learning to Program with Alice</em>, will be provided to each participant.</p>
<p>More information at <a href="http://www.andrew.cmu.edu/user/wpdann/workshops.html">http://www.andrew.cmu.edu/user/wpdann/workshops.html</a></p>
<p>Contact: Wanda Dann, Carnegie-Mellon University<br/>
<script>write_email("wpdann", "andrew.cmu.edu");</script>
<div class="SectionHeader"><div class="Full">
<h2><a name="alice3">Programming with Alice Workshop (Alice 3)</a></h2>
</div></div>
<img src="/sigcse2011/images/clock.png" align="absmiddle" />Wednesday, March 9, 2011, 8:00am - 5:30pm
<p>This workshop is designed for instructors of CS1/AP who are interested in providing a gentle introduction to programming concepts in Alice 3 integral with mediating the transfer of these concepts into Java. The workshop will introduce Alice 3 and a plugin for transitioning from Alice to Java. Alice 3 builds on Alice 2's powerful program visualization technique, enabling students to "see" objects and work with object-oriented programming. Participants will learn how to use Alice 3 to build virtual worlds and how to use this approach in CS1 courses (introductory programming for majors and non-majors and AP CS).</p>
<p>More information at <a href="http://www.andrew.cmu.edu/user/wpdann/workshops.html">http://www.andrew.cmu.edu/user/wpdann/workshops.html</a></p>
<p>Contact: Wanda Dann, Carnegie-Mellon University<br/>
<script>write_email("wpdann", "andrew.cmu.edu");</script>
<div class="SectionHeader"><div class="Full">
<h2><a name="ethics">Teaching Professional Ethics in Computer Science: Tips and Traps</a></h2>
</div></div>
<p><em>When registering, this event is available as a single choice or as a combo with another half-day event.</em></p>
<img src="/sigcse2011/images/clock.png" align="absmiddle" />Wednesday, March 9, 2011, 1:15pm to 5:30pm
<p>In support of ACM's Commitment to Ethical Professionalism this event is designed to help interested faculty provide students with tools to better understand and resolve the ethical challenges in their professional lives we will present well developed examples and modules which can be used to engage students in the study of applied ethics. We will present materials to be used in a complete computer ethics course and that can be used as examples and exercises in specific technical courses; including case studies, suggested course syllabi, and suggestions for creating and grading assignments.</p>
<p>More information at <a href="https://edocs.uis.edu/kmill2/www/sigcse2011computerEthics.html">https://edocs.uis.edu/kmill2/www/sigcse2011computerEthics.html</a></p>
<p>Organizers and affiliations:
<ul>
<li>Bo Brinkman, Miami University (Ohio)</li>
<li>Don Gotterbarn, East Tennessee State University - <script>write_email("don", "gotterbarn.com");</script></li>
<li>Keith Miller, University of Illinois Springfield</li>
</ul>
<div class="SectionHeader"><div class="Full">
<h2><a name="hfoss">The 3rd Annual Humanitarian FOSS Symposium 2011</a></h2>
</div></div>
<img src="/sigcse2011/images/clock.png" align="absmiddle" />Wednesday, March 9, 2011, 8:30am - 6:00pm
<p>The Third annual HFOSS Education Symposium (<a href="http://www.hfoss.org/hfoss2011">HFOSS 2011</a>), held as a SIGCSE 2011 pre-conference activity (March 9th 2011, Dallas, Texas), aims to bring together educators,
software developers, industry representatives, and students to continue the discussion of how best to
promote HFOSS within undergraduate computing education. Humanitarian FOSS is free and open source
software that contributes in some way to the public good. This year's symposium focuses on applying
HFOSS within the local community -- i.e., in local government, in K-12 education, and in collaboration
with local non-profit organizations. This years keynote speaker is Bryan Sivak, Chief Technology Officer
for the District of Columbia, founding member and advisory board member of Civic Commons. As in
previous years, the symposium will be highly interactive, taking place entirely in plenary sessions. In
addition to the keynote address by Bryan Sivak, the symposium will include a poster session, and panels
on government, K-12 education, and non-profits, made up of invited speakers and participants from
industry, academia, and the non-profit sector.</p>
<p>For more information and registration visit <a href="http://www.hfoss.org/hfoss2011">http://www.hfoss.org/hfoss2011</a></p>
<p>Organizers and affiliations:
<ul>
<li>Ralph Morelli (chair), Trinity College</li>
<li>Trishan de Lanerolle, Trinity College</li>
<li>Danny Krizanc, Wesleyan University</li>
<li>Norman Danner, Wesleyan University</li>
<li>Gary Parker, Connecticut College</li>
<li>Ozgur Izmirli, Connecticut College</li>
<li>Carlos Espinosa, Trinity College</li>
<li>Allen Tucker, Bowdoin College </li>
</ul>
</p>
<br/>
<?php include("../parts/middle.php"); ?>
<?php include("../parts/attendees_right.php"); ?>
<?php
$updated = filemtime( $_SERVER["SCRIPT_FILENAME"] );
include("../parts/footer.php");
?>
|
mikehelmick/SIGCSE2011-Web-Site
|
c1caf6ddd2ee6986c64ce60755b8d71e8e3d5132
|
add online registration times
|
diff --git a/attendees/registration.php b/attendees/registration.php
index 2021a43..2d71841 100644
--- a/attendees/registration.php
+++ b/attendees/registration.php
@@ -1,55 +1,60 @@
<?php
$title = "SIGCSE 2011 - Registration";
$menu = "attendees";
include("../parts/top.php");
?>
-<div id="GoodMessage"><strong>Registration is now open!. Early registration ends January 31, 2011.</strong></div>
+<div id="GoodMessage"><strong>Online registration is open!.</strong></div>
<h1>SIGCSE 2011 Registration Gateway</h1>
<div class="SectionHeader"><div class="Full">
<h2>Registration</h2>
</div></div>
<br/>
<p>As with past SIGCSE symposia, we are offering attendees three registration options: On-line, off-line, and on-site. Early registration for SIGCSE members is just $235 for registrations made by January 31, 2011. Details about late registration and many other symposium activity fees are available from our Symposium Fees page.</p>
<p><b>Parents</b>: Interested in bringing your kids to SIGCSE? We will continue the tradition of "Kids' Camp" for fun and educational child care during SIGCSE.</p>
<p><strong>WIN A FREE UPGRADE</strong>: Every attendee that preregisters for SIGCSE 2011 at
the regular conference rate and <a href="accommodations.php">reserves a room at the Sheraton Dallas</a>
will be entered into a drawing to win a complimentary upgrade to a suite.
(Free upgrade drawing not available with exhibits-only, teacher or student
rates.)</p>
<div class="SectionHeader"><div class="Full">
<h2>Online and Offline (Remote) Registration</h2>
</div></div><br/>
<div class="errorExplanation">In order to register for two half-day <a href="pre_symposium_events.php">pre-symposium events</a> (Wednesday), you must select the combination of the two events that you wish to addend, rather then select the two events individually.</div>
<ul>
<li><a href="http://www.regonline.com/sigcse2011">Online Registration</a> via regonline.com</li>
<li>Register by Mail</li>
<ul>
<li><img src="/sigcse2011/images/page_white_acrobat.png" /><a href="/sigcse2011/downloads/RegistrationForm.pdf">Registration Form (PDF)</a></li>
<li><img src="/sigcse2011/images/page_white_word.png" /><a href="/sigcse2011/downloads/RegistrationForm.docx">Registration Form (Microsoft Word - docx format)</a></li>
</ul>
</ul>
<div class="SectionHeader"><div class="Full">
<h2>On-Site Registration</h2>
</div></div><br/>
-<div class="errorExplanation">On-site registration times will be available before the symposium begins.</div>
-
+<p>Onsite registration will be open the following times:
+<ul><li>Wed - 3:00 PM - 9:30 PM</li>
+<li>Thu - 7:30 AM - 4:00 PM</li>
+<li>Fri - 7:30 AM - 5:00 PM</li>
+<li>Sat - 8:00 AM - 12:15 PM and 2:30 PM - 3:00 PM</li>
+</ul>
+</p>
<?php include("../parts/middle.php"); ?>
<?php include("../parts/attendees_right.php"); ?>
<?php
$updated = filemtime( $_SERVER["SCRIPT_FILENAME"] );
include("../parts/footer.php");
?>
diff --git a/index.php b/index.php
index 80d596f..ab24210 100644
--- a/index.php
+++ b/index.php
@@ -1,89 +1,89 @@
<?php
$title = "SIGCSE 2011 - Home";
$menu = "home";
include("parts/top.php");
?>
-<div id="GoodMessage">Dec 6, 2010: <strong><a href="/sigcse2011/attendees/registration.php">Registration is now open</a>!</strong> Early registration ends January 31, 2011.</div>
+<div id="GoodMessage"><strong><a href="/sigcse2011/attendees/registration.php">Online registration is now open</a>!</strong></div>
<div class="SectionHeader"><div class="Full">
<h2>Welcome to SIGCSE 2011</h2>
</div></div>
<p>SIGCSE 2011 continues our long tradition of bringing together colleagues from around the
world to present papers, panels, posters, special sessions, and workshops, and to discuss
computer science education in birds-of-a-feather sessions and informal settings at breaks
and meals. The SIGCSE Technical Symposium addresses problems common among educators working
to develop, implement and/or evaluate computing programs, curricula, and courses.
The symposium provides a forum for sharing new ideas for syllabi, laboratories,
and other elements of teaching and pedagogy, at all levels of instruction.</p>
<p>We encourage participation that addresses our theme, "reaching out". We need to reach out to colleagues in other fields, to develop interdisciplinary courses and research projects that integrate computer science and other fields, which enriches both. We need to reach out to create programs that attract and educate the next generation of computer scientists, especially currently underserved populations. We need to reach out to policy makers, educating them on the importance and promise of our discipline. Finally, we need to reach out to each other, as always sharing our best ideas and experiences with the SIGCSE community. We invite those interested in computer science education and computer science education research to contribute to SIGCSE 2011.</p>
<div class="SectionHeader"><div class="Full">
<h2>Our Venue : Sheraton Dallas Hotel</h2>
</div></div>
<p>All conference activities will be at the Sheraton hotel and its attached conference center. The Sheraton Dallas Hotel and conference center is located at 400 North Olive Street, Dallas, TX 75201. More information can be found on our <a href="/sigcse2011/attendees/accommodations.php">accommodations page</a>.</p>
<div class="SectionHeader"><div class="Full">
<h2>SIGCSE 2011 Supporters</h2>
</div></div>
<table width="100%">
<tr>
<td align="center" valign="top" colspan="5"><h3>Platinum Plus Supporter</h3></td>
</tr>
<tr>
<td> </td>
<?php include("parts/sponsor_microsoft.php"); ?>
<td> </td>
</tr>
<tr>
<td align="center" valign="top" colspan="5"><h3>Platinum Supporters</h3></td>
</tr>
<tr>
<td> </td>
<?php
$sponsors = array("parts/sponsor_google.php", "parts/sponsor_intel.php");
shuffle($sponsors);
$doEcho = true;
foreach ($sponsors as $sponsor) {
include($sponsor);
if ($doEcho) {
echo "<td> </td>";
$doEcho = false;
}
}
?>
<td> </td>
</tr>
<tr>
<td align="center" valign="top" colspan="5"><h3>Gold Supporters</h3></td>
</tr>
<tr>
<td> </td>
<?php
$sponsors = array("parts/sponsor_amazon.php", "parts/sponsor_ibm.php");
shuffle($sponsors);
$doEcho = true;
foreach ($sponsors as $sponsor) {
include($sponsor);
if ($doEcho) {
echo "<td> </td>";
$doEcho = false;
}
}
?>
<td> </td>
</tr>
</table>
<?php include("parts/middle.php"); ?>
<?php include("parts/main_right.php"); ?>
<?php
$updated = filemtime( $_SERVER["SCRIPT_FILENAME"] );
$mainPage = true;
include("parts/footer.php");
?>
\ No newline at end of file
|
mikehelmick/SIGCSE2011-Web-Site
|
66381b0135544b84cfd02f81ee79ff63458aa75e
|
resize image, match other photos
|
diff --git a/images/committee/Jian_Zhiang.JPG b/images/committee/Jian_Zhiang.JPG
index 5742a6f..705f1fd 100644
Binary files a/images/committee/Jian_Zhiang.JPG and b/images/committee/Jian_Zhiang.JPG differ
|
mikehelmick/SIGCSE2011-Web-Site
|
1daaa0852b579c8df9c78c1c18b5e394c9c69b62
|
add NSF showcase page
|
diff --git a/attendees/index.php b/attendees/index.php
index f122f3a..120aa38 100644
--- a/attendees/index.php
+++ b/attendees/index.php
@@ -1,63 +1,64 @@
<?php
$title = "SIGCSE 2011 - Information for Symposium Attendees";
$menu = "attendees";
$submenu = "cfp";
include("../parts/top.php");
?> <!-- <h2>Important Dates</h2> -->
<div class="SectionHeader" style="clear:left;"><div class="Full">
<h2>Information for SIGCSE 2011 Symposium Attendees</h2>
</div></div>
<p><strong>All conference activities will be at the Sheraton hotel and its attached conference center.</strong> The Sheraton Dallas Hotel and conference center is located at 400 North Olive Street, Dallas, TX 75201. More information can be found on our <a href="/sigcse2011/attendees/accommodations.php">accommodations page</a>.</p>
<table cellspacing="5px" width="100%">
<tr>
<td valign="top" align="left">
<ul>
<li><a href="http://db.grinnell.edu/sigcse/sigcse2011/Program/Program.asp"><img src="/sigcse2011/images/report.png" align="absmiddle" /> Symposium Program</a></li>
<li><a href="/sigcse2011/attendees/keynotes.php"><img src="/sigcse2011/images/user_suit.png" align="absmiddle" /> Keynote Speakers</a></li>
<li><a href="/sigcse2011/attendees/supporter_sessions.php"><img src="/sigcse2011/images/building.png" align="absmiddle"/> Supporter Sessions</a></li>
<li><a href="/sigcse2011/attendees/pre_symposium_events.php"><img src="/sigcse2011/images/calendar.png" align="absmiddle"/> Pre-Symposium Events</a></li>
+ <li><a href="/sigcse2011/attendees/nsf_showcase.php"><img src="/sigcse2011/images/images.png" align="absmiddle"/> NSF Showcase</a></li>
<li><a href="/sigcse2011/attendees/video_program.php"><img src="/sigcse2011/images/television.png" align="absmiddle"/> Video Program</a></li>
<li><a href="http://elvis.rowan.edu/~kay/sigcse/rodeo.html"><img src="/sigcse2011/images/bricks.png" align="absmiddle"/> SIGCSE 2011 Robot Hoedown and Rodeo</a> <strong>New for 2011!</strong>
<ul><li><a href="http://elvis.rowan.edu/~kay/sigcse/cfw.html">Call for Wranglers</a></li></ul>
</li>
<li><a href="/sigcse2011/attendees/registration.php"><img src="/sigcse2011/images/vcard_add.png" align="absmiddle"/> Registration</a> <strong>NOW OPEN!</strong>
<ul><li><a href="/sigcse2011/attendees/fees.php"><img src="/sigcse2011/images/money.png" align="absmiddle"/> A Sneak Peak at Fees</a></li></ul>
</li>
<li><a href="/sigcse2011/attendees/pokens.php"><img src="/sigcse2011/images/vcard.png" align="absmiddle"> Pokens: A new way to connect at SIGCSE 2011</a></li>
<li><a href="/sigcse2011/attendees/travel_information.php"><img src="/sigcse2011/images/tag_orange.png" align="absmiddle"/> Travel Information</a></li>
<li><a href="/sigcse2011/attendees/accommodations.php"><img src="/sigcse2011/images/clock.png" align="absmiddle"/> Accommodations</a></li>
<li><a href="http://www.visitdallas.com/WelcomeSIGCSE2011" target="_blank"><img src="/sigcse2011/images/weather_sun.png" align="absmiddle"/> Local Attractions</a> (<em>opens in new window</em>)</li>
<li><a href="/sigcse2011/attendees/kids_camp.php"><img src="/sigcse2011/images/group.png" align="absmiddle"/> Kids Camp</a></li>
<li><a href="/sigcse2011/attendees/visas.php"><img src="/sigcse2011/images/folder_database.png" align="absmiddle"/> Visa Information</a></li>
<li><a href="/sigcse2011/attendees/floor_plans.php"><img src="/sigcse2011/images/map.png" align="absmiddle"/> Floor Plans</a></li>
<li><a href="/sigcse2011/faq/#attendees"><img src="/sigcse2011/images/help.png" align="absmiddle" /> FAQ</a></li>
<!--
<li><a href="/sigcse2011/attendees/reception.php"><img src="/sigcse2011/images/cake.png" align="absmiddle"/> Reception</a></li>
<li><a href="/sigcse2011/attendees/special_projects.php"><img src="/sigcse2011/images/bricks.png" align="absmiddle"/> SIGCSE Special Projects</a></li>
<li><a href="/sigcse2011/attendees/video_program.php"><img src="/sigcse2011/images/television.png" align="absmiddle"/> Video Program</a></li>
<li><a href="/sigcse2011/attendees/k12_highlights.php"><img src="/sigcse2011/images/house.png" align="absmiddle"/> Highlights for K-12 Teachers</a></li>
-->
</ul>
</td>
<td nowrap="nowrap" valign="top" align="right">
<!--
<div style='width: 500px; height: 440px; background-image: url( http://vortex.accuweather.com/adcbin/netweather_v2/backgrounds/fall4_500x440_bg.jpg ); background-repeat: no-repeat; background-color: #DA9375;' ><div id='NetweatherContainer' style='height: 420px;' ><script src='http://netweather.accuweather.com/adcbin/netweather_v2/netweatherV2ex.asp?partner=netweather&tStyle=normal&logo=1&zipcode=75202&lang=eng&size=13&theme=fall4&metric=0&target=_self'></script></div><div style='text-align: center; font-family: arial, helvetica, verdana, sans-serif; font-size: 12px; line-height: 20px; color: #0000FF;' ><a style='color: #0000FF' href='http://www.accuweather.com/us/TX/DALLAS/75202/city-weather-forecast.asp?partner=accuweather&traveler=0' >Weather Forecast</a>Â |Â <a style='color: #0000FF' href='http://www.accuweather.com/maps-satellite.asp' >Weather Maps</a>Â |Â <a style='color: #0000FF' href='http://www.accuweather.com/index-radar.asp?partner=accuweather&traveler=0&zipcode=75202' >Weather Radar</a>Â |Â <a style='color: #0000FF' href='http://hurricane.accuweather.com/hurricane/index.asp' >Hurricane Center</a></div></div>
-->
</td>
</tr>
</table>
<?php include("../parts/middle.php"); ?>
<?php include("../parts/attendees_right.php"); ?>
<?php
$updated = filemtime( $_SERVER["SCRIPT_FILENAME"] );
include("../parts/footer.php");
?>
\ No newline at end of file
diff --git a/attendees/nsf_showcase.php b/attendees/nsf_showcase.php
new file mode 100644
index 0000000..f9e7563
--- /dev/null
+++ b/attendees/nsf_showcase.php
@@ -0,0 +1,75 @@
+<?php
+ $title = "SIGCSE 2011 - NSF Showcase";
+ $menu = "attendees";
+ include("../parts/top.php");
+?>
+<div class="SectionHeader" style="clear:left;"><div class="Full">
+<h2>National Science Foundation Showcase</h2>
+</div></div>
+
+<p>All NSF showcases take place in <em>Lone Star BC</em></p>
+
+<div class="SectionHeader" style="clear:left;"><div class="Full">
+<h3><a name="1">NSF Showcase #1 - Thursday 10:00 - 11:30am</a></h3>
+</div></div>
+<p><strong>Location:</strong> Lone Star BC</p>
+<ul>
+ <li>Problets and Codelets for Learning Introductory Programming (CCLI/TUES): Amruth Kumar</li>
+ <li>"Hands-On" Collaborative Reasoning across the Curriculum (CCLI/TUES): Jason O. Hallstrom, Joseph E. Hollingsworth, Joan Krone, Chong Pak, Murali Sitaraman</li>
+ <li>A Creative Collaboration between CSE and Biological Sciences through Cloud-enabled Evolutionary Biology Learning Tool (CI-TEAM): Bina Ramamurthy, Jessica Poulin, Katharina Dittmar De la Cruz</li>
+ <li>Supporting American's Veterans and Wounded Warriors (CI-TEAM): Ray
+Vaughn, David Dampier</li>
+</ul>
+
+<div class="SectionHeader" style="clear:left;"><div class="Full">
+<h3><a name="2">NSF Showcase #2 - Thursday 3:00 - 4:30pm</a></h3>
+</div></div>
+<p><strong>Location:</strong> Lone Star BC</p>
+<ul>
+ <li>Project MLeXAI: Machine Learning Experiences in the Undergraduate Curriculum (CCLI/TUES): Ingrid Russell, Zdravko Markov</li>
+ <li>From CSI, an Integrated Exhibit and Web-based Learning Initiative, to TexNET, a Professional Development Network for Museum Professionals (ISE): Charlie Walter</li>
+ <li>A Unifying Paradigm for Dynamic Simulation (CPATH): Richard M. Salter</li>
+ <li>Project: CyberCHEQS: A Service-Oriented Cyberinfrastructure (SOCI) for Thermochemical Data and Computation Services (CI-TEAM): Subrata Bhattacharjee, Christopher Paolini, Kris Stewart, Mary Thomas, Ofodike Ezekoye</li>
+</ul>
+
+<div class="SectionHeader" style="clear:left;"><div class="Full">
+<h3><a name="3">NSF Showcase #3 - Thursday 10:00 - 11:30am</a></h3>
+</div></div>
+<p><strong>Location:</strong> Lone Star BC</p>
+<ul>
+ <li>The CyberCIEGE Video Game in Cybersecurity Education (SFS): Cynthia Irvine, Michael Thompson</li>
+ <li>Quahog Cohorts: A Community of Student Scientists (S-STEM): Kathryn Sanders</li>
+ <li>Project EXCE2L (Excellence in Computer Education with Entrepreneurship and Leadership Skills) (CPATH): Wendy Tang, Simona Doboli</li>
+ <li>CI-Facilitators: Accelerating Knowledge Development across the STEM Disciplines (CI-TEAM): Jeffrey Stanton, Elizabeth Liddy, Richard Lankes, Derrick Cogburn, Megan Oakleaf</li>
+</ul>
+
+<div class="SectionHeader" style="clear:left;"><div class="Full">
+<h3><a name="4">NSF Showcase #4 - Thursday 3:00 - 4:30pm</a></h3>
+</div></div>
+<p><strong>Location:</strong> Lone Star BC</p>
+<ul>
+ <li>Computational Art and Creative Coding: Teaching CS1 with Processing
+(CCLI/TUES): Ira Greenberg, Deepak Kumar, Dianna Xu</li>
+ <li>Presentation of the 2011 AlgoViz Awards (NSDL): Cliff Shaffer</li>
+ <li>Demonstration of Remote Robotic Exploration and Experimentation (CI-TEAM): William Smart, Bruce Maxwell</li>
+ <li>Modular CS1 from the Inside Out (CPATH): Christine Alvarado, Zach Dodds</li>
+</ul>
+
+<div class="SectionHeader" style="clear:left;"><div class="Full">
+<h3><a name="5">NSF Showcase #5 - Thursday 10:00 - 11:30am</a></h3>
+</div></div>
+<p><strong>Location:</strong> Lone Star BC</p>
+<ul>
+ <li>Ensemble: Connecting Computing Educators (NSDL): Peter Brusilovsky, Steve Carpenter, Lillian Cassel, Lois M. L. Delcambre, Steve Edwards, Edward A Fox, Richard Furuta, Daniel Garcia, Gregory Hislop, Haowei Hsieh, Frank Shipman</li>
+ <li>Leveraging Map-based CI Resources for Middle School Earth Science Curriculum (CI-TEAM): Youwen Ouyang</li>
+ <li>Encouraging digital literacy, college readiness and persistence among Native Americans (CI-TEAM): Richard Mosholder</li>
+ <li>Computational Thinking as a Foundation for Interdisciplinary Undergraduate Education (CPATH): Suzanne Westbrook</li>
+</ul>
+
+
+<?php include("../parts/middle.php"); ?>
+<?php include("../parts/attendees_right.php"); ?>
+<?php
+ $updated = filemtime( $_SERVER["SCRIPT_FILENAME"] );
+ include("../parts/footer.php");
+ ?>
diff --git a/css/master.css b/css/master.css
index 727fb91..d06611a 100644
--- a/css/master.css
+++ b/css/master.css
@@ -267,846 +267,850 @@ div#content {
color: #000000;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
border-radius: 5px;
border: 1px solid #000000;
border-bottom: 2px solid #0000FF;
border-right: 2px solid #0000FF;
width: 68%;
float: left;
overflow: auto;
}
div#content p {
clear: both;
}
div#right {
margin: 5px 15px 0 75%;
padding-top: 5px;
}
div#right .rightbox {
background: #bbbbbb;
color: #111111;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
border-radius: 5px;
border: 1px solid #000000;
border-bottom: 2px solid #FF0000;
border-right: 2px solid #FF0000;
display: block;
margin: 0 0 15px 0;
padding: 5px 5px 5px 5px;
}
#content a {
color: #000000;
padding: 1px 1px 1px 1px;
text-decoration: underline;
}
#content a:hover {
color: #ffffff;
-moz-border-radius: 2px;
-webkit-border-radius: 2px;
border-radius: 2px;
background-color: #537186;
}
#right a {
color: #000000;
padding: 1px 1px 1px 1px;
text-decoration: underline;
}
#right a:hover {
color: #ffffff;
-moz-border-radius: 2px;
-webkit-border-radius: 2px;
border-radius: 2px;
background-color: #537186;
}
#printFooter {
margin: 10px;
display: none;
}
#printIcon {
float: right;
display: block;
margin-top: -10px;
}
#printIcon a {
padding: 5px;
text-decoration: none;
}
#footer {
margin-top: 50px;
clear: both;
padding: 25px 1.5em 1.5em;
border-top: 5px solid #000000;
color: #000000;
background-color: #DDDDDD;
font: normal 11px/1.5em "Helvetica Neue", "Lucida Grande", "Helvetica Neue", Arial, sans-serif;
overflow: hidden;
/*
width: 100%;
margin-bottom: 15px;
padding-bottom: 15px;
*/
}
#footerContent {
color: #000000;
display: block;
margin: 15px 10% 20px 10%;
padding: 5px 5px 5px 5px;
}
#footer a {
text-decoration: underline;
color: #000000;
padding: 1px 1px 1px 1px;
}
#footer a:hover {
padding: 1px 1px 1px 1px;
color: #ffffff;
-moz-border-radius: 2px;
-webkit-border-radius: 2px;
border-radius: 2px;
background-color: #537186;
}
.footerCell {
margin: 5px 5px 5px 5px;
padding: 0px 5px 0px 5px;
}
#logo {
width: 180px;
float: left;
}
#footerText {
margin: 5px 15px 0 15px;
}
.instructor {
margin: 4px 0 4px 15px;
width: 100%;
display: block;
}
/** ERRORS **/
#GoodMessage {
background-color: #E2F9E3;
border: 2px solid #00FF33;
border-left: none;
border-right: none;
padding: 2px 20px 2px 10px;
margin: 10px 0px 10px 0px;
color: #000;
}
.GoodMessage {
background-color: #E2F9E3;
border: 2px solid #00FF33;
border-left: none;
border-right: none;
padding: 2px 20px 2px 10px;
margin: 10px 0px 10px 0px;
color: #000;
}
.errorExplanation {
border: 2px solid #ff0000;
padding: 7px;
padding-bottom: 12px;
margin-bottom: 20px;
background-color: #fcf0f0;
}
.errorExplanation h2 {
text-align: left;
font-weight: bold;
padding: 5px 5px 5px 27px;
font-size: 12px;
margin: -7px;
background: #cc0000;
color: #ffffff;
}
.errorExplanation p {
color: #333;
margin-bottom: 0;
padding: 5px;
}
.errorExplanation ul {
margin-left: 30px;
}
.errorExplanation ul li {
font-size: 12px;
list-style: square;
}
/** FORMS **/
#form_area {
font-family: verdana, sans-serif;
}
#form_area br {
clear: left;
}
#form_area p.blockintro {
color: #666;
font-size: 11px;
line-height: 14px;
margin: 0;
}
#form_area table {}
#form_area table td {
font-size: 10px;
}
#form_area table th {
font-size: 10px;
font-weight: normal;
text-align: right;
}
#form_area table th.required {
font-weight: bold;
}
#form_area div.block {
color: #333;
background: #DCDDDE;
margin: 3px 0 25px 0;
padding: 5px;
font-size: 11px;
font-weight: normal;
}
#form_area h2 {
font-size: 14px;
color: #333;
margin-bottom: 10px;
padding: 0;
margin: 0 0 5px 0;
}
#form_area div.action, div.action {
border-top: 2px solid #000;
margin-bottom: 10px;
text-align: right;
padding-top: 8px;
font-size: 12px;
}
#form_area div p {
margin: 0;
}
#form_area label {
float: left;
margin-top: 5px;
margin-right: 10px;
}
#form_area label.required {
font-weight: bold;
}
#form_area .inputText {
margin-top: 10px;
}
#form_area .inputPassword {
margin-top: 10px;
}
#form_area select {
margin-top: 10px;
margin-top: 2px;
}
#form_area textarea {
margin-top: 10px;
clear:right;
}
#form_area textarea.short {
height: 150px;
}
#form_area textarea.tall {
height: 500px;
}
.growable {
border: 1px dashed #f00;
display: block;
}
#form_area a.bottab {
background: #fff;
border: 1px solid #ccc;
border-top: 0;
padding: 4px 10px 4px 25px;
margin-top: 10px;
margin-right: 10px;
}
#form_area a.more { background: #fff url(/sigcse2011/images/layout_add.png) 2% 50% no-repeat;}
#form_area a.less { background: #fff url(/sigcse2011/images/layout_delete.png) 2% 50% no-repeat;}
#form_area radioLabel {
margin-top: 0px;
}
#form_area .dynamicArea {
border: 1px dashed #000;
padding: 5px 5px 5px 5px;
margin: 5px 5px 5px 5px;
}
#form_area .field, .text {
margin-top: 5px;
}
#form_area .submit {
border-top: 2px solid #000;
padding: 8px 0 12px 0;
text-align: right;
}
.sub_form {
margin: 5px 0 0 10px;
padding: 0 0 0 5px;
border-left: 2px solid #1463B4;
}
/** table **/
.forum {
border: 1px solid #666666;
width: 95%;
text-align: center;
}
.forum .poster {
background-color: #84CA82;
border-right: 1px dashed #1463B4;
padding: 2px 4px 2px 4px;
margin: 0;
}
.forum .post {
padding: 2px 4px 2px 4px;
margin: 0;
}
.forum .headline {
background-color: #CDE8FB;
padding: 2px 4px 2px 4px;
text-align: center;
}
.forum .replies {
background-color: #F3B902;
text-align: center;
padding: 5px 0 5px 0;
}
.forum_control {
border-bottom: 1px dashed #666666;
padding: 0 5px 2px 5px;
margin: 0 0 4px 0;
text-align: right;
width: 98%;
display: block;
}
.quote {
display: block;
background-color: #cccccc;
border: 1px dashed #111111;
padding: 4px 4px 4px 4px;
text-align: left;
margin: 15px;
}
.fancy {
border: 1px solid #666666;
}
.fancy .cell {
border-left: 1px solid #1463B4;
padding-left: 2px;
padding-right: 2px;
text-align: right;
}
.fancy .summaryCell {
border-top: 1px dashed #1463B4;
border-left: 1px solid #1463B4;
padding-left: 2px;
text-align: right;
}
.fancy tr.hover:hover
{
background: #bfd5ff;
}
.fancy tr.fheader a
{
color: #000000;
font-weight: normal;
}
.fancy tr.fheader a:hover
{
color: #000000;
font-weight: normal;
text-decoration: none;
}
.fancy td.selected {
background-color: #3d80df;
border-left: 1px solid #346DBE;
border-bottom: 1px solid #7DAAEA;
}
.fancy td.selected a {
color: #ffffff;
font-weight: bold;
text-decoration: none;
}
.fancy td.selected a:hover {
color: #ffffff;
font-weight: bold;
text-decoration: underline;
}
.fancy a:visited {
color: #000000;
}
.fancy tr.odd
{
background-color: #edf3fe;
}
.fancy tr.even
{
background-color: #fff;
}
.fancy td.total
{
border-top: 1px dashed #666666;
}
.fancy tbody tr td {
font-family: "lucida grande", verdana, sans-serif;
font-size: 9pt;
padding: 3px 8px;
border-left: 1px solid #D9D9D9;
}
.fancy .codeB {
font-family: "courier", verdana, sans-serif;
font-size: 9pt;
background: #A4B7C8;
border: 1px solid #FE6600;
}
.fancy .codeA {
font-family: "courier", verdana, sans-serif;
font-size: 9pt;
background: #EEEEEE;
border: 1px solid #84CA82;
}
.fancy .codeC {
font-family: "courier", verdana, sans-serif;
font-size: 9pt;
background: #A4B7C8;
border: 1px solid #EE2022;
}
/* message / announcements */
.announcement {
padding: 3px 0px 5px 5px;
border-left: 1px dashed #1463B4;
border-bottom: 1px dashed #1463B4;
}
/** general content */
.SectionHeader {
margin: 5px 0 0px 0;
border-bottom: 1px solid #000000;
padding-bottom: 5px;
}
.SectionHeader h2 {
margin: 0 0 0 0;
}
+.SectionHeader h3 {
+ margin: 0 0 0 0;
+}
+
.SectionHeader .Full {
text-align: center;
}
/* fade table */
.FadeTable {
margin: 5px 0 5px 0;
border: none;
width: 100%;
border-left: 1px solid #1463B4;
}
.FadeTable tr.header {
background-color: #d9d9d9;
}
.FadeTable th {
padding: 5px 0 5px 5px;
text-align: left;
font-weight: normal;
}
.FadeTable th.full {
text-align: center;
}
.FadeTable tr.row1 {
background-color: #e4e4e4;
}
.FadeTable tr.row2 {
background-color: #e4e4e4;
}
.FadeTable tr.row3 {
background-color: #e4e4e4;
}
.FadeTable tr.row4 {
background-color: #f3f3f3;
}
.FadeTable tr.row5 {
background-color: #f3f3f3;
}
.FadeTable td {
padding: 4px 5px 4px 5px
}
/* blog */
.BlogPost {
margin: 5px 0 0 0;
border-bottom: 1px dashed #DCDDDE;
}
.BlogPost h2 {
margin: 0 0 0 0;
border-bottom: 1px solid #1463B4;
}
.BlogPost p.author {
margin: 0 0 0 15px;
font-style: italic;
}
.BlogPost p {
margin: 5px 5px 5px 5px;
}
.BlogPost p.summary {
text-align: right;
}
a img {
text-decoration: none;
border: none;
}
.Comment {
margin: 5px 0 0 10px;
padding: 0 0 0 5px;
border-left: 2px solid #1463B4;
}
.Comment p.commentAuthor {
margin: 0;
font-style: italic;
border-bottom: 1px solid #DCDDDE;
}
.Comment p.commentBody {
padding: 0px 0px 0px 10px;
}
#leave_comment {
border: 1px dotted #1463B4;
padding: 5px 5px 5px 5px;
margin: 5px 5px 5px 5px;
}
#featured {
border: 3px solid #DCDDDE;
border: 2px solid #1463B4;
padding: 10px 10px 10px 10px;
}
/* Assignent */
#Assignment {
font-family: verdana, sans-serif;
}
#Assignment br {
clear: left;
}
#Assignment div.blockintro {
color: #333;
margin: 5px 0 0 0;
border-bottom: 1px solid #1463B4;
}
#Assignment div.blockintro p {
margin: 0;
padding: 0;
}
#Assignment div.block {
color: #333;
background: #DCDDDE;
margin: 3px 0 25px 0;
padding: 5px 5px 5px 5px;
font-size: 11px;
font-weight: normal;
}
#Assignment div.block table {
border: 0;
}
#Assignment div.block td.label {
text-align: right;
font-weight: bold;
}
#Assignment .required {
font-weight: bold;
}
.fixedWidth {
font-family: times, verdana, sans-serif;
font-size: 10pt;
}
.has_comment {
background: #6BBA70;
}
.has_style {
background: #FF0084;
}
.hidden_style {
background: #F3B802;
}
.fixedFont {
font-family: "Courier", verdana, sans-serif;
font-size: 10pt;
}
.code {
background: #EEEEEE;
border: 1px solid #84CA82;
margin: 2px 2px 2px 2px;
padding: 2px 2px 2px 2px;
font-family: "courier", verdana, sans-serif;
font-size: 10pt;
}
.code_example {
background: #CDEB8B;
border: 1px solid #84CA82;
margin: 2px 2px 2px 2px;
padding: 2px 2px 2px 2px;
font-family: "courier", verdana, sans-serif;
font-size: 10pt;
}
.codeout {
background: #EEEEEE;
border: 1px solid #1463B4;
margin: 5px 5px 5px 5px;
padding: 10px 10px 10px 10px;
font-family: "courier", verdana, sans-serif;
font-size: 10pt;
}
.codecomment {
background: #FFFFCC;
border: 1px dashed #009900;
margin: 1px 1px 1px 1px;
padding: 1px 10px 1px 10px;
}
.codestyle {
background: #C3D9FF;
border: 1px dashed #009900;
margin: 1px 1px 1px 1px;
padding: 1px 10px 1px 10px;
}
.standout {
background: #FFFFCC;
border: 1px solid #1463B4;
margin: 5px 5px 5px 5px;
padding: 10px 10px 10px 10px;
}
.menuout {
background: #EDEBD6;
border: 1px solid #000;
margin: 5px 1px 5px 1px;
padding: 5px 1px 5px 10px;
}
.standout a {
color: #0000FF;
}
.codetable {
border: 1px solid #666666;
}
.codetable tr.hover:hover
{
background: #bfd5ff;
}
.codetable tr.fheader a
{
color: #000000;
font-weight: normal;
}
.codetable tr.fheader a:hover
{
color: #000000;
font-weight: normal;
text-decoration: none;
}
.codetable a:visited {
color: #000000;
}
.codetable tr.odd
{
background-color: #fff;
}
.codetable tr.even
{
background-color: #fff;
}
.codetable tbody tr td {
font-family: "times", verdana, sans-serif;
font-size: 10pt;
padding: 0px 2px 0px 2px;
border-left: 1px solid #D9D9D9;
}
.codetable .formcell {
padding-left: 50px;
background: #DCDDDE;
}
/** DIFF **/
.diffReport {
max-width: 500px;
background: #EEEEEE;
border: 1px solid #84CA82;
font-family: "courier", verdana, sans-serif;
font-size: 9pt;
}
.diffReport2 {
background: #EEEEEE;
border: 1px solid #84CA82;
margin: 2px 2px 2px 2px;
font-family: "courier", verdana, sans-serif;
font-size: 10pt;
}
.diffSub {
border-bottom: 2px solid #EE2022;
margin-bottom: 3px;
}
.diffAdd {
border-bottom: 2px solid #0262DB;
margin-bottom: 3px;
}
.diffChange {
border-bottom: 2px solid #F0BA02;
margin-bottom: 3px;
}
#flickr_badge_source_txt {padding:0; font: 11px Arial, Helvetica, Sans serif; color:#666666;}
#flickr_badge_icon {display:block !important; margin:0 !important; border: 1px solid rgb(0, 0, 0) !important;}
#flickr_icon_td {padding:0 5px 0 0 !important;}
.flickr_badge_image {text-align:center !important;}
.flickr_badge_image img {border: 1px solid black !important;}
#flickr_www {display:block; padding:0 10px 0 10px !important; font: 11px Arial, Helvetica, Sans serif !important; color:#3993ff !important;}
#flickr_badge_uber_wrapper a:hover,
#flickr_badge_uber_wrapper a:link,
#flickr_badge_uber_wrapper a:active,
#flickr_badge_uber_wrapper a:visited {text-decoration:none !important; background:inherit !important;color:#3993ff;}
#flickr_badge_wrapper {}
#flickr_badge_source {padding:0 !important; font: 11px Arial, Helvetica, Sans serif !important; color:#666666 !important;}
diff --git a/parts/attendees_right.php b/parts/attendees_right.php
index bafaf2b..0e29526 100644
--- a/parts/attendees_right.php
+++ b/parts/attendees_right.php
@@ -1,30 +1,31 @@
<ul>
<li><a href="http://db.grinnell.edu/sigcse/sigcse2011/Program/Program.asp"><img src="/sigcse2011/images/report.png" align="absmiddle" /> Symposium Program</a></li>
<li><a href="/sigcse2011/attendees/keynotes.php"><img src="/sigcse2011/images/user_suit.png" align="absmiddle" /> Keynote Speakers</a></li>
<li><a href="/sigcse2011/attendees/supporter_sessions.php"><img src="/sigcse2011/images/building.png" align="absmiddle"/> Supporter Sessions</a></li>
<li><a href="/sigcse2011/attendees/pre_symposium_events.php"><img src="/sigcse2011/images/calendar.png" align="absmiddle"/> Pre-Symposium Events</a></li>
+ <li><a href="/sigcse2011/attendees/nsf_showcase.php"><img src="/sigcse2011/images/images.png" align="absmiddle"/> NSF Showcase</a></li>
<li><a href="/sigcse2011/attendees/video_program.php"><img src="/sigcse2011/images/television.png" align="absmiddle"/> Video Program</a></li>
<li><a href="http://elvis.rowan.edu/~kay/sigcse/rodeo.html"><img src="/sigcse2011/images/bricks.png" align="absmiddle"/> SIGCSE 2011 Robot Hoedown and Rodeo</a> <strong>New!</strong>
<ul><li><a href="http://elvis.rowan.edu/~kay/sigcse/cfw.html">Call for Wranglers</a></li></ul>
</li>
<li><a href="/sigcse2011/attendees/registration.php"><img src="/sigcse2011/images/vcard_add.png" align="absmiddle"/> Registration</a>
<ul><li><a href="/sigcse2011/attendees/fees.php"><img src="/sigcse2011/images/money.png" align="absmiddle"/> A Sneak Peak at Fees</a></li></ul>
</li>
<li><a href="/sigcse2011/attendees/pokens.php"><img src="/sigcse2011/images/vcard.png" align="absmiddle"> Pokens: A new way to connect at SIGCSE 2011</a></li>
<li><a href="/sigcse2011/attendees/travel_information.php"><img src="/sigcse2011/images/tag_orange.png" align="absmiddle"/> Travel Information</a></li>
<li><a href="/sigcse2011/attendees/accommodations.php"><img src="/sigcse2011/images/clock.png" align="absmiddle"/> Accommodations</a></li>
<li><a href="http://www.visitdallas.com/WelcomeSIGCSE2011" target="_blank"><img src="/sigcse2011/images/weather_sun.png" align="absmiddle"/> Local Attractions</a></li>
<li><a href="/sigcse2011/attendees/kids_camp.php"><img src="/sigcse2011/images/group.png" align="absmiddle"/> Kids Camp</a></li>
<li><a href="/sigcse2011/attendees/visas.php"><img src="/sigcse2011/images/folder_database.png" align="absmiddle"/> Visa Information</a></li>
<li><a href="/sigcse2011/attendees/floor_plans.php"><img src="/sigcse2011/images/map.png" align="absmiddle"/> Floor Plans</a></li>
<li><a href="/sigcse2011/faq/#attendees"><img src="/sigcse2011/images/help.png" align="absmiddle" /> FAQ</a></li>
<!--
<li><a href="/sigcse2011/attendees/reception.php"><img src="/sigcse2011/images/cake.png" align="absmiddle"/> Reception</a></li>
<li><a href="/sigcse2011/attendees/supporter_sessions.php"><img src="/sigcse2011/images/building.png" align="absmiddle"/> Supporter Sessions</a></li>
<li><a href="/sigcse2011/attendees/special_projects.php"><img src="/sigcse2011/images/bricks.png" align="absmiddle"/> SIGCSE Special Projects</a></li>
<li><a href="/sigcse2011/attendees/video_program.php"><img src="/sigcse2011/images/television.png" align="absmiddle"/> Video Program</a></li>
<li><a href="/sigcse2011/attendees/k12_highlights.php"><img src="/sigcse2011/images/house.png" align="absmiddle"/> Highlights for K-12 Teachers</a></li>
<li><a href="/sigcse2011/attendees/kids_camp.php"><img src="/sigcse2011/images/group.png" align="absmiddle"/> Kids Camp</a></li>
-->
</ul>
\ No newline at end of file
|
mikehelmick/SIGCSE2011-Web-Site
|
54988ff656a882fd429d60aaf976be5014fec00d
|
use kids camp pictures form /sigcse2011 instead of 2010
|
diff --git a/attendees/kids_camp.php b/attendees/kids_camp.php
index 61df34e..b7028d8 100644
--- a/attendees/kids_camp.php
+++ b/attendees/kids_camp.php
@@ -1,96 +1,96 @@
<?php
$title = "SIGCSE 2011 - Kids Camp";
$menu = "attendees";
include("../parts/top.php");
?>
<div class="SectionHeader" style="clear:left;"><div class="Full">
<h2>SIGCSE 2011 Kids Camp</h2>
</div></div>
<table><tr><td width="75%" valign="top">
<p>This year's theme is <strong>Going green!</strong>. The SIGCSE 2011 Kids camp will bel located in the <em>Remington Room</em> (4th floor).</p>
<p>Kids Camp registration is now available! To register your child/children (and to learn more about KiddieCorp, our children's program provider), please visit <a href="https://www.kiddiecorp.com/acmkids.htm">https://www.kiddiecorp.com/acmkids.htm</a>. Instead of on-line registration, you may print, complete, and mail or fax the registration form, provided on the KiddieCorp site, using the contact information provided on the form. A link to this form is available from the KiddieCorp page.</p>
<p><img src="/sigcse2011/images/logos/sponsors/microsoft.png" align="left" class="headshot"/> Computers and t-shirts for Kids Camp are available due to the generous support of Microsoft. Thank you!
<br/> <br/> </p>
<h3>Times and Dates:</h3>
<ul><li>Thursday, March 10<ul>
<li>8:00am - 1:00pm</li>
<li>1:00pm - 6:00pm</li>
</ul></li>
<li>Friday, March 11:<ul>
<li>8:00am - 1:00pm</li>
<li>1:00pm - 6:00pm</li>
</ul></li>
<li>Saturday, March 12:<ul>
<li>8:00am - 2:30pm</li>
</ul></li></ul>
<h3>Fees:</h3>
<ul><li>Children 6 months to 2 years:<ul>
<li>Half day: $35 per child</li>
<li>Full day: $56 per child</li>
</li></ul>
<li>Children 3 to 12 years:<ul>
<li>Half day: $30 per child</li>
<li>Full day: $56 per child</li>
</ul></li></ul>
<h3>Frequently Asked Questions</h3>
<ol>
<li><strong>How old/young can my child(ren) be to register?</strong>
<p>Care will be provided for children ages 6 months to 12 yrs. If you have older children who want to attend, please contact us.</p></li>
<li><strong>How much does it cost?</strong>
<p>Great news: our rates are unchanged this year! Like last year the charges are by session:<br/>
<strong>Children 6 months - 2 years:</strong> $35 per child (half day), or $56 per child (full day)<br/>
<strong>Children 3 - 12 years:</strong> $30 per child (half day), or $48 per child (full day)</p></li>
<li><strong>Where will Kids Camp be located?</strong>
<p>Kids Camp is conveniently located in the Remington Room on the fourth floor of the Sheraton Hotel, directly above most conference activities. Visiting your children will be easy, yet they are comfortably away from the main conference traffic. Restrooms are located nearby. You can check out the room here: <a href="http://www.sheratondallashotel.com/capacity-chart">http://www.sheratondallashotel.com/capacity-chart</a>).</p></li>
<li><strong>What will my child(ren) be doing while I am attending the conference?</strong>
<p>SIGCSE Kid Campers will participate in drama, play, and arts & crafts activities. Older kids can participate in our planned computing activities. We have scheduled activity sessions with CS Unplugged, Scratch, and Alice. Student Volunteers will help with the computing activities.</p>
<p>Our planned activities also include:
<ul><li>Computing activities using Microsoft's Kodu</li>
<li>Scavenger hunts on both Thursday and Friday</li>
<li>Daily activites based on our "Going Green!" theme</li>
<li>...and much more!</li></ul></p></li>
<li><strong>What will my children be served for lunch?</strong>
<p>Lunch menu selections are still in planning. Last year's camp menu included entrees of chicken fingers & fries, grilled cheese & fries, macaroni & cheese, and pizza (with 1 topping). Side dishes were celery & carrot sticks, fruit cup, and a selection of whole fruit (apple, banana, orange).</p></li>
<li><strong>Do I need to bring anything for my child(ren)?</strong>
<p>Yes, a change of clothes is strongly recommended for all children. In addition, parents of young children will need to provide any diapers, wipes, baby food, and/or formula and bottles that may be needed.</p></li>
<li><strong>How many childcare providers will be in the rooms?</strong>
<p>Daycare provider ratios will be 1:2 for kids ages 6 months-11 months, 1:3 for kids 1 to 2 years old, 1:5 for ages 3-5 and 1:7 for 6-12 years old.. Student volunteers for the computing activities will be additional helpers and are not included in this ratio.</p></li>
</ol>
</td>
<td width="25%">
<p><em>Pictures form the SIGCSE 2009 Kids Camp.</em></p>
-<a href="/sigcse2010/attendees/kidscamp/097.jpg" rel="lightbox[kidscamp]" title="Playing the 'cookie' game"><img src="/sigcse2010/attendees/kidscamp/thumbs/097.jpg" class="bookImg" /></a><br />
-<a href="/sigcse2010/attendees/kidscamp/103.jpg" rel="lightbox[kidscamp]" title="Using Alice"><img src="/sigcse2010/attendees/kidscamp/thumbs/103.jpg" class="bookImg" /></a><br />
- <a href="/sigcse2010/attendees/kidscamp/108.jpg" rel="lightbox[kidscamp]" title="Wearing Pirate Hats (last year's theme)"><img src="/sigcse2010/attendees/kidscamp/thumbs/108.jpg" class="bookImg" /></a><br />
- <a href="/sigcse2010/attendees/kidscamp/DSC04920.jpg" rel="lightbox[kidscamp]" title="In our Camp TShirts, on the way to the scavenger hunt"><img src="/sigcse2010/attendees/kidscamp/thumbs/DSC04920.jpg" class="bookImg" /></a><br />
- <a href="/sigcse2010/attendees/kidscamp/DSC04924.jpg" rel="lightbox[kidscamp]" title="Scavenger Hunt - 'That way!'"><img src="/sigcse2010/attendees/kidscamp/thumbs/DSC04924.jpg" class="bookImg" /></a><br />
- <a href="/sigcse2010/attendees/kidscamp/DSC04930.jpg" rel="lightbox[kidscamp]" title="Collecting goodies on the scavenger hunt"><img src="/sigcse2010/attendees/kidscamp/thumbs/DSC04930.jpg" class="bookImg" /></a><br />
- <a href="/sigcse2010/attendees/kidscamp/DSC04935.jpg" rel="lightbox[kidscamp]" title="In our Camp T-shirts on the scavenger hunt"><img src="/sigcse2010/attendees/kidscamp/thumbs/DSC04935.jpg" class="bookImg" /></a></br/>
- <a href="/sigcse2010/attendees/kidscamp/DSC04947.jpg" rel="lightbox[kidscamp]" title="Looking good on cycle"><img src="/sigcse2010/attendees/kidscamp/thumbs/DSC04947.jpg" class="bookImg" /></a><br />
- <a href="/sigcse2010/attendees/kidscamp/DSC04949.jpg" rel="lightbox[kidscamp]" title="Just posing, no actual motocycle riding!"><img src="/sigcse2010/attendees/kidscamp/thumbs/DSC04949.jpg" class="bookImg" /></a><br />
- <a href="/sigcse2010/attendees/kidscamp/DSC04958.jpg" rel="lightbox[kidscamp]" title="On the exhibit floor, during scavenger hunt"><img src="/sigcse2010/attendees/kidscamp/thumbs/DSC04958.jpg" class="bookImg" /></a><br />
- <a href="/sigcse2010/attendees/kidscamp/DSC04959.jpg" rel="lightbox[kidscamp]" title="Fun for all ages!"><img src="/sigcse2010/attendees/kidscamp/thumbs/DSC04959.jpg" class="bookImg" /></a><br />
- <a href="/sigcse2010/attendees/kidscamp/DSC04966.jpg" rel="lightbox[kidscamp]" title="Kodu with our MS liaison"><img src="/sigcse2010/attendees/kidscamp/thumbs/DSC04966.jpg" class="bookImg" /></a><br />
- <a href="/sigcse2010/attendees/kidscamp/DSC04971.jpg" rel="lightbox[kidscamp]" title="Using Kodu, from our sponsor Microsoft"><img src="/sigcse2010/attendees/kidscamp/thumbs/DSC04971.jpg" class="bookImg" /></a><br />
- <a href="/sigcse2010/attendees/kidscamp/DSC04984.jpg" rel="lightbox[kidscamp]" title="Thumbs up for lunch"><img src="/sigcse2010/attendees/kidscamp/thumbs/DSC04984.jpg" class="bookImg" /></a>
+<a href="/sigcse2011/attendees/kidscamp/097.jpg" rel="lightbox[kidscamp]" title="Playing the 'cookie' game"><img src="/sigcse2011/attendees/kidscamp/thumbs/097.jpg" class="bookImg" /></a><br />
+<a href="/sigcse2011/attendees/kidscamp/103.jpg" rel="lightbox[kidscamp]" title="Using Alice"><img src="/sigcse2011/attendees/kidscamp/thumbs/103.jpg" class="bookImg" /></a><br />
+ <a href="/sigcse2011/attendees/kidscamp/108.jpg" rel="lightbox[kidscamp]" title="Wearing Pirate Hats (last year's theme)"><img src="/sigcse2011/attendees/kidscamp/thumbs/108.jpg" class="bookImg" /></a><br />
+ <a href="/sigcse2011/attendees/kidscamp/DSC04920.jpg" rel="lightbox[kidscamp]" title="In our Camp TShirts, on the way to the scavenger hunt"><img src="/sigcse2011/attendees/kidscamp/thumbs/DSC04920.jpg" class="bookImg" /></a><br />
+ <a href="/sigcse2011/attendees/kidscamp/DSC04924.jpg" rel="lightbox[kidscamp]" title="Scavenger Hunt - 'That way!'"><img src="/sigcse2011/attendees/kidscamp/thumbs/DSC04924.jpg" class="bookImg" /></a><br />
+ <a href="/sigcse2011/attendees/kidscamp/DSC04930.jpg" rel="lightbox[kidscamp]" title="Collecting goodies on the scavenger hunt"><img src="/sigcse2011/attendees/kidscamp/thumbs/DSC04930.jpg" class="bookImg" /></a><br />
+ <a href="/sigcse2011/attendees/kidscamp/DSC04935.jpg" rel="lightbox[kidscamp]" title="In our Camp T-shirts on the scavenger hunt"><img src="/sigcse2011/attendees/kidscamp/thumbs/DSC04935.jpg" class="bookImg" /></a></br/>
+ <a href="/sigcse2011/attendees/kidscamp/DSC04947.jpg" rel="lightbox[kidscamp]" title="Looking good on cycle"><img src="/sigcse2011/attendees/kidscamp/thumbs/DSC04947.jpg" class="bookImg" /></a><br />
+ <a href="/sigcse2011/attendees/kidscamp/DSC04949.jpg" rel="lightbox[kidscamp]" title="Just posing, no actual motocycle riding!"><img src="/sigcse2011/attendees/kidscamp/thumbs/DSC04949.jpg" class="bookImg" /></a><br />
+ <a href="/sigcse2011/attendees/kidscamp/DSC04958.jpg" rel="lightbox[kidscamp]" title="On the exhibit floor, during scavenger hunt"><img src="/sigcse2011/attendees/kidscamp/thumbs/DSC04958.jpg" class="bookImg" /></a><br />
+ <a href="/sigcse2011/attendees/kidscamp/DSC04959.jpg" rel="lightbox[kidscamp]" title="Fun for all ages!"><img src="/sigcse2011/attendees/kidscamp/thumbs/DSC04959.jpg" class="bookImg" /></a><br />
+ <a href="/sigcse2011/attendees/kidscamp/DSC04966.jpg" rel="lightbox[kidscamp]" title="Kodu with our MS liaison"><img src="/sigcse2011/attendees/kidscamp/thumbs/DSC04966.jpg" class="bookImg" /></a><br />
+ <a href="/sigcse2011/attendees/kidscamp/DSC04971.jpg" rel="lightbox[kidscamp]" title="Using Kodu, from our sponsor Microsoft"><img src="/sigcse2011/attendees/kidscamp/thumbs/DSC04971.jpg" class="bookImg" /></a><br />
+ <a href="/sigcse2011/attendees/kidscamp/DSC04984.jpg" rel="lightbox[kidscamp]" title="Thumbs up for lunch"><img src="/sigcse2011/attendees/kidscamp/thumbs/DSC04984.jpg" class="bookImg" /></a>
</td></tr>
</table>
<?php include("../parts/middle.php"); ?>
<?php include("../parts/attendees_right.php"); ?>
<?php
$updated = filemtime( $_SERVER["SCRIPT_FILENAME"] );
include("../parts/footer.php");
?>
|
mikehelmick/SIGCSE2011-Web-Site
|
cae12224135f1f7645a85d8b0abab0e0e9f1c33c
|
remove unnecessary supporter sessions slot, add pictures to kids camp page, clarify upgrade contest
|
diff --git a/attendees/accommodations.php b/attendees/accommodations.php
index 2176f0f..ffed1ad 100644
--- a/attendees/accommodations.php
+++ b/attendees/accommodations.php
@@ -1,78 +1,78 @@
<?php
$title = "SIGCSE 2011 - Accommodations";
$menu = "attendees";
include("../parts/top.php");
?>
<!-- right area -->
<h1>SIGCSE 2011 Accommodations</h1>
<p>To help conference attendees begin their travel planning, we are happy to
provide the following information about the hotel which will have blocks
of rooms available at special conference rates. And, as SIGCSE has done in
the past, we will have a roommate matching website to help pair you with a
roommate to reduce the cost of attending the symposium.</p>
<div class="SectionHeader"><div class="Full">
<h2>Conference Hotel</h2>
</div></div>
<br/>
<p><img src="/sigcse2011/images/sheraton-dallas-hotel.jpg" width="300" align="left" class="headshot" />
The conference hotel is Sheraton Dallas Hotel, 400 North Olive Street, Dallas, TX 75201. The group rate is $159 + tax. This rate includes free wireless
access in hotel rooms in the Sheraton. <em>When making your reservation, you may see that Wifi costs extra. Don't panic! As long as make your hotel reservation through this link, wireless internet access is included in your stay.</em><br/>
<strong><a href="http://www.starwoodmeeting.com/StarGroupsWeb/res?id=1011221675&key=112A2">Click here to make your hotel reservations</a></strong>
<br/> <br/>
<strong>All conference activities will be at the Sheraton hotel and its attached conference center.</strong>
<br/>
<em><a href="travel_information.php">View a map and see travel information.</a></em>
</p>
<div class="SectionHeader" style="clear: left;"><div class="Full">
<h2>Why should I stay at the conference hotel?</h2>
</div></div>
<p>If you stay at the conference hotel, you'll be able to network easily with
other conference attendees. It's a quick trip to get to the program and
functions, and just as quick to zip back to your room for a break. Plus,
we've negotiated for free Internet at the conference hotel and a
significantly reduced room rate to stay in downtown Dallas. Overall,
you'll have a much better conference experience if you stay at the
conference hotel. Staying at the conference hotel also supports SIGCSE
since we are required to pay for unused rooms in our reserved block which
raises costs for future SIGCSE conferences. So make your conference
experience a better one and help SIGCSE at the same time --- please
reserve your room at the Sheraton Dallas.</p>
<p><em>(If you somehow obtain a better rate online than the one listed on our
site, your stay will still be counted toward our required room block, but
keep in mind that there are often restrictions and/or penalties associated
with these rates. )</em></p>
-<p><strong>WIN A FREE UPGRADE</strong>: Every attendee that preregisters for SIGCSE 2011 at
+<p><strong>WIN A FREE UPGRADE</strong>: Every attendee that <em>early register</em> for SIGCSE 2011 at
the regular conference rate and reserves a room at the Sheraton Dallas
will be entered into a drawing to win a complimentary upgrade to a suite.
(Free upgrade drawing not available with exhibits-only, teacher or student
rates.)</p>
<div class="SectionHeader" style="clear: left"><div class="Full">
<h2>Roommate matching</h2>
</div></div>
<p>We recognize that many SIGCSE attendees work at schools with very limited, even nonexistent!, travel budgets. To help you reduce your cost to participate in the symposium, we are happy to once again provide
assistance with roommate matching: The <a href="http://www.tymann.us/sigcse" target="_blank">SIGCSE 2011 Roommate Database</a>. Once registered, you can input your preferences and see other registrants who have compatible preferences. The rest is up to you!</p>
<p>The roommate database is hosted and administered by <a href="http://www.cs.rit.edu/~ptt/" target="_blank">Paul Tymann</a>. Please contact Paul (<script>write_email("ptt", "cs.rit.edu")</script>) with any questions that you may have about this
service.
<?php include("../parts/middle.php"); ?>
<?php include("../parts/attendees_right.php"); ?>
<?php
$updated = filemtime( $_SERVER["SCRIPT_FILENAME"] );
include("../parts/footer.php");
?>
diff --git a/attendees/kids_camp.php b/attendees/kids_camp.php
index cbb187a..61df34e 100644
--- a/attendees/kids_camp.php
+++ b/attendees/kids_camp.php
@@ -1,72 +1,96 @@
<?php
$title = "SIGCSE 2011 - Kids Camp";
$menu = "attendees";
include("../parts/top.php");
?>
<div class="SectionHeader" style="clear:left;"><div class="Full">
<h2>SIGCSE 2011 Kids Camp</h2>
</div></div>
-<p>This year's theme is <strong>Going green!</strong>. The SIGCSE 2010 Kids camp will bel located in the <em>Remington Room</em> (4th floor).</p>
+<table><tr><td width="75%" valign="top">
+
+<p>This year's theme is <strong>Going green!</strong>. The SIGCSE 2011 Kids camp will bel located in the <em>Remington Room</em> (4th floor).</p>
<p>Kids Camp registration is now available! To register your child/children (and to learn more about KiddieCorp, our children's program provider), please visit <a href="https://www.kiddiecorp.com/acmkids.htm">https://www.kiddiecorp.com/acmkids.htm</a>. Instead of on-line registration, you may print, complete, and mail or fax the registration form, provided on the KiddieCorp site, using the contact information provided on the form. A link to this form is available from the KiddieCorp page.</p>
<p><img src="/sigcse2011/images/logos/sponsors/microsoft.png" align="left" class="headshot"/> Computers and t-shirts for Kids Camp are available due to the generous support of Microsoft. Thank you!
<br/> <br/> </p>
<h3>Times and Dates:</h3>
<ul><li>Thursday, March 10<ul>
<li>8:00am - 1:00pm</li>
<li>1:00pm - 6:00pm</li>
</ul></li>
<li>Friday, March 11:<ul>
<li>8:00am - 1:00pm</li>
<li>1:00pm - 6:00pm</li>
</ul></li>
<li>Saturday, March 12:<ul>
<li>8:00am - 2:30pm</li>
</ul></li></ul>
<h3>Fees:</h3>
<ul><li>Children 6 months to 2 years:<ul>
<li>Half day: $35 per child</li>
<li>Full day: $56 per child</li>
</li></ul>
<li>Children 3 to 12 years:<ul>
<li>Half day: $30 per child</li>
<li>Full day: $56 per child</li>
</ul></li></ul>
<h3>Frequently Asked Questions</h3>
<ol>
<li><strong>How old/young can my child(ren) be to register?</strong>
<p>Care will be provided for children ages 6 months to 12 yrs. If you have older children who want to attend, please contact us.</p></li>
<li><strong>How much does it cost?</strong>
<p>Great news: our rates are unchanged this year! Like last year the charges are by session:<br/>
<strong>Children 6 months - 2 years:</strong> $35 per child (half day), or $56 per child (full day)<br/>
<strong>Children 3 - 12 years:</strong> $30 per child (half day), or $48 per child (full day)</p></li>
<li><strong>Where will Kids Camp be located?</strong>
<p>Kids Camp is conveniently located in the Remington Room on the fourth floor of the Sheraton Hotel, directly above most conference activities. Visiting your children will be easy, yet they are comfortably away from the main conference traffic. Restrooms are located nearby. You can check out the room here: <a href="http://www.sheratondallashotel.com/capacity-chart">http://www.sheratondallashotel.com/capacity-chart</a>).</p></li>
<li><strong>What will my child(ren) be doing while I am attending the conference?</strong>
<p>SIGCSE Kid Campers will participate in drama, play, and arts & crafts activities. Older kids can participate in our planned computing activities. We have scheduled activity sessions with CS Unplugged, Scratch, and Alice. Student Volunteers will help with the computing activities.</p>
<p>Our planned activities also include:
<ul><li>Computing activities using Microsoft's Kodu</li>
<li>Scavenger hunts on both Thursday and Friday</li>
<li>Daily activites based on our "Going Green!" theme</li>
<li>...and much more!</li></ul></p></li>
<li><strong>What will my children be served for lunch?</strong>
<p>Lunch menu selections are still in planning. Last year's camp menu included entrees of chicken fingers & fries, grilled cheese & fries, macaroni & cheese, and pizza (with 1 topping). Side dishes were celery & carrot sticks, fruit cup, and a selection of whole fruit (apple, banana, orange).</p></li>
<li><strong>Do I need to bring anything for my child(ren)?</strong>
<p>Yes, a change of clothes is strongly recommended for all children. In addition, parents of young children will need to provide any diapers, wipes, baby food, and/or formula and bottles that may be needed.</p></li>
<li><strong>How many childcare providers will be in the rooms?</strong>
<p>Daycare provider ratios will be 1:2 for kids ages 6 months-11 months, 1:3 for kids 1 to 2 years old, 1:5 for ages 3-5 and 1:7 for 6-12 years old.. Student volunteers for the computing activities will be additional helpers and are not included in this ratio.</p></li>
</ol>
+</td>
+<td width="25%">
+<p><em>Pictures form the SIGCSE 2009 Kids Camp.</em></p>
+
+<a href="/sigcse2010/attendees/kidscamp/097.jpg" rel="lightbox[kidscamp]" title="Playing the 'cookie' game"><img src="/sigcse2010/attendees/kidscamp/thumbs/097.jpg" class="bookImg" /></a><br />
+<a href="/sigcse2010/attendees/kidscamp/103.jpg" rel="lightbox[kidscamp]" title="Using Alice"><img src="/sigcse2010/attendees/kidscamp/thumbs/103.jpg" class="bookImg" /></a><br />
+ <a href="/sigcse2010/attendees/kidscamp/108.jpg" rel="lightbox[kidscamp]" title="Wearing Pirate Hats (last year's theme)"><img src="/sigcse2010/attendees/kidscamp/thumbs/108.jpg" class="bookImg" /></a><br />
+ <a href="/sigcse2010/attendees/kidscamp/DSC04920.jpg" rel="lightbox[kidscamp]" title="In our Camp TShirts, on the way to the scavenger hunt"><img src="/sigcse2010/attendees/kidscamp/thumbs/DSC04920.jpg" class="bookImg" /></a><br />
+ <a href="/sigcse2010/attendees/kidscamp/DSC04924.jpg" rel="lightbox[kidscamp]" title="Scavenger Hunt - 'That way!'"><img src="/sigcse2010/attendees/kidscamp/thumbs/DSC04924.jpg" class="bookImg" /></a><br />
+ <a href="/sigcse2010/attendees/kidscamp/DSC04930.jpg" rel="lightbox[kidscamp]" title="Collecting goodies on the scavenger hunt"><img src="/sigcse2010/attendees/kidscamp/thumbs/DSC04930.jpg" class="bookImg" /></a><br />
+ <a href="/sigcse2010/attendees/kidscamp/DSC04935.jpg" rel="lightbox[kidscamp]" title="In our Camp T-shirts on the scavenger hunt"><img src="/sigcse2010/attendees/kidscamp/thumbs/DSC04935.jpg" class="bookImg" /></a></br/>
+ <a href="/sigcse2010/attendees/kidscamp/DSC04947.jpg" rel="lightbox[kidscamp]" title="Looking good on cycle"><img src="/sigcse2010/attendees/kidscamp/thumbs/DSC04947.jpg" class="bookImg" /></a><br />
+ <a href="/sigcse2010/attendees/kidscamp/DSC04949.jpg" rel="lightbox[kidscamp]" title="Just posing, no actual motocycle riding!"><img src="/sigcse2010/attendees/kidscamp/thumbs/DSC04949.jpg" class="bookImg" /></a><br />
+ <a href="/sigcse2010/attendees/kidscamp/DSC04958.jpg" rel="lightbox[kidscamp]" title="On the exhibit floor, during scavenger hunt"><img src="/sigcse2010/attendees/kidscamp/thumbs/DSC04958.jpg" class="bookImg" /></a><br />
+ <a href="/sigcse2010/attendees/kidscamp/DSC04959.jpg" rel="lightbox[kidscamp]" title="Fun for all ages!"><img src="/sigcse2010/attendees/kidscamp/thumbs/DSC04959.jpg" class="bookImg" /></a><br />
+ <a href="/sigcse2010/attendees/kidscamp/DSC04966.jpg" rel="lightbox[kidscamp]" title="Kodu with our MS liaison"><img src="/sigcse2010/attendees/kidscamp/thumbs/DSC04966.jpg" class="bookImg" /></a><br />
+ <a href="/sigcse2010/attendees/kidscamp/DSC04971.jpg" rel="lightbox[kidscamp]" title="Using Kodu, from our sponsor Microsoft"><img src="/sigcse2010/attendees/kidscamp/thumbs/DSC04971.jpg" class="bookImg" /></a><br />
+ <a href="/sigcse2010/attendees/kidscamp/DSC04984.jpg" rel="lightbox[kidscamp]" title="Thumbs up for lunch"><img src="/sigcse2010/attendees/kidscamp/thumbs/DSC04984.jpg" class="bookImg" /></a>
+</td></tr>
+</table>
+
+
<?php include("../parts/middle.php"); ?>
<?php include("../parts/attendees_right.php"); ?>
<?php
$updated = filemtime( $_SERVER["SCRIPT_FILENAME"] );
include("../parts/footer.php");
?>
diff --git a/attendees/kidscamp/097.jpg b/attendees/kidscamp/097.jpg
new file mode 100644
index 0000000..9b6bab1
Binary files /dev/null and b/attendees/kidscamp/097.jpg differ
diff --git a/attendees/kidscamp/103.jpg b/attendees/kidscamp/103.jpg
new file mode 100644
index 0000000..d2b54ed
Binary files /dev/null and b/attendees/kidscamp/103.jpg differ
diff --git a/attendees/kidscamp/108.jpg b/attendees/kidscamp/108.jpg
new file mode 100644
index 0000000..2ec2401
Binary files /dev/null and b/attendees/kidscamp/108.jpg differ
diff --git a/attendees/kidscamp/DSC04920.jpg b/attendees/kidscamp/DSC04920.jpg
new file mode 100644
index 0000000..4839a1a
Binary files /dev/null and b/attendees/kidscamp/DSC04920.jpg differ
diff --git a/attendees/kidscamp/DSC04924.jpg b/attendees/kidscamp/DSC04924.jpg
new file mode 100644
index 0000000..8ec27f0
Binary files /dev/null and b/attendees/kidscamp/DSC04924.jpg differ
diff --git a/attendees/kidscamp/DSC04930.jpg b/attendees/kidscamp/DSC04930.jpg
new file mode 100644
index 0000000..4547ecb
Binary files /dev/null and b/attendees/kidscamp/DSC04930.jpg differ
diff --git a/attendees/kidscamp/DSC04935.jpg b/attendees/kidscamp/DSC04935.jpg
new file mode 100644
index 0000000..45ee2c2
Binary files /dev/null and b/attendees/kidscamp/DSC04935.jpg differ
diff --git a/attendees/kidscamp/DSC04947.jpg b/attendees/kidscamp/DSC04947.jpg
new file mode 100644
index 0000000..48a7a12
Binary files /dev/null and b/attendees/kidscamp/DSC04947.jpg differ
diff --git a/attendees/kidscamp/DSC04949.jpg b/attendees/kidscamp/DSC04949.jpg
new file mode 100644
index 0000000..a7b30a1
Binary files /dev/null and b/attendees/kidscamp/DSC04949.jpg differ
diff --git a/attendees/kidscamp/DSC04958.jpg b/attendees/kidscamp/DSC04958.jpg
new file mode 100644
index 0000000..b501809
Binary files /dev/null and b/attendees/kidscamp/DSC04958.jpg differ
diff --git a/attendees/kidscamp/DSC04959.jpg b/attendees/kidscamp/DSC04959.jpg
new file mode 100644
index 0000000..a9f5be7
Binary files /dev/null and b/attendees/kidscamp/DSC04959.jpg differ
diff --git a/attendees/kidscamp/DSC04966.jpg b/attendees/kidscamp/DSC04966.jpg
new file mode 100644
index 0000000..2f6198a
Binary files /dev/null and b/attendees/kidscamp/DSC04966.jpg differ
diff --git a/attendees/kidscamp/DSC04971.jpg b/attendees/kidscamp/DSC04971.jpg
new file mode 100644
index 0000000..50b133d
Binary files /dev/null and b/attendees/kidscamp/DSC04971.jpg differ
diff --git a/attendees/kidscamp/DSC04984.jpg b/attendees/kidscamp/DSC04984.jpg
new file mode 100644
index 0000000..f9236e9
Binary files /dev/null and b/attendees/kidscamp/DSC04984.jpg differ
diff --git a/attendees/kidscamp/thumbs/097.jpg b/attendees/kidscamp/thumbs/097.jpg
new file mode 100644
index 0000000..75e965c
Binary files /dev/null and b/attendees/kidscamp/thumbs/097.jpg differ
diff --git a/attendees/kidscamp/thumbs/103.jpg b/attendees/kidscamp/thumbs/103.jpg
new file mode 100644
index 0000000..cacb922
Binary files /dev/null and b/attendees/kidscamp/thumbs/103.jpg differ
diff --git a/attendees/kidscamp/thumbs/108.jpg b/attendees/kidscamp/thumbs/108.jpg
new file mode 100644
index 0000000..4e115cf
Binary files /dev/null and b/attendees/kidscamp/thumbs/108.jpg differ
diff --git a/attendees/kidscamp/thumbs/DSC04920.jpg b/attendees/kidscamp/thumbs/DSC04920.jpg
new file mode 100644
index 0000000..7ab9d3f
Binary files /dev/null and b/attendees/kidscamp/thumbs/DSC04920.jpg differ
diff --git a/attendees/kidscamp/thumbs/DSC04924.jpg b/attendees/kidscamp/thumbs/DSC04924.jpg
new file mode 100644
index 0000000..a5e0119
Binary files /dev/null and b/attendees/kidscamp/thumbs/DSC04924.jpg differ
diff --git a/attendees/kidscamp/thumbs/DSC04930.jpg b/attendees/kidscamp/thumbs/DSC04930.jpg
new file mode 100644
index 0000000..e89ef7f
Binary files /dev/null and b/attendees/kidscamp/thumbs/DSC04930.jpg differ
diff --git a/attendees/kidscamp/thumbs/DSC04935.jpg b/attendees/kidscamp/thumbs/DSC04935.jpg
new file mode 100644
index 0000000..4da4368
Binary files /dev/null and b/attendees/kidscamp/thumbs/DSC04935.jpg differ
diff --git a/attendees/kidscamp/thumbs/DSC04947.jpg b/attendees/kidscamp/thumbs/DSC04947.jpg
new file mode 100644
index 0000000..751d516
Binary files /dev/null and b/attendees/kidscamp/thumbs/DSC04947.jpg differ
diff --git a/attendees/kidscamp/thumbs/DSC04949.jpg b/attendees/kidscamp/thumbs/DSC04949.jpg
new file mode 100644
index 0000000..3d49d4b
Binary files /dev/null and b/attendees/kidscamp/thumbs/DSC04949.jpg differ
diff --git a/attendees/kidscamp/thumbs/DSC04958.jpg b/attendees/kidscamp/thumbs/DSC04958.jpg
new file mode 100644
index 0000000..65a14b5
Binary files /dev/null and b/attendees/kidscamp/thumbs/DSC04958.jpg differ
diff --git a/attendees/kidscamp/thumbs/DSC04959.jpg b/attendees/kidscamp/thumbs/DSC04959.jpg
new file mode 100644
index 0000000..345b892
Binary files /dev/null and b/attendees/kidscamp/thumbs/DSC04959.jpg differ
diff --git a/attendees/kidscamp/thumbs/DSC04966.jpg b/attendees/kidscamp/thumbs/DSC04966.jpg
new file mode 100644
index 0000000..843cf32
Binary files /dev/null and b/attendees/kidscamp/thumbs/DSC04966.jpg differ
diff --git a/attendees/kidscamp/thumbs/DSC04971.jpg b/attendees/kidscamp/thumbs/DSC04971.jpg
new file mode 100644
index 0000000..7e7f8fd
Binary files /dev/null and b/attendees/kidscamp/thumbs/DSC04971.jpg differ
diff --git a/attendees/kidscamp/thumbs/DSC04984.jpg b/attendees/kidscamp/thumbs/DSC04984.jpg
new file mode 100644
index 0000000..1e94e37
Binary files /dev/null and b/attendees/kidscamp/thumbs/DSC04984.jpg differ
diff --git a/attendees/supporter_sessions.php b/attendees/supporter_sessions.php
index a904df4..158b09b 100644
--- a/attendees/supporter_sessions.php
+++ b/attendees/supporter_sessions.php
@@ -1,193 +1,190 @@
<?php
$title = "SIGCSE 2011 - Supporter Sessions";
$menu = "attendees";
include("../parts/top.php");
?>
<h1>SIGCSE 2011 Supporter Sessions</h1>
<div class="SectionHeader" style="clear:left;"><div class="Full">
<h2>SIGCSE 2011 Supporter Sessions</h2>
</div></div>
<ul>
<li><strong>Thursday, March 10, 2011</strong><ul>
<li>10:45 - 12:00 - <a href="#microsoft">Microsoft</a></li>
<li>1:45 - 3:00 - <a href="#intel">Intel</a></li>
<li>1:45 - 3:00 - <a href="#aws">Amazon Web Services</a></li>
<li>3:45 - 5:00 - <a href="#ibm">IBM</a></li>
</ul></li>
<li><strong>Friday, March 11, 2011</strong><ul>
<li>10:45 - 12:00 - <a href="#microsoft">Microsoft</a></li>
<li>1:45 - 3:00 - <a href="#intel">Intel</a></li>
<li>1:45 - 3:00 - <a href="#google">Google</a></li>
<li>3:45 - 5:00 - <a href="#microsoft">Microsoft</a></li>
<li>3:45 - 5:00 - <a href="#google">Google</a></li>
</ul></li>
- <li><strong>Saturday, March 12, 2011</strong><ul>
- <li>10:55 - 12:10</li>
- </ul></li>
</ul>
<div class="SectionHeader"><div class="Full">
<h2><a name="google">Google</a></h2>
</div></div>
<p><ul><li>Friday, March 11, 2011 - 1:45pm to 3:00pm</li>
<li>Friday, March 11, 2011 - 3:45pm to 5:00pm</li></ul></p>
<p>
<img src="/sigcse2011/images/logos/sponsors/google.png" align="left" class="headshot" />
<strong>Googleâs Education Initiatives in 2011</strong><br/>
<em>Friday, March 11th - 1:45 - 3:00pm</em><br/>
<br/>
Google believes that all students should have the opportunity to
become active creators of tomorrow's technology. Our goal is to
leverage Google's strengths and infrastructure to increase access to
high-quality, open educational content and technology in science,
engineering, and math. We support access to computing curriculum and
educational technology for all students, leveling the playing field so
that students and educators alike have the opportunity to shape the
technologies of their future.<br/>
<br/>
During this session we will share what Google Education is planning
for 2011 and how CS educators can use the following Google programs to
inspire their students:
<ul>
<li>App Inventor for Android</li>
<li>Google Summer of Code</li>
<li>Computer Science 4 High School (CS4HS)</li>
<li>Computational Thinking</li>
</ul>
</p>
<p><strong>Talk in Depth with Representatives from Googleâs Education Programs</strong>
<em>Friday, March 11th - 3:45 - 5:00pm</em><br/> <br/>
Google supports access to computing curriculum and educational
technology for all students, leveling the playing field so that
students and educators alike have the opportunity to shape the
technologies of their future. The creators of tomorrow's innovations
are everywhere, ready to be engaged and inspired.<br/> <br/>
This session will be your opportunity to talk in depth with Google
representatives from key Google CS education programs. Weâll also
share material from other Google education programs and provide an
opportunity to explore how, together, we can inspire students to shape
the technologies of tomorrow. Representatives from the following
programs will be present:
<ul>
<li>App Inventor for Android</li>
<li>Google Summer of Code</li>
<li>Computer Science 4 High School (CS4HS)</li>
<li>Computational Thinking</li>
<li>Others TBD</li>
</ul></p>
<p><strong>Google Beer and Wine Reception</strong><br/>
<em>Friday, March 11th - 5:00pm - 6:00pm</em><br/> <br/>
After a great time thinking about how to reach out and take CS education to the next level, come continue the conversation over a drink and some hors d'oeuvre on Google!</p>
<div class="SectionHeader"><div class="Full">
<h2><a name="intel">Intel</a></h2>
</div></div>
<p><ul><li>Thursday, March 10, 2011 - 1:45pm to 3:00pm</li>
<li>Friday, March 11, 2011 - 1:45pm to 3:00pm</li></ul></p>
<p>
<img src="/sigcse2011/images/logos/sponsors/intel.png" align="left" class="headshot" />
<strong>Intel Academic Community â Global MeeGo University ProgramMeeGo</strong><br/>
Speaker: Selwyn You - Intel Corporation, Jukka Heikkilä - University of Jyväskylä, Russel J Clark and Matthew Wolf - Georgia Institute of Technology<br/>
<em>Thursday, March 10: 1:45pm - 3:00pm</em><br/> <br/>
Have you heard the buzz about MeeGo? The newly formed MeeGo Operating System-a combination of Intelâs Moblin and Nokiaâs Maemo-provides a unified development environment for developers with worldwide distribution channels to consumers.<br/> <br/>
Learn how Intelâs Global MeeGo University program can help you integrate application development on netbooks, tablets, and smartphones into your curricula. Professors from the University of Jyväskylä and Georgia Institute of Technology will share insight into classroom modules that meet demand for rich application development on client devices. They will also share student feedback, in addition to how, why, and when you should start introducing MeeGo to your students.</p>
<p><strong>Case Study - Using the Intel Manycore Testing Lab to Test and Scale Applications</strong><br/>
Speaker Name: Bob Chesebrough, Innovative Software Education, Intel<br/>
<em>Friday March 11 - 1:45pm - 3:00pm</em><br/> <br/>
Expand your students' learning experiences with the Intel® Manycore Testing Lab-a unique, global, remote-access facility made available at no charge to members of the Intel Academic Community. The Intel Manycore Testing lab can be used to test, validate, and improve the scalability of classroom labs, homework, and capstone projects. The lab supports both Linux* and Microsoft Windows* with a 32-CPU/64-thread development environment, including up-to-date, essential performance tools to assist professors and their students.
<br/> <br/>
Bob Chesebrough will demonstrate a command-line ray tracer application created by Master's degree student Dave Frogley. The application was tested, scaled, and tuned on the Intel Manycore Testing Lab. Discussions will include scaling methodologies and state-of-the-art software tools. Bob Chesebrough is a senior course architect in Intel's Innovative Software Education department.
</p>
<div class="SectionHeader"><div class="Full">
<h2><a name="microsoft">Microsoft</a></h2>
</div></div>
<p><ul><li>Thursday, March 10, 2011 - 10:45am to 12:00pm</li>
<li>Friday, March 11, 2011 - 10:45am to 12:00pm</li>
<li>Friday, March 11, 2011 - 3:45pm to 5:00pm</li></ul></p>
<p>
<img src="/sigcse2011/images/logos/sponsors/microsoft.png" align="left" class="headshot" />
<strong>F# - From Foundations to Modern Parallel and Data Rich Functional Programming</strong><br/>
Speakers: Don Syme (Microsoft Research, Cambridge) and Nigel Horspool tbc (University of Victoria)<br/>
<em>Thursday, March 10, 2011 - 10:45am to 12:00pm</em><br/>
<br/>
F# is a multi-paradigm programming language, targeting the .NET/Mono platforms. F# brings you type safe, succinct, efficient and expressive functional programming language supporting both the imperative and object-oriented programming disciplines. It is a simple and pragmatic language, and has particular strengths in data-oriented programming, parallel I/O programming, parallel CPU programming, scripting and algorithmic development. F# combines the advantages of typed functional programming with a high-quality, well-supported modern runtime system and set of libraries. This tutorial will teach F# from several angles:
<ul>
<li>F# as a cross platform language for teaching, including using F# on Windows, Macs, with Linux and MonoDevelop, and on the TryF# system</li>
<li>The advanced features of F#, including asynchronous and parallel programming and units of measure</li>
<li>F# type providers and their applications to strongly typed programming with web ontologies</li>
<li>F# as a modern data programming environment, including writing data-rich phone applications</li>
</ul>
Attendees should come away with a good idea of the utility and power of F# in the classroom context, and its use all the way up to postgraduate and research level.</p>
<p>
<strong>PexForFun - Programming Exercises and Automatic Grading in the Cloud</strong><br/>
Speakers: Peli de Halleux and Nikolai Tillmann, Microsoft Research, Redmond<br/>
<em>Friday, March 11, 2011 - 10:45am to 12:00pm</em><br/> <br/>
PexForFun can be used to learn software programming at many levels, from high school all the way through graduate courses. With PexForFun, the student edits the code in any browser and we execute it and analyze it for you in the cloud. PexForFun supports C#, VisualBasic and F#. Because Pex4Fun has Intellisense, learning the syntax is not an obstacle for beginners. PexForFun finds interesting and unexpected input values that help students understand what their code is actually doing. Under the hood, PexForFun uses dynamic symbolic execution to thoroughly explore feasible execution paths. The real fun starts with Coding Duels where the student has to write code that implements a specification. PexForFun finds any discrepancies between the studentâs code and the specification. PexForFun connects teachers, curriculum authors and students in a unique social experience, tracking and streaming progress updates in real time. Enough said, try it for yourself at <a href="http://pex4fun.com/">http://pex4fun.com/</a> and come and hear about it at this tutorial, given by the authors of the system.
</p>
<p><strong>Microsoft .NET Gadgeteer: A new way to create electronic devices</strong><br/>
Presenter: Nicolas Villar<br/>
<em>Friday, March 11, 2011 - 3:45pm to 5:00pm</em><br/> <br/>
Getting started building embedded devices is complex involving both programming and electronics skills either limiting the students able to be successful or limiting the complexity of the projects that they can undertake. With the Microsoft .NET Gadgeteer, someone with basic programming skills can be building sophisticated projects in a fraction of the time. <br/> <br/>
Microsoft .NET Gadgeteer is a toolkit for building small electronic devices built on Microsoft .NET Micro Framework and the Microsoft Visual Studio development environment. It combines the advantages of object-oriented programming, solderless assembly of electronics with a kit of peripherals, and support for quick physical form factor design using computer-aided design. This powerful combination allows embedded and handheld devices to be iteratively designed, built and programmed in a matter of hours rather than days or weeks. Microsoft .NET Gadgeteer has been developed by Microsoft Research in collaboration with the .NET Micro Framework product team, and is in the process of being made available to the public an open-source project.<br/> <br/>
This session will provide an overview of the various hardware and software elements of the .NET Gadgeteer platform. Attendees will be introduced to the modular electronics system, and learn how individual modules can be connected together to build sophisticated devices. They will learn about how .NET Gadgeteer devices can be programmed easily using the C# language, and interactively debugged Visual Studio IDE. Finally, the session will demonstrate how the toolkit supports the design of custom enclosures for .NET Gadgeteer projects, which can be built on demand by using 3D-printing technologies.</p>
<div class="SectionHeader"><div class="Full">
<h2><a name="aws">Amazon Web Services</a></h2>
</div></div>
<p>Thursday, March 10, 2011 - 1:45pm - 3:00pm</p>
<p><img src="/sigcse2011/images/logos/sponsors/aws.jpg" align="left" class="headshot" />
<strong>Software as a Service, Cloud Computing, and Software Education</strong><br/>
Speaker: Armando Fox<br/>
<br/>
UC Berkeley leverages the combination of cloud computing and Software as a Service (SaaS), with its emphasis on productively creating well-tested, maintainable, reusable code, to let "one-pizza" teams of Berkeley undergrads design, develop, test, and deploy their own SaaS applications. Iteration-based agile development rewards regular progress, test-first design results in students actually enjoying testing, and cloud computing showcases deployed projects to friends, colleagues, and future employers, all while students absorb "big ideas" such as higher-order programming and metaprogramming. I'll also discuss other uses of cloud computing at Berkeley from lower-division through graduate CS courses.<br/>
<br/>
Armando Fox is an Adjunct Professor at UC Berkeley, a co-author of "Above the Clouds: A Berkeley View of Cloud Computing", and a researcher at the intersection of cloud computing, machine learning, and parallel computing.</p>
<div class="SectionHeader"><div class="Full">
<h2><a name="ibm">IBM</a></h2>
</div></div>
<p>Thursday, March 10, 2011: 3:45pm to 5:00pm</p>
<p>
<img src="/sigcse2011/images/logos/sponsors/ibm.png" align="left" class="headshot" />
<strong>Can Students Really Develop Software Collaboratively?</strong><br/>Speaker: Brian Schimpf<br/>
</br/>
In the "real world" of software development, developers rarely work on a project alone.
Development has become a "team sport" with accepted rules, best practices, and preferred
tools. However, too often, students graduate only knowing how to develop code as an individual
- not as part of a team. With IBM's Rational Team Concert (free for classroom use from IBM's
Academic Initiative) students can work in a real-world team development scenario -- each with
different roles on the team. Work items can be sized and assigned to each team member,
and anyone can view real-time status and project health. Even better, professors can use the
dashboards and reports to view each student's contribution to the project to help them assess
each student individually.</p>
<?php include("../parts/middle.php"); ?>
<?php include("../parts/attendees_right.php"); ?>
<?php
$updated = filemtime( $_SERVER["SCRIPT_FILENAME"] );
include("../parts/footer.php");
?>
diff --git a/css/master.css b/css/master.css
index 78d7177..727fb91 100644
--- a/css/master.css
+++ b/css/master.css
@@ -1,611 +1,616 @@
body {
color: #999999;
background: #222222;
margin: 0;
padding: 0;
font: normal 12px/1.5em "Helvetica Neue", "Lucida Grande", "Helvetica Neue", Arial, sans-serif;
min-width: 1000px;
}
a {
text-decoration: underline;
}
a:hover {
color: #aaa0a0;
}
.clear:after {
content: ".";
display: block;
height: 0;
clear: both;
visibility: hidden;
}
div#container {
min-width: 1000px;
margin: 0 auto 0 auto;
text-align: left;
}
div#headercontainer {
width: auto;
margin: 0 auto;
padding: 0 15px 0 0;
border-bottom: 2px solid #666666;
background: url(/sigcse2011/logo/dallas.jpg) no-repeat top center #000000;
display: block;
height: 250px;
}
div#headercontainer a {
color: #ffffff;
}
div#headertitle {
float: left;
width: 50%;
margin-top: 5px;
margin-left: 25px;
}
div#headertitle h1 {
color: #ffffff;
margin: 0 0 0 30px;
}
div#headertitle h4 {
color: #aaaaaa;
margin: 0 0 0 30px;
}
div#headerright {
margin-left: 50%;
padding-top: 15px;
padding-right: 15px;
}
div#userinfo {
padding: 10px;
margin-bottom: 10px;
/* background: #FF0017; /* #4D6D84; */
color: #ffffff;
/* filter:alpha(opacity=60);
-moz-opacity:0.6;
-khtml-opacity: 0.6;
opacity: 0.6;
*/
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
border-radius: 5px;
height: 100px;
display: block;
min-width: 375px;
font-size: 14px;
}
div#userinfo .loginInfo {
display: block;
margin-bottom: 10px;
overflow: hidden;
white-space: nowrap;
z-index: 0;
padding-right: 100px;
}
+.contentFloat {
+ float: left;
+ margin: 15px;
+}
+
img.floatLeft {
float: left;
margin: 15px;
}
img.floatRight {
float: right;
margin: 15px;
}
.imgRight {
float: right;
padding-left: 20px;
}
img.headshot {
padding: 0 15px 15px 15px;
}
.noborder {
border: none;
}
img#avatar {
float: left;
border: 2px solid #aaaaaa;
margin-right: 5px;
}
div#userinfo a {
color: #ffffff;
text-decoration: underline;
}
div#userinfo .courses {
display: block;
}
div#signout {
float: right;
}
#userinfo {
position: relative;
margin-left: 70px;
}
div#subnav {
background: #AAAAAA;
width: 100%;
border-bottom: 2px solid #666666;
color: #000000;
text-align: left;
}
div#subnav ul {
display: block;
list-style: none;
margin: 0px auto;
max-width: 900px;
text-align: left;
}
div#subnav li {
display: inline;
float: left;
padding: 6px 6px 6px 6px;
margin: 0px 2px 0 0;
}
div#subnav ul li a#current {
color: #FFFFFF;
background-color: #273A8B;
padding: 6px 6px 6px 6px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
border-radius: 5px;
cursor: pointer;
}
div#subnav ul li a#current:hover {
background-color: #273A8B;
}
div#subnav ul li a {
text-decoration: none;
color: #000000;
background-color: #AAAAAA;
padding: 6px 6px 6px 6px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
border-radius: 5px;
cursor: pointer;
}
div#subnav ul li a:hover {
text-decoration: none;
color: #FFFFFF;
background-color: #FF0017;
}
div#navigation {
background: #FFFFFF;
width: 100%;
border-bottom: 2px solid #666666;
color: #000000;
text-align: left;
}
div#navigation ul {
display: block;
list-style: none;
margin: 0px auto;
max-width: 900px;
text-align: left;
}
div#navigation li {
display: inline;
float: left;
padding: 6px 6px 6px 6px;
margin: 0px 2px 0 0;
}
div#navigation ul li a#current {
color: #ffffff;
background-color: #273A8B;
padding: 6px 6px 6px 6px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
border-radius: 5px;
cursor: pointer;
}
div#navigation ul li a#current:hover {
background-color: #273A8B;
}
div#navigation ul li a {
text-decoration: none;
color: #000000;
background-color: #FFFFFF;
padding: 6px 6px 6px 6px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
border-radius: 5px;
cursor: pointer;
}
div#navigation ul li a:hover {
text-decoration: none;
color: #ffffff;
background-color: #FF0017;
}
div#content {
margin: 5px 15px 15px 20px;
padding: 15px 15px 15px 20px;
background: #FFFFFF;
color: #000000;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
border-radius: 5px;
border: 1px solid #000000;
border-bottom: 2px solid #0000FF;
border-right: 2px solid #0000FF;
width: 68%;
float: left;
overflow: auto;
}
div#content p {
clear: both;
}
div#right {
margin: 5px 15px 0 75%;
padding-top: 5px;
}
div#right .rightbox {
background: #bbbbbb;
color: #111111;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
border-radius: 5px;
border: 1px solid #000000;
border-bottom: 2px solid #FF0000;
border-right: 2px solid #FF0000;
display: block;
margin: 0 0 15px 0;
padding: 5px 5px 5px 5px;
}
#content a {
color: #000000;
padding: 1px 1px 1px 1px;
text-decoration: underline;
}
#content a:hover {
color: #ffffff;
-moz-border-radius: 2px;
-webkit-border-radius: 2px;
border-radius: 2px;
background-color: #537186;
}
#right a {
color: #000000;
padding: 1px 1px 1px 1px;
text-decoration: underline;
}
#right a:hover {
color: #ffffff;
-moz-border-radius: 2px;
-webkit-border-radius: 2px;
border-radius: 2px;
background-color: #537186;
}
#printFooter {
margin: 10px;
display: none;
}
#printIcon {
float: right;
display: block;
margin-top: -10px;
}
#printIcon a {
padding: 5px;
text-decoration: none;
}
#footer {
margin-top: 50px;
clear: both;
padding: 25px 1.5em 1.5em;
border-top: 5px solid #000000;
color: #000000;
background-color: #DDDDDD;
font: normal 11px/1.5em "Helvetica Neue", "Lucida Grande", "Helvetica Neue", Arial, sans-serif;
overflow: hidden;
/*
width: 100%;
margin-bottom: 15px;
padding-bottom: 15px;
*/
}
#footerContent {
color: #000000;
display: block;
margin: 15px 10% 20px 10%;
padding: 5px 5px 5px 5px;
}
#footer a {
text-decoration: underline;
color: #000000;
padding: 1px 1px 1px 1px;
}
#footer a:hover {
padding: 1px 1px 1px 1px;
color: #ffffff;
-moz-border-radius: 2px;
-webkit-border-radius: 2px;
border-radius: 2px;
background-color: #537186;
}
.footerCell {
margin: 5px 5px 5px 5px;
padding: 0px 5px 0px 5px;
}
#logo {
width: 180px;
float: left;
}
#footerText {
margin: 5px 15px 0 15px;
}
.instructor {
margin: 4px 0 4px 15px;
width: 100%;
display: block;
}
/** ERRORS **/
#GoodMessage {
background-color: #E2F9E3;
border: 2px solid #00FF33;
border-left: none;
border-right: none;
padding: 2px 20px 2px 10px;
margin: 10px 0px 10px 0px;
color: #000;
}
.GoodMessage {
background-color: #E2F9E3;
border: 2px solid #00FF33;
border-left: none;
border-right: none;
padding: 2px 20px 2px 10px;
margin: 10px 0px 10px 0px;
color: #000;
}
.errorExplanation {
border: 2px solid #ff0000;
padding: 7px;
padding-bottom: 12px;
margin-bottom: 20px;
background-color: #fcf0f0;
}
.errorExplanation h2 {
text-align: left;
font-weight: bold;
padding: 5px 5px 5px 27px;
font-size: 12px;
margin: -7px;
background: #cc0000;
color: #ffffff;
}
.errorExplanation p {
color: #333;
margin-bottom: 0;
padding: 5px;
}
.errorExplanation ul {
margin-left: 30px;
}
.errorExplanation ul li {
font-size: 12px;
list-style: square;
}
/** FORMS **/
#form_area {
font-family: verdana, sans-serif;
}
#form_area br {
clear: left;
}
#form_area p.blockintro {
color: #666;
font-size: 11px;
line-height: 14px;
margin: 0;
}
#form_area table {}
#form_area table td {
font-size: 10px;
}
#form_area table th {
font-size: 10px;
font-weight: normal;
text-align: right;
}
#form_area table th.required {
font-weight: bold;
}
#form_area div.block {
color: #333;
background: #DCDDDE;
margin: 3px 0 25px 0;
padding: 5px;
font-size: 11px;
font-weight: normal;
}
#form_area h2 {
font-size: 14px;
color: #333;
margin-bottom: 10px;
padding: 0;
margin: 0 0 5px 0;
}
#form_area div.action, div.action {
border-top: 2px solid #000;
margin-bottom: 10px;
text-align: right;
padding-top: 8px;
font-size: 12px;
}
#form_area div p {
margin: 0;
}
#form_area label {
float: left;
margin-top: 5px;
margin-right: 10px;
}
#form_area label.required {
font-weight: bold;
}
#form_area .inputText {
margin-top: 10px;
}
#form_area .inputPassword {
margin-top: 10px;
}
#form_area select {
margin-top: 10px;
margin-top: 2px;
}
#form_area textarea {
margin-top: 10px;
clear:right;
}
#form_area textarea.short {
height: 150px;
}
#form_area textarea.tall {
height: 500px;
}
.growable {
border: 1px dashed #f00;
display: block;
}
#form_area a.bottab {
background: #fff;
border: 1px solid #ccc;
border-top: 0;
padding: 4px 10px 4px 25px;
margin-top: 10px;
margin-right: 10px;
}
#form_area a.more { background: #fff url(/sigcse2011/images/layout_add.png) 2% 50% no-repeat;}
#form_area a.less { background: #fff url(/sigcse2011/images/layout_delete.png) 2% 50% no-repeat;}
#form_area radioLabel {
margin-top: 0px;
}
#form_area .dynamicArea {
border: 1px dashed #000;
padding: 5px 5px 5px 5px;
margin: 5px 5px 5px 5px;
}
#form_area .field, .text {
margin-top: 5px;
}
#form_area .submit {
border-top: 2px solid #000;
padding: 8px 0 12px 0;
text-align: right;
}
.sub_form {
margin: 5px 0 0 10px;
padding: 0 0 0 5px;
border-left: 2px solid #1463B4;
}
/** table **/
.forum {
border: 1px solid #666666;
width: 95%;
text-align: center;
}
.forum .poster {
background-color: #84CA82;
border-right: 1px dashed #1463B4;
padding: 2px 4px 2px 4px;
|
mikehelmick/SIGCSE2011-Web-Site
|
23541264f0f839b67ded2c6a3ce12dbc593ce026
|
clarify pre-symposium registration options
|
diff --git a/attendees/pre_symposium_events.php b/attendees/pre_symposium_events.php
index 514248f..71f3e93 100644
--- a/attendees/pre_symposium_events.php
+++ b/attendees/pre_symposium_events.php
@@ -1,206 +1,210 @@
<?php
$title = "SIGCSE 2011 - Pre-Symposium Events";
$menu = "attendees";
include("../parts/top.php");
?>
<h1>SIGCSE 2011 Pre-Symposium Events</h1>
<div class="SectionHeader"><div class="Full">
<h2><a name="csta">CSTA Source Web Repository Cataloging Workshop</a></h2>
</div></div>
<img src="/sigcse2011/images/clock.png" align="absmiddle" />Wednesday, March 9, 2011, 8:00am to 3:00pm.
<p>Chris Stephenson, CSTA Executive Director</p>
<p>Participants will learn how to appropriately review and classify resources submitted for entry in to the
Source Web Repository.</p>
<p>Contact: Christina San Filippo <script>write_email("sanfilippo", "hq.acm.org");</script></p>
<div class="SectionHeader"><div class="Full">
<h2><a name="department_chairs">Department Chairs' Pre-Symposium Workshop</a></h2>
</div></div>
<img src="/sigcse2011/images/clock.png" align="absmiddle" />Wednesday, March 9, 2011, TBA
<p>The Pre-Symposium Workshop for Department Chairs is an opportunity for all department chairs (experienced and inexperienced) to improve their understanding of their duties and their ability to perform them. Participants should also include those interested in becoming department chairs. Four experienced former department chairs will serve as resources for the group as the participants review and discuss the duties of the department chair and explore ways that chairs can do their jobs efficiently and effectively. Some specific discussion topics will include leadership styles, time management, legal issues, academic program assessment, and faculty promotion and tenure.
</p>
<div class="SectionHeader"><div class="Full">
<h2><a name="hawaii">Hawaii - Project companion for cloud-enabled mobile computing courses</a></h2>
</div></div>
<img src="/sigcse2011/images/clock.png" align="absmiddle" />Wednesday, March 9, 2011, 1:00pm - 5:00pm
<p>Microsoft Research's Project Hawaii is an academic outreach and research dissemination project.
The academic goal of Hawaii is to enable graduate and undergraduate university students to gain
understanding and expertise in developing cloud-enabled mobile applications using the Microsoft Mobile
and Cloud infrastructure. Project Hawaii is a collection of cloud services, hosted in Windows Azure;
a Visual Studio 2010 based development SDK and sample application code; a community forum for
exchange of ideas; and, mobile platform hardware (Windows Phone 7). Project Hawaii started in Spring
2010 when it was offered as a pilot project in USC, Duke and Wisconsin-Madison. In Fall 2010 Project
Hawaii was offered in MSU, CMU, Michigan, Maryland, Arkansas, UCSB and Singapore Management U.
Its third offering would be in Spring 2011 in more than 15 schools internationally. Prominent among the
Spring 2011 schools are Stanford, UCSB, Purdue, University College London; to name a few.</p>
<p>In this session Project Hawaii team will provide an overview of the project, with an emphasis on its use
as a project companion for teaching mobile and cloud computing courses. Instructors who have been
associated with Project Hawaii will be invited to talk about their experiences using Hawaii as a course
companion for teaching cloud-enabled mobile computing courses to graduate and undergraduate
computer science and engineering students. Demonstrations of projects by students using Hawaii will be
featured in the demo session.</p>
<div class="SectionHeader"><div class="Full">
<h2><a name="innovativeApproaches">Innovative approaches to introducing Computer Science</a></h2>
</div></div>
<img src="/sigcse2011/images/clock.png" align="absmiddle" />Wednesday, March 9, 2011, 11:00am - 5:30pm
<p>This pre-conference workshop will bring together faculty to discuss
innovative approaches to introducing computer science using novel problem
domains. The innovation may be primarily through pedagogy. For example,
an instructor may use problem-based learning to build a course around
real, domain-specific problems and the techniques necessary to solve
them, rather than addressing a list of topics. Alternatively, a novel
approach may address a new context such as the modeling and analysis of
social networks. The workshop will address approaches that seek to change
the culture and practice of computer science by addressing the pipeline
at its early stages, specifically in introductory college courses in
computer science, mathematics, statistics, and the social and natural
sciences.</p>
<p>More information at <a href="http://harambeenet.org/sigcse11">http://harambeenet.org/sigcse11</a></p>
<p>Organizers and affiliations:
<ul>
<li>Jeff Forbes, Duke University - <script>write_email("jforbes", "duke.edu");</script></li>
<li>Owen Astrachan, Duke University - <script>write_email("ola", "cs.duke.edu");</script></li>
</ul>
</p>
<div class="SectionHeader"><div class="Full">
<h2><a name="womenFaculty">Managing the Academic Career for Women Faculty in Undergraduate Computing Programs</a></h2>
</div></div>
<img src="/sigcse2011/images/clock.png" align="absmiddle" />Wednesday, March 9, 2011, 8:00am - 5:30pm
<p>Women in Computer Science and Engineering (CSE) face particular challenges in pursuing and
maintaining academic careers at primarily undergraduate academic institutions. Women academicians
in CSE typically have few female colleagues to provide critical information about the culture and content
required for successful academic careers. To help this situation, the Computing Research Association
Committee on the Status of Women in Computing Research (CRA-W) will sponsor a career/mentoring
workshop titled "Managing the Academic Career for Women Faculty in Undergraduate Computing
Programs". The day-long workshop, to be held on Wednesday, March 9, will be co-located with the
SIGCSE 2011 conference in Dallas. The goal of the workshop is to provide critical mentoring information
for women at all career levels in undergraduate teaching. The target audiences of the workshop are
pre-tenure faculty and graduate students in Computer Science and Engineering who are interested in an
academic career, as well as post-tenure (senior) faculty seeking to improve their teaching and mentoring
skills.</p>
<p>More information at <a href="http://cra-w.org/ArticleDetails/tabid/77/ArticleID/75/Default.aspx">http://cra-w.org/ArticleDetails/tabid/77/ArticleID/75/Default.aspx</a></p>
<p>
<ul>
<li>Susan Rodger, Duke University - <script>write_email("rodger", "cs.duke.edu");</script></li>
<li>Sheila Castaneda, Clarke University - <script>write_email("Sheila.Castaneda", "clarke.edu");</script></li>
</ul>
</p>
<div class="SectionHeader"><div class="Full">
<h2><a name="new_faculty">New Educators Roundtable</a></h2>
</div></div>
<img src="/sigcse2011/images/clock.png" align="absmiddle" />Wednesday, March 9, 2011, 12:30 - 5:00pm
+<p><em>When registering, this event is available as a single choice or as a combo with another half-day event.</em></p>
<p>New to teaching? Seeking advice and mentorship? Join us at the New Educators Roundtable (NER), a half-day workshop designed to mentor college and university faculty who are new to teaching. We welcome participants from across the entire teaching spectrum: tenure-track faculty at institutions where teaching is central, teaching-track faculty and lecturers, and graduate students who currently teach or are looking forward to an academic career. Come with your questions and concerns, learn from the experiences and best practices of sage elders, and build an international support group for your career.</p>
<p>More information at <a href="http://dave-reed.com/NER">http://dave-reed.com/NER</a></p>
<p><ul>
<li>Julie Zelenski, Stanford University</li>
<li>David Reed, Creighton University</li>
</ul></p>
<div class="SectionHeader"><div class="Full">
<h2><a name="sigcas">Open meeting of the Special Interest Group on Computers and Society (SIGCAS)</a></h2>
</div></div>
<img src="/sigcse2011/images/clock.png" align="absmiddle" />Wednesday, March 9, 2011, 8:00am - 12:00pm
+<p><em>When registering, this event is available as a single choice or as a combo with another half-day event.</em></p>
+
<p>This open meeting of ACM's Special Interest Group on Computers and Society (SIGCAS) is
an opportunity for SIGCAS members and supporters to provide input into the future direction
of the SIG. Particular attention will be paid to issues of interest to SIGCAS members who are
primarily computer science educators.</p>
<p>Organizers and affiliations: SIGCAS, Florence Appel, Saint Xavier University</p>
<div class="SectionHeader"><div class="Full">
<h2><a name="programByDesign">Program by Design: Bootstrap, TeachScheme, ReachJava, and Beyond</a></h2>
</div></div>
<img src="/sigcse2011/images/clock.png" align="absmiddle" />Wednesday, March 9, 2011, 8:00am to 5:30pm
<p>More information at <a href="http://www.programbydesign.org/events/sigcse2011">http://www.programbydesign.org/events/sigcse2011</a></p>
<p>Want to create excitement without sacrificing principles or losing a
clear connection to mainstream CS? Check out Program by Design, which
is what TeachScheme! has grown up to become. See how you can program
animations, the Web, and mobile phone apps from week 1; learn about
the smooth transition to Java; and acquaint yourself with the
middle-school component, used in inner-city after-school programs
nationwide. This one-day workshop gives a detailed overview of the
high-school/college curriculum, including the path to Java. A
late-afternoon session includes demos of different assignments,
discussion of the middle-school program, and a chance to interact with
current users of the curriculum.</p>
<p>Contact: Viera Proulx, <script>write_email("vkp", "ccs.neu.edu");</script></p>
<div class="SectionHeader"><div class="Full">
<h2><a name="alice2.2">Programming with Alice Workshop (Alice 2.2)</a></h2>
</div></div>
<img src="/sigcse2011/images/clock.png" align="absmiddle" />Wednesday, March 9, 2011, 8:00am - 5:30pm
<p>This workshop is intended for teachers who have little or no experience in teaching with Alice. The workshop will provide hands-on experience with learning to use Alice 2.2 and in learning to teach with Alice. Alice 2.2 is a powerful program visualization environment where students are engaged in building virtual worlds to create animations and simple games. Instructional materials, software, and a complimentary copy of the 3rd edition of the text, <em>Learning to Program with Alice</em>, will be provided to each participant.</p>
<p>More information at <a href="http://www.andrew.cmu.edu/user/wpdann/workshops.html">http://www.andrew.cmu.edu/user/wpdann/workshops.html</a></p>
<p>Contact: Wanda Dann, Carnegie-Mellon University<br/>
<script>write_email("wpdann", "andrew.cmu.edu");</script>
<div class="SectionHeader"><div class="Full">
<h2><a name="alice3">Programming with Alice Workshop (Alice 3)</a></h2>
</div></div>
<img src="/sigcse2011/images/clock.png" align="absmiddle" />Wednesday, March 9, 2011, 8:00am - 5:30pm
<p>This workshop is designed for instructors of CS1/AP who are interested in providing a gentle introduction to programming concepts in Alice 3 integral with mediating the transfer of these concepts into Java. The workshop will introduce Alice 3 and a plugin for transitioning from Alice to Java. Alice 3 builds on Alice 2's powerful program visualization technique, enabling students to "see" objects and work with object-oriented programming. Participants will learn how to use Alice 3 to build virtual worlds and how to use this approach in CS1 courses (introductory programming for majors and non-majors and AP CS).</p>
<p>More information at <a href="http://www.andrew.cmu.edu/user/wpdann/workshops.html">http://www.andrew.cmu.edu/user/wpdann/workshops.html</a></p>
<p>Contact: Wanda Dann, Carnegie-Mellon University<br/>
<script>write_email("wpdann", "andrew.cmu.edu");</script>
<div class="SectionHeader"><div class="Full">
<h2><a name="ethics">Teaching Professional Ethics in Computer Science: Tips and Traps</a></h2>
</div></div>
+<p><em>When registering, this event is available as a single choice or as a combo with another half-day event.</em></p>
<img src="/sigcse2011/images/clock.png" align="absmiddle" />Wednesday, March 9, 2011, 1:15pm to 5:30pm
<p>In support of ACM's Commitment to Ethical Professionalism this event is designed to help interested faculty provide students with tools to better understand and resolve the ethical challenges in their professional lives we will present well developed examples and modules which can be used to engage students in the study of applied ethics. We will present materials to be used in a complete computer ethics course and that can be used as examples and exercises in specific technical courses; including case studies, suggested course syllabi, and suggestions for creating and grading assignments.</p>
<p>More information at <a href="https://edocs.uis.edu/kmill2/www/sigcse2011computerEthics.html">https://edocs.uis.edu/kmill2/www/sigcse2011computerEthics.html</a></p>
<p>Organizers and affiliations:
<ul>
<li>Bo Brinkman, Miami University (Ohio)</li>
<li>Don Gotterbarn, East Tennessee State University - <script>write_email("don", "gotterbarn.com");</script></li>
<li>Keith Miller, University of Illinois Springfield</li>
</ul>
<div class="SectionHeader"><div class="Full">
<h2><a name="hfoss">The 3rd Annual Humanitarian FOSS Symposium 2011</a></h2>
</div></div>
<img src="/sigcse2011/images/clock.png" align="absmiddle" />Wednesday, March 9, 2011, 8:30am - 6:00pm
<p>The Third annual HFOSS Education Symposium (<a href="http://www.hfoss.org/hfoss2011">HFOSS 2011</a>), held as a SIGCSE 2011 pre-conference activity (March 9th 2011, Dallas, Texas), aims to bring together educators,
software developers, industry representatives, and students to continue the discussion of how best to
promote HFOSS within undergraduate computing education. Humanitarian FOSS is free and open source
software that contributes in some way to the public good. This year's symposium focuses on applying
HFOSS within the local community -- i.e., in local government, in K-12 education, and in collaboration
with local non-profit organizations. This years keynote speaker is Bryan Sivak, Chief Technology Officer
for the District of Columbia, founding member and advisory board member of Civic Commons. As in
previous years, the symposium will be highly interactive, taking place entirely in plenary sessions. In
addition to the keynote address by Bryan Sivak, the symposium will include a poster session, and panels
on government, K-12 education, and non-profits, made up of invited speakers and participants from
industry, academia, and the non-profit sector.</p>
<p>For more information and registration visit <a href="http://www.hfoss.org/hfoss2011">http://www.hfoss.org/hfoss2011</a></p>
<p>Organizers and affiliations:
<ul>
<li>Ralph Morelli (chair), Trinity College</li>
<li>Trishan de Lanerolle, Trinity College</li>
<li>Danny Krizanc, Wesleyan University</li>
<li>Norman Danner, Wesleyan University</li>
<li>Gary Parker, Connecticut College</li>
<li>Ozgur Izmirli, Connecticut College</li>
<li>Carlos Espinosa, Trinity College</li>
<li>Allen Tucker, Bowdoin College </li>
</ul>
</p>
<br/>
<?php include("../parts/middle.php"); ?>
<?php include("../parts/attendees_right.php"); ?>
<?php
$updated = filemtime( $_SERVER["SCRIPT_FILENAME"] );
include("../parts/footer.php");
?>
diff --git a/attendees/registration.php b/attendees/registration.php
index f39c403..2021a43 100644
--- a/attendees/registration.php
+++ b/attendees/registration.php
@@ -1,53 +1,55 @@
<?php
$title = "SIGCSE 2011 - Registration";
$menu = "attendees";
include("../parts/top.php");
?>
<div id="GoodMessage"><strong>Registration is now open!. Early registration ends January 31, 2011.</strong></div>
<h1>SIGCSE 2011 Registration Gateway</h1>
<div class="SectionHeader"><div class="Full">
<h2>Registration</h2>
</div></div>
<br/>
<p>As with past SIGCSE symposia, we are offering attendees three registration options: On-line, off-line, and on-site. Early registration for SIGCSE members is just $235 for registrations made by January 31, 2011. Details about late registration and many other symposium activity fees are available from our Symposium Fees page.</p>
<p><b>Parents</b>: Interested in bringing your kids to SIGCSE? We will continue the tradition of "Kids' Camp" for fun and educational child care during SIGCSE.</p>
<p><strong>WIN A FREE UPGRADE</strong>: Every attendee that preregisters for SIGCSE 2011 at
the regular conference rate and <a href="accommodations.php">reserves a room at the Sheraton Dallas</a>
will be entered into a drawing to win a complimentary upgrade to a suite.
(Free upgrade drawing not available with exhibits-only, teacher or student
rates.)</p>
<div class="SectionHeader"><div class="Full">
<h2>Online and Offline (Remote) Registration</h2>
</div></div><br/>
+<div class="errorExplanation">In order to register for two half-day <a href="pre_symposium_events.php">pre-symposium events</a> (Wednesday), you must select the combination of the two events that you wish to addend, rather then select the two events individually.</div>
+
<ul>
<li><a href="http://www.regonline.com/sigcse2011">Online Registration</a> via regonline.com</li>
<li>Register by Mail</li>
<ul>
<li><img src="/sigcse2011/images/page_white_acrobat.png" /><a href="/sigcse2011/downloads/RegistrationForm.pdf">Registration Form (PDF)</a></li>
<li><img src="/sigcse2011/images/page_white_word.png" /><a href="/sigcse2011/downloads/RegistrationForm.docx">Registration Form (Microsoft Word - docx format)</a></li>
</ul>
</ul>
<div class="SectionHeader"><div class="Full">
<h2>On-Site Registration</h2>
</div></div><br/>
<div class="errorExplanation">On-site registration times will be available before the symposium begins.</div>
<?php include("../parts/middle.php"); ?>
<?php include("../parts/attendees_right.php"); ?>
<?php
$updated = filemtime( $_SERVER["SCRIPT_FILENAME"] );
include("../parts/footer.php");
?>
diff --git a/authors/panels.php b/authors/panels.php
index aca0d82..ed9bc57 100644
--- a/authors/panels.php
+++ b/authors/panels.php
@@ -1,275 +1,275 @@
<?php
$title = "SIGCSE 2011 - Panel Submission Guidelines";
$menu = "authors";
$submenu = "panels";
$include_submenu = "authors_submenu.php";
include("../parts/top.php");
?> <!-- <h2>Important Dates</h2> -->
<!-- right area -->
<h1>Panel Submission Guidelines</h1>
<div class="errorExplanation">By SIGCSE policy, all panelists are required to register for the conference, and to attend and participate in their panels.</div>
<table width="99%">
<tr>
<td width="50%" align="left" valign="top">
<h3>Contents:</h3>
<ul>
<li><a href="#panel">What Is A Panel?</a></li>
<li><a href="#format">How Should The Proposal Be Formatted?</a></li>
<li><a href="#submit">How Do I Submit My Proposal?</a></li>
<li><a href="#presentation">Presentation Notes</a></li>
</ul>
</td>
<td width="50%" align="center" valign="top">
<div id="GoodMessage">
- <h2><a name="kind">Importand Dates for Panel Submissions</a></h2>
+ <h2><a name="kind">Important Dates for Panel Submissions</a></h2>
<table>
<tr>
<td align="left">Submission Deadline:</td><td align="left" nowrap="nowrap">September 10, 2010</td>
</tr>
<tr><td align="right" colspan="2">
@11:59 p.m. Hawaii-Aleutian Standard Time (HST)</td>
</tr>
<tr>
<td align="left">Author Notification:</td><td align="left">October 24, 2010</td>
</tr>
<tr>
<td align="left">Updates to Panel Title & Presenters:</td><td align="left">November 8, 2010</td>
</tr>
<tr>
<td align="left">Camera-Ready Copy:</td><td align="left">December 6, 2010</td>
</tr>
</table>
</div>
</td>
</tr>
</table>
<div class="SectionHeader"><div class="Full">
<h2><a name="panel">What Is A Panel?</a></h2>
</div></div>
<p>
Panel sessions provide an opportunity for expert panel members
to present their views on a specific topic and then to discuss
these views among themselves and with the audience. Panel
sessions run for 75 minutes. Usually a panel session starts
with a brief introduction of the panel topic and the
participants, followed by short presentations by the
panelists giving their views. The session must allow sufficient
opportunity (about 30 minutes) for an interactive question
and answer period involving both the panelists and the audience.
</p>
<p>
A typical panel will consist of four participants, including the
moderator. Limiting a panel to 4 participants allows
sufficient time for audience questions. Proposals with more
than four panelists <i>must convincingly show</i> that all
panelists will be able to speak, and the audience able to
respond, within the session time.
</p>
<p>
Panel proposal review is not blind. Criteria used in reviewing the
proposals include the likely level of interest of the topic, the
presence of panel members with multiple perspectives on the topic,
and the likelihood that the panel will leave sufficient time for
audience participation.
</p>
<p>
If the proposal is accepted, all presenters listed in the panel
description will be required to register for the conference and
to participate in the session.
</p>
<div class="SectionHeader"><div class="Full">
<h2><a name="format">How Should The Proposal Be Formatted?</a></h2>
</div></div>
<p>
The proposal is limited to two (2) pages that conform to the
<a href="format.php">SIGCSE 2011 Format Instructions</a>
with the following modifications and exceptions:
</p>
<ul>
<li> When providing author information, indicate which
of the panelists is the moderator by placing the word
"Moderator" in parentheses after her/his name.
</li>
<li> Do not include an abstract. Instead, the first section
should be titled <strong>Summary</strong> and should
provide a summary of the panel written by the moderator.
</li>
<li> Subsequent sections should contain the position
statements of each panelist. Title each section by
identifying the author.
</li>
<li> References where appropriate are encouraged, but not
required. If they are included, they should be placed
in a separate section titled <strong>References</strong>
and should follow the formatting guidelines.
</li>
</ul>
<p>
If accepted, the panel description will be allocated two (2)
pages in the conference proceedings and must adhere to the
formatting guidelines specified above. To facilitate
the transition from proposal to camera-ready copy,
it is critical that authors adhere closely to the formatting
specifications and page limits.
</p>
<div class="SectionHeader"><div class="Full">
<h2><a name="submit">How Do I Submit My Proposal?</a></h2>
</div></div>
<p>
Note that you will be required to submit your proposal
electronically.
</p>
<ol>
<li> Write your proposal using the format specified above.
Within the proposal, you must provide Category and
Subject Descriptors, General Terms, and Keywords,
just as paper authors must do. These requirements
are described in more detail in the
<a href="format.php">SIGCSE 2011 Format Instructions</a>.
</li>
<li> Convert your proposal into Adobe PDF format. Refer to our
<a href="creating_pdf.php">Creating Adobe PDF Documents</a>
page for assistance.
</li>
<li> Submit the PDF version of your proposal using the
<a href="http://www.cs.grinnell.edu/~sigcse/sigcse2011/submission.shtml">online Submission Form</a>.
Note that there are several
ways you must categorize your proposal submission in
the online system. These categories are used to select
the reviewers who will evaluate your proposal. Please
select no more than 3 categories to ensure the best
possible match with a reviewer of similar interests
and expertise.
</li>
<li> Please do not wait until the last minute to submit
your documents because that is when everyone else
will be connecting to our server!
</li>
<li> Make note of the proposal ID number and password
assigned to your submission. <strong>You will need them later.</strong>
You will receive an e-mail message confirmation.
Spam filters sometimes trap these
automatically generated messages so you may need
to check your spam trap for the confirmation and later,
acceptance or rejection notification.
</li>
<li> After receiving confirmation, go to the
<a href="http://www.cs.grinnell.edu/~sigcse/sigcse2011/submission.shtml">Author Verification Form</a> to review your submission for accuracy.
Send e-mail to
<script>write_email( "sigcse11-panels", "cs.cmu.edu" );</script> or
<script>write_email( "sigcse11-specials", "cs.cmu.edu" );</script> (Pam Cutter)
if there are any problems.
Warning! Several authors have reported problems viewing
their PDF files using Internet Explorer.
If you experience similar problems, it is best to
download the file and use
<a href="http://www.adobe.com/products/reader/">Acrobat Reader</a>
directly.
</li>
</ol>
<p>
<strong><i>Deadline:</i></strong>
All electronic submissions must be <strong>received</strong>
by <strong class="warning">September 10, 2010</strong>
at 23:59 (11:59 p.m.) Hawaii-Aleutian Standard Time (HST).
</p>
<div class="SectionHeader"><div class="Full">
<h2><a name="presentation">Presentation Notes</a></h2>
</div></div>
<ul>
<li> All presenters must register for the conference.
</li>
<li> Panel sessions are 75 minutes in length. The session
must allow sufficient opportunity (about 30 minutes)
for an interactive question and answer period involving
both the panelists and the audience.
</li>
<li> Plan to attend the speakers' breakfast on the morning
of your presentation. This will serve as a convenient
time for any final coordination of the presenters.
</li>
<li> The conference supplies a projector but not a laptop.
You will need to bring a laptop or arrange to use one
from another attendee.
</li>
<li> Bring a backup copy of your presentation on a USB stick.
This will make it possible for all presenters on a panel
to make their presentations from a single laptop.
We especially encourage you to consolidate your
individual contributions into a single presentation.
This will result in smoother transitions from one speaker
to another.
</li>
<li> Wireless Internet access should be available during
your presentation, but you should, of course, be aware
that there is always potential for failure.
</li>
<li> Arrive at your room at least 10 minutes before the
panel session is scheduled to begin.
</li>
</ul>
<div class="SectionHeader"><div class="Full">
<h2><a name="presentation">Questions</a></h2>
</div></div>
<p>Please contact the SIGCSE 2011 Panels and Special Sessions Chair with your questions:<br/>
<b>Panels and Special Sessions</b><br/>
Pam Cutter<br/>
Kalamazoo College<br />
<script>write_email( "sigcse11-panels", "cs.cmu.edu" );</script></p>
<?php include("../parts/middle.php"); ?>
<?php include("../parts/authors_right.php"); ?>
<?php
$updated = filemtime( $_SERVER["SCRIPT_FILENAME"] );
include("../parts/footer.php");
?>
|
mikehelmick/SIGCSE2011-Web-Site
|
d784e0c555826f4e1f8622a4ebaceffdec807f1e
|
correct section title
|
diff --git a/index.php b/index.php
index e878c04..80d596f 100644
--- a/index.php
+++ b/index.php
@@ -1,93 +1,89 @@
<?php
$title = "SIGCSE 2011 - Home";
$menu = "home";
include("parts/top.php");
?>
<div id="GoodMessage">Dec 6, 2010: <strong><a href="/sigcse2011/attendees/registration.php">Registration is now open</a>!</strong> Early registration ends January 31, 2011.</div>
<div class="SectionHeader"><div class="Full">
<h2>Welcome to SIGCSE 2011</h2>
</div></div>
<p>SIGCSE 2011 continues our long tradition of bringing together colleagues from around the
world to present papers, panels, posters, special sessions, and workshops, and to discuss
computer science education in birds-of-a-feather sessions and informal settings at breaks
and meals. The SIGCSE Technical Symposium addresses problems common among educators working
to develop, implement and/or evaluate computing programs, curricula, and courses.
The symposium provides a forum for sharing new ideas for syllabi, laboratories,
and other elements of teaching and pedagogy, at all levels of instruction.</p>
<p>We encourage participation that addresses our theme, "reaching out". We need to reach out to colleagues in other fields, to develop interdisciplinary courses and research projects that integrate computer science and other fields, which enriches both. We need to reach out to create programs that attract and educate the next generation of computer scientists, especially currently underserved populations. We need to reach out to policy makers, educating them on the importance and promise of our discipline. Finally, we need to reach out to each other, as always sharing our best ideas and experiences with the SIGCSE community. We invite those interested in computer science education and computer science education research to contribute to SIGCSE 2011.</p>
<div class="SectionHeader"><div class="Full">
<h2>Our Venue : Sheraton Dallas Hotel</h2>
</div></div>
<p>All conference activities will be at the Sheraton hotel and its attached conference center. The Sheraton Dallas Hotel and conference center is located at 400 North Olive Street, Dallas, TX 75201. More information can be found on our <a href="/sigcse2011/attendees/accommodations.php">accommodations page</a>.</p>
<div class="SectionHeader"><div class="Full">
<h2>SIGCSE 2011 Supporters</h2>
</div></div>
-<div class="SectionHeader"><div class="Full">
-<h2>SIGCSE 2011 Supporters and Exhibitors</h2>
-</div></div>
-
<table width="100%">
<tr>
<td align="center" valign="top" colspan="5"><h3>Platinum Plus Supporter</h3></td>
</tr>
<tr>
<td> </td>
<?php include("parts/sponsor_microsoft.php"); ?>
<td> </td>
</tr>
<tr>
<td align="center" valign="top" colspan="5"><h3>Platinum Supporters</h3></td>
</tr>
<tr>
<td> </td>
<?php
$sponsors = array("parts/sponsor_google.php", "parts/sponsor_intel.php");
shuffle($sponsors);
$doEcho = true;
foreach ($sponsors as $sponsor) {
include($sponsor);
if ($doEcho) {
echo "<td> </td>";
$doEcho = false;
}
}
?>
<td> </td>
</tr>
<tr>
<td align="center" valign="top" colspan="5"><h3>Gold Supporters</h3></td>
</tr>
<tr>
<td> </td>
<?php
$sponsors = array("parts/sponsor_amazon.php", "parts/sponsor_ibm.php");
shuffle($sponsors);
$doEcho = true;
foreach ($sponsors as $sponsor) {
include($sponsor);
if ($doEcho) {
echo "<td> </td>";
$doEcho = false;
}
}
?>
<td> </td>
</tr>
</table>
<?php include("parts/middle.php"); ?>
<?php include("parts/main_right.php"); ?>
<?php
$updated = filemtime( $_SERVER["SCRIPT_FILENAME"] );
$mainPage = true;
include("parts/footer.php");
?>
\ No newline at end of file
|
mikehelmick/SIGCSE2011-Web-Site
|
9f00dbb6e7db10aad5d08f159d849dc2a361cd8f
|
restore sponsors to home page
|
diff --git a/index.php b/index.php
index 7b2d13d..e878c04 100644
--- a/index.php
+++ b/index.php
@@ -1,93 +1,93 @@
<?php
$title = "SIGCSE 2011 - Home";
$menu = "home";
include("parts/top.php");
?>
<div id="GoodMessage">Dec 6, 2010: <strong><a href="/sigcse2011/attendees/registration.php">Registration is now open</a>!</strong> Early registration ends January 31, 2011.</div>
<div class="SectionHeader"><div class="Full">
<h2>Welcome to SIGCSE 2011</h2>
</div></div>
<p>SIGCSE 2011 continues our long tradition of bringing together colleagues from around the
world to present papers, panels, posters, special sessions, and workshops, and to discuss
computer science education in birds-of-a-feather sessions and informal settings at breaks
and meals. The SIGCSE Technical Symposium addresses problems common among educators working
to develop, implement and/or evaluate computing programs, curricula, and courses.
The symposium provides a forum for sharing new ideas for syllabi, laboratories,
and other elements of teaching and pedagogy, at all levels of instruction.</p>
<p>We encourage participation that addresses our theme, "reaching out". We need to reach out to colleagues in other fields, to develop interdisciplinary courses and research projects that integrate computer science and other fields, which enriches both. We need to reach out to create programs that attract and educate the next generation of computer scientists, especially currently underserved populations. We need to reach out to policy makers, educating them on the importance and promise of our discipline. Finally, we need to reach out to each other, as always sharing our best ideas and experiences with the SIGCSE community. We invite those interested in computer science education and computer science education research to contribute to SIGCSE 2011.</p>
<div class="SectionHeader"><div class="Full">
<h2>Our Venue : Sheraton Dallas Hotel</h2>
</div></div>
<p>All conference activities will be at the Sheraton hotel and its attached conference center. The Sheraton Dallas Hotel and conference center is located at 400 North Olive Street, Dallas, TX 75201. More information can be found on our <a href="/sigcse2011/attendees/accommodations.php">accommodations page</a>.</p>
<div class="SectionHeader"><div class="Full">
<h2>SIGCSE 2011 Supporters</h2>
</div></div>
<div class="SectionHeader"><div class="Full">
<h2>SIGCSE 2011 Supporters and Exhibitors</h2>
</div></div>
<table width="100%">
<tr>
<td align="center" valign="top" colspan="5"><h3>Platinum Plus Supporter</h3></td>
</tr>
<tr>
<td> </td>
- <?php include("../parts/sponsor_microsoft.php"); ?>
+ <?php include("parts/sponsor_microsoft.php"); ?>
<td> </td>
</tr>
<tr>
<td align="center" valign="top" colspan="5"><h3>Platinum Supporters</h3></td>
</tr>
<tr>
<td> </td>
<?php
-$sponsors = array("../parts/sponsor_google.php", "../parts/sponsor_intel.php");
+$sponsors = array("parts/sponsor_google.php", "parts/sponsor_intel.php");
shuffle($sponsors);
$doEcho = true;
foreach ($sponsors as $sponsor) {
include($sponsor);
if ($doEcho) {
echo "<td> </td>";
$doEcho = false;
}
}
?>
<td> </td>
</tr>
<tr>
<td align="center" valign="top" colspan="5"><h3>Gold Supporters</h3></td>
</tr>
<tr>
<td> </td>
<?php
-$sponsors = array("../parts/sponsor_amazon.php", "../parts/sponsor_ibm.php");
+$sponsors = array("parts/sponsor_amazon.php", "parts/sponsor_ibm.php");
shuffle($sponsors);
$doEcho = true;
foreach ($sponsors as $sponsor) {
include($sponsor);
if ($doEcho) {
echo "<td> </td>";
$doEcho = false;
}
}
?>
<td> </td>
</tr>
</table>
<?php include("parts/middle.php"); ?>
<?php include("parts/main_right.php"); ?>
<?php
$updated = filemtime( $_SERVER["SCRIPT_FILENAME"] );
$mainPage = true;
include("parts/footer.php");
?>
\ No newline at end of file
|
mikehelmick/SIGCSE2011-Web-Site
|
1a5bc62fabbfcc769f9a86bb80dfd7547cc67391
|
restore sponsors to home page
|
diff --git a/index.php b/index.php
index 3788692..7b2d13d 100644
--- a/index.php
+++ b/index.php
@@ -1,41 +1,93 @@
<?php
$title = "SIGCSE 2011 - Home";
$menu = "home";
include("parts/top.php");
?>
<div id="GoodMessage">Dec 6, 2010: <strong><a href="/sigcse2011/attendees/registration.php">Registration is now open</a>!</strong> Early registration ends January 31, 2011.</div>
<div class="SectionHeader"><div class="Full">
<h2>Welcome to SIGCSE 2011</h2>
</div></div>
<p>SIGCSE 2011 continues our long tradition of bringing together colleagues from around the
world to present papers, panels, posters, special sessions, and workshops, and to discuss
computer science education in birds-of-a-feather sessions and informal settings at breaks
and meals. The SIGCSE Technical Symposium addresses problems common among educators working
to develop, implement and/or evaluate computing programs, curricula, and courses.
The symposium provides a forum for sharing new ideas for syllabi, laboratories,
and other elements of teaching and pedagogy, at all levels of instruction.</p>
<p>We encourage participation that addresses our theme, "reaching out". We need to reach out to colleagues in other fields, to develop interdisciplinary courses and research projects that integrate computer science and other fields, which enriches both. We need to reach out to create programs that attract and educate the next generation of computer scientists, especially currently underserved populations. We need to reach out to policy makers, educating them on the importance and promise of our discipline. Finally, we need to reach out to each other, as always sharing our best ideas and experiences with the SIGCSE community. We invite those interested in computer science education and computer science education research to contribute to SIGCSE 2011.</p>
<div class="SectionHeader"><div class="Full">
<h2>Our Venue : Sheraton Dallas Hotel</h2>
</div></div>
<p>All conference activities will be at the Sheraton hotel and its attached conference center. The Sheraton Dallas Hotel and conference center is located at 400 North Olive Street, Dallas, TX 75201. More information can be found on our <a href="/sigcse2011/attendees/accommodations.php">accommodations page</a>.</p>
<div class="SectionHeader"><div class="Full">
<h2>SIGCSE 2011 Supporters</h2>
</div></div>
+<div class="SectionHeader"><div class="Full">
+<h2>SIGCSE 2011 Supporters and Exhibitors</h2>
+</div></div>
+
+<table width="100%">
+<tr>
+ <td align="center" valign="top" colspan="5"><h3>Platinum Plus Supporter</h3></td>
+</tr>
+<tr>
+ <td> </td>
+ <?php include("../parts/sponsor_microsoft.php"); ?>
+ <td> </td>
+</tr>
+<tr>
+ <td align="center" valign="top" colspan="5"><h3>Platinum Supporters</h3></td>
+</tr>
+<tr>
+<td> </td>
+<?php
+$sponsors = array("../parts/sponsor_google.php", "../parts/sponsor_intel.php");
+shuffle($sponsors);
+$doEcho = true;
+foreach ($sponsors as $sponsor) {
+ include($sponsor);
+ if ($doEcho) {
+ echo "<td> </td>";
+ $doEcho = false;
+ }
+}
+?>
+<td> </td>
+</tr>
+<tr>
+ <td align="center" valign="top" colspan="5"><h3>Gold Supporters</h3></td>
+</tr>
+<tr>
+<td> </td>
+<?php
+$sponsors = array("../parts/sponsor_amazon.php", "../parts/sponsor_ibm.php");
+shuffle($sponsors);
+$doEcho = true;
+foreach ($sponsors as $sponsor) {
+ include($sponsor);
+ if ($doEcho) {
+ echo "<td> </td>";
+ $doEcho = false;
+ }
+}
+?>
+<td> </td>
+</tr>
+</table>
<?php include("parts/middle.php"); ?>
<?php include("parts/main_right.php"); ?>
<?php
$updated = filemtime( $_SERVER["SCRIPT_FILENAME"] );
$mainPage = true;
include("parts/footer.php");
?>
\ No newline at end of file
|
mikehelmick/SIGCSE2011-Web-Site
|
1f3d26ec1ca130ef62a3c7d0d3e4b3390237d928
|
add microsoft as supporter of kids camp
|
diff --git a/attendees/kids_camp.php b/attendees/kids_camp.php
index e9713d6..cbb187a 100644
--- a/attendees/kids_camp.php
+++ b/attendees/kids_camp.php
@@ -1,69 +1,72 @@
<?php
$title = "SIGCSE 2011 - Kids Camp";
$menu = "attendees";
include("../parts/top.php");
?>
<div class="SectionHeader" style="clear:left;"><div class="Full">
<h2>SIGCSE 2011 Kids Camp</h2>
</div></div>
<p>This year's theme is <strong>Going green!</strong>. The SIGCSE 2010 Kids camp will bel located in the <em>Remington Room</em> (4th floor).</p>
<p>Kids Camp registration is now available! To register your child/children (and to learn more about KiddieCorp, our children's program provider), please visit <a href="https://www.kiddiecorp.com/acmkids.htm">https://www.kiddiecorp.com/acmkids.htm</a>. Instead of on-line registration, you may print, complete, and mail or fax the registration form, provided on the KiddieCorp site, using the contact information provided on the form. A link to this form is available from the KiddieCorp page.</p>
+
+<p><img src="/sigcse2011/images/logos/sponsors/microsoft.png" align="left" class="headshot"/> Computers and t-shirts for Kids Camp are available due to the generous support of Microsoft. Thank you!
+ <br/> <br/> </p>
<h3>Times and Dates:</h3>
<ul><li>Thursday, March 10<ul>
<li>8:00am - 1:00pm</li>
<li>1:00pm - 6:00pm</li>
</ul></li>
<li>Friday, March 11:<ul>
<li>8:00am - 1:00pm</li>
<li>1:00pm - 6:00pm</li>
</ul></li>
<li>Saturday, March 12:<ul>
<li>8:00am - 2:30pm</li>
</ul></li></ul>
<h3>Fees:</h3>
<ul><li>Children 6 months to 2 years:<ul>
<li>Half day: $35 per child</li>
<li>Full day: $56 per child</li>
</li></ul>
<li>Children 3 to 12 years:<ul>
<li>Half day: $30 per child</li>
<li>Full day: $56 per child</li>
</ul></li></ul>
<h3>Frequently Asked Questions</h3>
<ol>
<li><strong>How old/young can my child(ren) be to register?</strong>
<p>Care will be provided for children ages 6 months to 12 yrs. If you have older children who want to attend, please contact us.</p></li>
<li><strong>How much does it cost?</strong>
<p>Great news: our rates are unchanged this year! Like last year the charges are by session:<br/>
<strong>Children 6 months - 2 years:</strong> $35 per child (half day), or $56 per child (full day)<br/>
<strong>Children 3 - 12 years:</strong> $30 per child (half day), or $48 per child (full day)</p></li>
<li><strong>Where will Kids Camp be located?</strong>
<p>Kids Camp is conveniently located in the Remington Room on the fourth floor of the Sheraton Hotel, directly above most conference activities. Visiting your children will be easy, yet they are comfortably away from the main conference traffic. Restrooms are located nearby. You can check out the room here: <a href="http://www.sheratondallashotel.com/capacity-chart">http://www.sheratondallashotel.com/capacity-chart</a>).</p></li>
<li><strong>What will my child(ren) be doing while I am attending the conference?</strong>
<p>SIGCSE Kid Campers will participate in drama, play, and arts & crafts activities. Older kids can participate in our planned computing activities. We have scheduled activity sessions with CS Unplugged, Scratch, and Alice. Student Volunteers will help with the computing activities.</p>
<p>Our planned activities also include:
<ul><li>Computing activities using Microsoft's Kodu</li>
<li>Scavenger hunts on both Thursday and Friday</li>
<li>Daily activites based on our "Going Green!" theme</li>
<li>...and much more!</li></ul></p></li>
<li><strong>What will my children be served for lunch?</strong>
<p>Lunch menu selections are still in planning. Last year's camp menu included entrees of chicken fingers & fries, grilled cheese & fries, macaroni & cheese, and pizza (with 1 topping). Side dishes were celery & carrot sticks, fruit cup, and a selection of whole fruit (apple, banana, orange).</p></li>
<li><strong>Do I need to bring anything for my child(ren)?</strong>
<p>Yes, a change of clothes is strongly recommended for all children. In addition, parents of young children will need to provide any diapers, wipes, baby food, and/or formula and bottles that may be needed.</p></li>
<li><strong>How many childcare providers will be in the rooms?</strong>
<p>Daycare provider ratios will be 1:2 for kids ages 6 months-11 months, 1:3 for kids 1 to 2 years old, 1:5 for ages 3-5 and 1:7 for 6-12 years old.. Student volunteers for the computing activities will be additional helpers and are not included in this ratio.</p></li>
</ol>
<?php include("../parts/middle.php"); ?>
<?php include("../parts/attendees_right.php"); ?>
<?php
$updated = filemtime( $_SERVER["SCRIPT_FILENAME"] );
include("../parts/footer.php");
?>
|
mikehelmick/SIGCSE2011-Web-Site
|
fe5a0da004107a2be8daefc94952f2e981167b01
|
add Piazzza to exhibitors list
|
diff --git a/exhibitors/index.php b/exhibitors/index.php
index 7b50b95..831841f 100644
--- a/exhibitors/index.php
+++ b/exhibitors/index.php
@@ -1,231 +1,232 @@
<?php
$title = "SIGCSE 2011 - Exhibitors and Supporters";
$menu = "exhibitors";
include("../parts/top.php");
?> <!-- <h2>Important Dates</h2> -->
<div class="GoodMessage">
<p>SIGCSE 2011 <a href="/sigcse2011/exhibitors/downloads/SIGCSE_EP11.pdf" target="_blank"> Invitation to Exhibit / Conference Support Opportunities (PDF)</a> |
<a href="http://docs.google.com/viewer?url=http%3A%2F%2Fwww.sigcse.org%2Fsigcse2011%2Fexhibitors%2Fdownloads%2FSIGCSE_EP11.pdf">View online with Google docs Viewer</a>
</p>
</div>
<div class="SectionHeader"><div class="Full">
<h2>Exhibitors and Supporters</h2>
</div></div>
<p>
The Association for Computing Machinery
(<a href="http://www.acm.org">ACM</a>)
Special Interest Group on Computer Science Education
(<a href="http://www.sigcse.org">SIGCSE</a>)
is a community of approximately 2,600 educators and students
possessing a passion for studying and improving the state
of computer science education at all levels.
The annual SIGCSE Technical Symposium is the flagship conference
of our organization, and is attended by approximately
1,300 people. Conference attendees travel from across the globe
to learn new educational techniques, to examine the latest
textbooks, to share ideas with colleagues, to talk with
computing professionals, and to acquire hands-on experience
with new hardware and software, including software development
environments, classroom presentation technologies, on-line
collaboration tools, and robotics.
</p>
<!--
<p>
The exhibit hall hours will be:
</p>
<table style="width: 35%;">
<tbody>
<tr>
<td> </td>
<td style="font-size: 1.0em"> Thursday, March 5th </td>
<td style="font-size: 1.0em"> 10 a.m. - 6 p.m. </td>
</tr>
<tr>
<td> </td>
<td style="font-size: 1.0em"> Friday, March 6th </td>
<td style="font-size: 1.0em"> 10 a.m. - 6 p.m. </td>
</tr>
<tr>
<td> </td>
<td style="font-size: 1.0em"> Saturday, March 7th </td>
<td style="font-size: 1.0em"> 9:30 a.m. - Noon </td>
</tr>
</tbody>
</table>
-->
<div class="SectionHeader"><div class="Full">
<h2>Are You Interested in Becoming a Supporter and/or Exhibitor?</h2>
</div></div>
<ul>
<li>The <a href="/sigcse2011/exhibitors/downloads/SIGCSE_EP11.pdf" target="_blank">SIGCSE 2011 Invitation to Exhibit / Conference Support Opportunities</a> document (PDF; opens in new window) provides details on how your organization can connect with our community. </li>
<li><a href="/sigcse2011/exhibitors/downloads/acm_sigcse_2011_floorplan.pdf">Download the SIGCSE 2011 exhibit hall plan</a> or <a href="http://docs.google.com/viewer?url=http%3A%2F%2Fwww.sigcse.org%2Fsigcse2011%2Fexhibitors%2Fdownloads%2Facm_sigcse_2011_floorplan.pdf">View with Google docs Viewer</a>.</li>
<li>Here are two views of the SIGCSE 2008 Exhibit Hall. The 2011 conference is in a different location, but we hope that these views will give you a sense of what the 2011 exhibition space will look like. (Click on each for a larger version.)</li>
<table border="0" align="center">
<tr>
<td><a href="images/2008Hall01.jpg" rel="lightbox[students]" title="2008 Exhibit Hall"><img src="images/2008Hall01_thumb.jpg" /></a></td>
<td><a href="images/2008Hall02.jpg" rel="lightbox[students]" title="2008 Exhibit Hall"><img src="images/2008Hall02_thumb.jpg" /></a></td>
</tr>
</table>
</ul>
<div class="SectionHeader"><div class="Full">
<h2>SIGCSE 2011 Supporters and Exhibitors</h2>
</div></div>
<table width="100%">
<tr>
<td align="center" valign="top" colspan="5"><h3>Platinum Plus Supporter</h3></td>
</tr>
<tr>
<td> </td>
<?php include("../parts/sponsor_microsoft.php"); ?>
<td> </td>
</tr>
<tr>
<td align="center" valign="top" colspan="5"><h3>Platinum Supporters</h3></td>
</tr>
<tr>
<td> </td>
<?php
$sponsors = array("../parts/sponsor_google.php", "../parts/sponsor_intel.php");
shuffle($sponsors);
$doEcho = true;
foreach ($sponsors as $sponsor) {
include($sponsor);
if ($doEcho) {
echo "<td> </td>";
$doEcho = false;
}
}
?>
<td> </td>
</tr>
<tr>
<td align="center" valign="top" colspan="5"><h3>Gold Supporters</h3></td>
</tr>
<tr>
<td> </td>
<?php
$sponsors = array("../parts/sponsor_amazon.php", "../parts/sponsor_ibm.php");
shuffle($sponsors);
$doEcho = true;
foreach ($sponsors as $sponsor) {
include($sponsor);
if ($doEcho) {
echo "<td> </td>";
$doEcho = false;
}
}
?>
<td> </td>
</tr>
</table>
<div class="SectionHeader"><div class="Full">
<h2>Exhibitors</h2>
</div></div>
<table><tr>
<td valign="top" align="left">
<ul>
<li>ACM SIGADA</li>
<li>ACM-W</li>
<li>AlgoViz.org/ Ensemble Projects</li>
<li>Amazon Web Services</li>
<li>Auburn University</li>
<li>Broadening Participation in Computing</li>
<li>Course Technology Cengage Learning</li>
<li>CRC Press- Taylor & Francis Group LLC</li>
<li>Franklin, Beedle & Associated Incorporated</li>
<li>Google</li>
<li>IBM / Academic Initiative</li>
<li>Intel Corporation</li>
<li>Intersystems Corporation</li>
+ <li>Jones and Bartlett</li>
</ul>
</td>
<td valign="top" align="left">
<ul>
- <li>Jones and Bartlett</li>
<li>LEGO Education, North America</li>
<li>Microsoft</li>
<li>Morgan Kaufmann</li>
<li>NSF</li>
<li>Pearson Higher Education</li>
<li>Research In Motion Corporation</li>
+ <li>Piazzza</li>
<li>RidgeSoft</li>
<li>Springer</li>
<li>The College Board</li>
<li>The MIT Press</li>
<li>Turingâs Craft</li>
<li>Wiley</li>
</ul>
</td></tr></table>
<div class="SectionHeader"><div class="Full">
<h2>In-Kind Donations</h2>
</div></div>
<table><tr>
<td valign="top" align="left"><ul>
<li>Microsoft - Computers and t-shirts for Kids Camp</li>
<li>Morgan Kaufman - Conference bags</li>
<li>Pearson - Lanyards</li>
<li>School of Computer Science, Carnegie Mellon University - Conference signage</li>
<li>Turing's Craft - Student Volunteer T-shirts</li>
<li>UPE - Pizza Party for student volunteers</li>
</ul></td>
<td valign="top" align="left">
</td>
</tr></table>
<div class="SectionHeader"><div class="Full">
<h2>Questions?</h2>
</div></div>
<p>Questions about supporting and exhibiting at SIGCSE 2011 can be
directed to the Exhibit Manager or our Supporter / Exhibitor Liaison.</p>
<h3>Supporter/Exhibitor Liaison</h3>
<p>Prof. Susan Rodger at Duke University is a long time attendee of SIGCSE and
was a Symposium Co-Chair for SIGCSE 2008.<br />
<br />
Email: [email protected]<br />
Phone: 919-660-6595<br />
</p>
<h3>Exhibit Manager</h3>
<p>
Dorothea Heck<br />
D. Lawrence Planners LLC<br />
SIGCSE Exhibition Management<br />
1125 Atlantic Avenue STE 634<br />
Atlantic City, NJ 08401<br />
tel. 609.344.1333 <br />
fax. 609.348.4433<br />
E-mail: <script>write_email( "SIGCSE", "dlplan.com" );</script>
</p>
<?php include("../parts/middle.php"); ?>
<h2>Have a question?</h2>
<p>Find the appropriate SIGCSE 2011
<a href="/sigcse2011/committee/">program committee member</a>
and send us an email.</p>
<?php
$updated = filemtime( $_SERVER["SCRIPT_FILENAME"] );
include("../parts/footer.php");
?>
\ No newline at end of file
|
mikehelmick/SIGCSE2011-Web-Site
|
fb12a82299af56e88cb9ab0c7573d6af15d8e71e
|
add microsoft supporter session, move microsoft to platinum plus supporter
|
diff --git a/attendees/index.php b/attendees/index.php
index a31f5c2..f122f3a 100644
--- a/attendees/index.php
+++ b/attendees/index.php
@@ -1,63 +1,63 @@
<?php
$title = "SIGCSE 2011 - Information for Symposium Attendees";
$menu = "attendees";
$submenu = "cfp";
include("../parts/top.php");
?> <!-- <h2>Important Dates</h2> -->
<div class="SectionHeader" style="clear:left;"><div class="Full">
<h2>Information for SIGCSE 2011 Symposium Attendees</h2>
</div></div>
<p><strong>All conference activities will be at the Sheraton hotel and its attached conference center.</strong> The Sheraton Dallas Hotel and conference center is located at 400 North Olive Street, Dallas, TX 75201. More information can be found on our <a href="/sigcse2011/attendees/accommodations.php">accommodations page</a>.</p>
<table cellspacing="5px" width="100%">
<tr>
<td valign="top" align="left">
<ul>
<li><a href="http://db.grinnell.edu/sigcse/sigcse2011/Program/Program.asp"><img src="/sigcse2011/images/report.png" align="absmiddle" /> Symposium Program</a></li>
<li><a href="/sigcse2011/attendees/keynotes.php"><img src="/sigcse2011/images/user_suit.png" align="absmiddle" /> Keynote Speakers</a></li>
<li><a href="/sigcse2011/attendees/supporter_sessions.php"><img src="/sigcse2011/images/building.png" align="absmiddle"/> Supporter Sessions</a></li>
<li><a href="/sigcse2011/attendees/pre_symposium_events.php"><img src="/sigcse2011/images/calendar.png" align="absmiddle"/> Pre-Symposium Events</a></li>
<li><a href="/sigcse2011/attendees/video_program.php"><img src="/sigcse2011/images/television.png" align="absmiddle"/> Video Program</a></li>
- <li><a href="http://elvis.rowan.edu/~kay/sigcse/rodeo.html"><img src="/sigcse2011/images/bricks.png" align="absmiddle"/> SIGCSE 2011 Robot Hoedown and Rodeo</a> <strong>New!</strong>
+ <li><a href="http://elvis.rowan.edu/~kay/sigcse/rodeo.html"><img src="/sigcse2011/images/bricks.png" align="absmiddle"/> SIGCSE 2011 Robot Hoedown and Rodeo</a> <strong>New for 2011!</strong>
<ul><li><a href="http://elvis.rowan.edu/~kay/sigcse/cfw.html">Call for Wranglers</a></li></ul>
</li>
<li><a href="/sigcse2011/attendees/registration.php"><img src="/sigcse2011/images/vcard_add.png" align="absmiddle"/> Registration</a> <strong>NOW OPEN!</strong>
<ul><li><a href="/sigcse2011/attendees/fees.php"><img src="/sigcse2011/images/money.png" align="absmiddle"/> A Sneak Peak at Fees</a></li></ul>
</li>
<li><a href="/sigcse2011/attendees/pokens.php"><img src="/sigcse2011/images/vcard.png" align="absmiddle"> Pokens: A new way to connect at SIGCSE 2011</a></li>
<li><a href="/sigcse2011/attendees/travel_information.php"><img src="/sigcse2011/images/tag_orange.png" align="absmiddle"/> Travel Information</a></li>
<li><a href="/sigcse2011/attendees/accommodations.php"><img src="/sigcse2011/images/clock.png" align="absmiddle"/> Accommodations</a></li>
<li><a href="http://www.visitdallas.com/WelcomeSIGCSE2011" target="_blank"><img src="/sigcse2011/images/weather_sun.png" align="absmiddle"/> Local Attractions</a> (<em>opens in new window</em>)</li>
<li><a href="/sigcse2011/attendees/kids_camp.php"><img src="/sigcse2011/images/group.png" align="absmiddle"/> Kids Camp</a></li>
<li><a href="/sigcse2011/attendees/visas.php"><img src="/sigcse2011/images/folder_database.png" align="absmiddle"/> Visa Information</a></li>
<li><a href="/sigcse2011/attendees/floor_plans.php"><img src="/sigcse2011/images/map.png" align="absmiddle"/> Floor Plans</a></li>
<li><a href="/sigcse2011/faq/#attendees"><img src="/sigcse2011/images/help.png" align="absmiddle" /> FAQ</a></li>
<!--
<li><a href="/sigcse2011/attendees/reception.php"><img src="/sigcse2011/images/cake.png" align="absmiddle"/> Reception</a></li>
<li><a href="/sigcse2011/attendees/special_projects.php"><img src="/sigcse2011/images/bricks.png" align="absmiddle"/> SIGCSE Special Projects</a></li>
<li><a href="/sigcse2011/attendees/video_program.php"><img src="/sigcse2011/images/television.png" align="absmiddle"/> Video Program</a></li>
<li><a href="/sigcse2011/attendees/k12_highlights.php"><img src="/sigcse2011/images/house.png" align="absmiddle"/> Highlights for K-12 Teachers</a></li>
-->
</ul>
</td>
<td nowrap="nowrap" valign="top" align="right">
<!--
<div style='width: 500px; height: 440px; background-image: url( http://vortex.accuweather.com/adcbin/netweather_v2/backgrounds/fall4_500x440_bg.jpg ); background-repeat: no-repeat; background-color: #DA9375;' ><div id='NetweatherContainer' style='height: 420px;' ><script src='http://netweather.accuweather.com/adcbin/netweather_v2/netweatherV2ex.asp?partner=netweather&tStyle=normal&logo=1&zipcode=75202&lang=eng&size=13&theme=fall4&metric=0&target=_self'></script></div><div style='text-align: center; font-family: arial, helvetica, verdana, sans-serif; font-size: 12px; line-height: 20px; color: #0000FF;' ><a style='color: #0000FF' href='http://www.accuweather.com/us/TX/DALLAS/75202/city-weather-forecast.asp?partner=accuweather&traveler=0' >Weather Forecast</a>Â |Â <a style='color: #0000FF' href='http://www.accuweather.com/maps-satellite.asp' >Weather Maps</a>Â |Â <a style='color: #0000FF' href='http://www.accuweather.com/index-radar.asp?partner=accuweather&traveler=0&zipcode=75202' >Weather Radar</a>Â |Â <a style='color: #0000FF' href='http://hurricane.accuweather.com/hurricane/index.asp' >Hurricane Center</a></div></div>
-->
</td>
</tr>
</table>
<?php include("../parts/middle.php"); ?>
<?php include("../parts/attendees_right.php"); ?>
<?php
$updated = filemtime( $_SERVER["SCRIPT_FILENAME"] );
include("../parts/footer.php");
?>
\ No newline at end of file
diff --git a/attendees/supporter_sessions.php b/attendees/supporter_sessions.php
index 6cc9adc..a904df4 100644
--- a/attendees/supporter_sessions.php
+++ b/attendees/supporter_sessions.php
@@ -1,184 +1,193 @@
<?php
$title = "SIGCSE 2011 - Supporter Sessions";
$menu = "attendees";
include("../parts/top.php");
?>
<h1>SIGCSE 2011 Supporter Sessions</h1>
<div class="SectionHeader" style="clear:left;"><div class="Full">
<h2>SIGCSE 2011 Supporter Sessions</h2>
</div></div>
<ul>
<li><strong>Thursday, March 10, 2011</strong><ul>
<li>10:45 - 12:00 - <a href="#microsoft">Microsoft</a></li>
<li>1:45 - 3:00 - <a href="#intel">Intel</a></li>
<li>1:45 - 3:00 - <a href="#aws">Amazon Web Services</a></li>
<li>3:45 - 5:00 - <a href="#ibm">IBM</a></li>
</ul></li>
<li><strong>Friday, March 11, 2011</strong><ul>
<li>10:45 - 12:00 - <a href="#microsoft">Microsoft</a></li>
<li>1:45 - 3:00 - <a href="#intel">Intel</a></li>
<li>1:45 - 3:00 - <a href="#google">Google</a></li>
+ <li>3:45 - 5:00 - <a href="#microsoft">Microsoft</a></li>
<li>3:45 - 5:00 - <a href="#google">Google</a></li>
</ul></li>
<li><strong>Saturday, March 12, 2011</strong><ul>
<li>10:55 - 12:10</li>
</ul></li>
</ul>
<div class="SectionHeader"><div class="Full">
<h2><a name="google">Google</a></h2>
</div></div>
<p><ul><li>Friday, March 11, 2011 - 1:45pm to 3:00pm</li>
<li>Friday, March 11, 2011 - 3:45pm to 5:00pm</li></ul></p>
<p>
<img src="/sigcse2011/images/logos/sponsors/google.png" align="left" class="headshot" />
<strong>Googleâs Education Initiatives in 2011</strong><br/>
<em>Friday, March 11th - 1:45 - 3:00pm</em><br/>
<br/>
Google believes that all students should have the opportunity to
become active creators of tomorrow's technology. Our goal is to
leverage Google's strengths and infrastructure to increase access to
high-quality, open educational content and technology in science,
engineering, and math. We support access to computing curriculum and
educational technology for all students, leveling the playing field so
that students and educators alike have the opportunity to shape the
technologies of their future.<br/>
<br/>
During this session we will share what Google Education is planning
for 2011 and how CS educators can use the following Google programs to
inspire their students:
<ul>
<li>App Inventor for Android</li>
<li>Google Summer of Code</li>
<li>Computer Science 4 High School (CS4HS)</li>
<li>Computational Thinking</li>
</ul>
</p>
<p><strong>Talk in Depth with Representatives from Googleâs Education Programs</strong>
<em>Friday, March 11th - 3:45 - 5:00pm</em><br/> <br/>
Google supports access to computing curriculum and educational
technology for all students, leveling the playing field so that
students and educators alike have the opportunity to shape the
technologies of their future. The creators of tomorrow's innovations
are everywhere, ready to be engaged and inspired.<br/> <br/>
This session will be your opportunity to talk in depth with Google
representatives from key Google CS education programs. Weâll also
share material from other Google education programs and provide an
opportunity to explore how, together, we can inspire students to shape
the technologies of tomorrow. Representatives from the following
programs will be present:
<ul>
<li>App Inventor for Android</li>
<li>Google Summer of Code</li>
<li>Computer Science 4 High School (CS4HS)</li>
<li>Computational Thinking</li>
<li>Others TBD</li>
</ul></p>
<p><strong>Google Beer and Wine Reception</strong><br/>
<em>Friday, March 11th - 5:00pm - 6:00pm</em><br/> <br/>
After a great time thinking about how to reach out and take CS education to the next level, come continue the conversation over a drink and some hors d'oeuvre on Google!</p>
<div class="SectionHeader"><div class="Full">
<h2><a name="intel">Intel</a></h2>
</div></div>
<p><ul><li>Thursday, March 10, 2011 - 1:45pm to 3:00pm</li>
<li>Friday, March 11, 2011 - 1:45pm to 3:00pm</li></ul></p>
<p>
<img src="/sigcse2011/images/logos/sponsors/intel.png" align="left" class="headshot" />
<strong>Intel Academic Community â Global MeeGo University ProgramMeeGo</strong><br/>
Speaker: Selwyn You - Intel Corporation, Jukka Heikkilä - University of Jyväskylä, Russel J Clark and Matthew Wolf - Georgia Institute of Technology<br/>
<em>Thursday, March 10: 1:45pm - 3:00pm</em><br/> <br/>
Have you heard the buzz about MeeGo? The newly formed MeeGo Operating System-a combination of Intelâs Moblin and Nokiaâs Maemo-provides a unified development environment for developers with worldwide distribution channels to consumers.<br/> <br/>
Learn how Intelâs Global MeeGo University program can help you integrate application development on netbooks, tablets, and smartphones into your curricula. Professors from the University of Jyväskylä and Georgia Institute of Technology will share insight into classroom modules that meet demand for rich application development on client devices. They will also share student feedback, in addition to how, why, and when you should start introducing MeeGo to your students.</p>
<p><strong>Case Study - Using the Intel Manycore Testing Lab to Test and Scale Applications</strong><br/>
Speaker Name: Bob Chesebrough, Innovative Software Education, Intel<br/>
<em>Friday March 11 - 1:45pm - 3:00pm</em><br/> <br/>
Expand your students' learning experiences with the Intel® Manycore Testing Lab-a unique, global, remote-access facility made available at no charge to members of the Intel Academic Community. The Intel Manycore Testing lab can be used to test, validate, and improve the scalability of classroom labs, homework, and capstone projects. The lab supports both Linux* and Microsoft Windows* with a 32-CPU/64-thread development environment, including up-to-date, essential performance tools to assist professors and their students.
<br/> <br/>
Bob Chesebrough will demonstrate a command-line ray tracer application created by Master's degree student Dave Frogley. The application was tested, scaled, and tuned on the Intel Manycore Testing Lab. Discussions will include scaling methodologies and state-of-the-art software tools. Bob Chesebrough is a senior course architect in Intel's Innovative Software Education department.
</p>
<div class="SectionHeader"><div class="Full">
<h2><a name="microsoft">Microsoft</a></h2>
</div></div>
<p><ul><li>Thursday, March 10, 2011 - 10:45am to 12:00pm</li>
-<li>Friday, March 11, 2011 - 10:45am to 12:00pm</li></p>
+<li>Friday, March 11, 2011 - 10:45am to 12:00pm</li>
+<li>Friday, March 11, 2011 - 3:45pm to 5:00pm</li></ul></p>
<p>
<img src="/sigcse2011/images/logos/sponsors/microsoft.png" align="left" class="headshot" />
<strong>F# - From Foundations to Modern Parallel and Data Rich Functional Programming</strong><br/>
Speakers: Don Syme (Microsoft Research, Cambridge) and Nigel Horspool tbc (University of Victoria)<br/>
<em>Thursday, March 10, 2011 - 10:45am to 12:00pm</em><br/>
<br/>
F# is a multi-paradigm programming language, targeting the .NET/Mono platforms. F# brings you type safe, succinct, efficient and expressive functional programming language supporting both the imperative and object-oriented programming disciplines. It is a simple and pragmatic language, and has particular strengths in data-oriented programming, parallel I/O programming, parallel CPU programming, scripting and algorithmic development. F# combines the advantages of typed functional programming with a high-quality, well-supported modern runtime system and set of libraries. This tutorial will teach F# from several angles:
<ul>
<li>F# as a cross platform language for teaching, including using F# on Windows, Macs, with Linux and MonoDevelop, and on the TryF# system</li>
<li>The advanced features of F#, including asynchronous and parallel programming and units of measure</li>
<li>F# type providers and their applications to strongly typed programming with web ontologies</li>
<li>F# as a modern data programming environment, including writing data-rich phone applications</li>
</ul>
Attendees should come away with a good idea of the utility and power of F# in the classroom context, and its use all the way up to postgraduate and research level.</p>
<p>
<strong>PexForFun - Programming Exercises and Automatic Grading in the Cloud</strong><br/>
Speakers: Peli de Halleux and Nikolai Tillmann, Microsoft Research, Redmond<br/>
<em>Friday, March 11, 2011 - 10:45am to 12:00pm</em><br/> <br/>
PexForFun can be used to learn software programming at many levels, from high school all the way through graduate courses. With PexForFun, the student edits the code in any browser and we execute it and analyze it for you in the cloud. PexForFun supports C#, VisualBasic and F#. Because Pex4Fun has Intellisense, learning the syntax is not an obstacle for beginners. PexForFun finds interesting and unexpected input values that help students understand what their code is actually doing. Under the hood, PexForFun uses dynamic symbolic execution to thoroughly explore feasible execution paths. The real fun starts with Coding Duels where the student has to write code that implements a specification. PexForFun finds any discrepancies between the studentâs code and the specification. PexForFun connects teachers, curriculum authors and students in a unique social experience, tracking and streaming progress updates in real time. Enough said, try it for yourself at <a href="http://pex4fun.com/">http://pex4fun.com/</a> and come and hear about it at this tutorial, given by the authors of the system.
</p>
+<p><strong>Microsoft .NET Gadgeteer: A new way to create electronic devices</strong><br/>
+Presenter: Nicolas Villar<br/>
+<em>Friday, March 11, 2011 - 3:45pm to 5:00pm</em><br/> <br/>
+Getting started building embedded devices is complex involving both programming and electronics skills either limiting the students able to be successful or limiting the complexity of the projects that they can undertake. With the Microsoft .NET Gadgeteer, someone with basic programming skills can be building sophisticated projects in a fraction of the time. <br/> <br/>
+Microsoft .NET Gadgeteer is a toolkit for building small electronic devices built on Microsoft .NET Micro Framework and the Microsoft Visual Studio development environment. It combines the advantages of object-oriented programming, solderless assembly of electronics with a kit of peripherals, and support for quick physical form factor design using computer-aided design. This powerful combination allows embedded and handheld devices to be iteratively designed, built and programmed in a matter of hours rather than days or weeks. Microsoft .NET Gadgeteer has been developed by Microsoft Research in collaboration with the .NET Micro Framework product team, and is in the process of being made available to the public an open-source project.<br/> <br/>
+This session will provide an overview of the various hardware and software elements of the .NET Gadgeteer platform. Attendees will be introduced to the modular electronics system, and learn how individual modules can be connected together to build sophisticated devices. They will learn about how .NET Gadgeteer devices can be programmed easily using the C# language, and interactively debugged Visual Studio IDE. Finally, the session will demonstrate how the toolkit supports the design of custom enclosures for .NET Gadgeteer projects, which can be built on demand by using 3D-printing technologies.</p>
+
<div class="SectionHeader"><div class="Full">
<h2><a name="aws">Amazon Web Services</a></h2>
</div></div>
<p>Thursday, March 10, 2011 - 1:45pm - 3:00pm</p>
<p><img src="/sigcse2011/images/logos/sponsors/aws.jpg" align="left" class="headshot" />
<strong>Software as a Service, Cloud Computing, and Software Education</strong><br/>
Speaker: Armando Fox<br/>
<br/>
UC Berkeley leverages the combination of cloud computing and Software as a Service (SaaS), with its emphasis on productively creating well-tested, maintainable, reusable code, to let "one-pizza" teams of Berkeley undergrads design, develop, test, and deploy their own SaaS applications. Iteration-based agile development rewards regular progress, test-first design results in students actually enjoying testing, and cloud computing showcases deployed projects to friends, colleagues, and future employers, all while students absorb "big ideas" such as higher-order programming and metaprogramming. I'll also discuss other uses of cloud computing at Berkeley from lower-division through graduate CS courses.<br/>
<br/>
Armando Fox is an Adjunct Professor at UC Berkeley, a co-author of "Above the Clouds: A Berkeley View of Cloud Computing", and a researcher at the intersection of cloud computing, machine learning, and parallel computing.</p>
<div class="SectionHeader"><div class="Full">
<h2><a name="ibm">IBM</a></h2>
</div></div>
<p>Thursday, March 10, 2011: 3:45pm to 5:00pm</p>
<p>
<img src="/sigcse2011/images/logos/sponsors/ibm.png" align="left" class="headshot" />
<strong>Can Students Really Develop Software Collaboratively?</strong><br/>Speaker: Brian Schimpf<br/>
</br/>
In the "real world" of software development, developers rarely work on a project alone.
Development has become a "team sport" with accepted rules, best practices, and preferred
tools. However, too often, students graduate only knowing how to develop code as an individual
- not as part of a team. With IBM's Rational Team Concert (free for classroom use from IBM's
Academic Initiative) students can work in a real-world team development scenario -- each with
different roles on the team. Work items can be sized and assigned to each team member,
and anyone can view real-time status and project health. Even better, professors can use the
dashboards and reports to view each student's contribution to the project to help them assess
each student individually.</p>
<?php include("../parts/middle.php"); ?>
<?php include("../parts/attendees_right.php"); ?>
<?php
$updated = filemtime( $_SERVER["SCRIPT_FILENAME"] );
include("../parts/footer.php");
?>
diff --git a/exhibitors/index.php b/exhibitors/index.php
index 85342d0..7b50b95 100644
--- a/exhibitors/index.php
+++ b/exhibitors/index.php
@@ -1,214 +1,231 @@
<?php
$title = "SIGCSE 2011 - Exhibitors and Supporters";
$menu = "exhibitors";
include("../parts/top.php");
?> <!-- <h2>Important Dates</h2> -->
<div class="GoodMessage">
<p>SIGCSE 2011 <a href="/sigcse2011/exhibitors/downloads/SIGCSE_EP11.pdf" target="_blank"> Invitation to Exhibit / Conference Support Opportunities (PDF)</a> |
<a href="http://docs.google.com/viewer?url=http%3A%2F%2Fwww.sigcse.org%2Fsigcse2011%2Fexhibitors%2Fdownloads%2FSIGCSE_EP11.pdf">View online with Google docs Viewer</a>
</p>
</div>
<div class="SectionHeader"><div class="Full">
<h2>Exhibitors and Supporters</h2>
</div></div>
<p>
The Association for Computing Machinery
(<a href="http://www.acm.org">ACM</a>)
Special Interest Group on Computer Science Education
(<a href="http://www.sigcse.org">SIGCSE</a>)
is a community of approximately 2,600 educators and students
possessing a passion for studying and improving the state
of computer science education at all levels.
The annual SIGCSE Technical Symposium is the flagship conference
of our organization, and is attended by approximately
1,300 people. Conference attendees travel from across the globe
to learn new educational techniques, to examine the latest
textbooks, to share ideas with colleagues, to talk with
computing professionals, and to acquire hands-on experience
with new hardware and software, including software development
environments, classroom presentation technologies, on-line
collaboration tools, and robotics.
</p>
<!--
<p>
The exhibit hall hours will be:
</p>
<table style="width: 35%;">
<tbody>
<tr>
<td> </td>
<td style="font-size: 1.0em"> Thursday, March 5th </td>
<td style="font-size: 1.0em"> 10 a.m. - 6 p.m. </td>
</tr>
<tr>
<td> </td>
<td style="font-size: 1.0em"> Friday, March 6th </td>
<td style="font-size: 1.0em"> 10 a.m. - 6 p.m. </td>
</tr>
<tr>
<td> </td>
<td style="font-size: 1.0em"> Saturday, March 7th </td>
<td style="font-size: 1.0em"> 9:30 a.m. - Noon </td>
</tr>
</tbody>
</table>
-->
<div class="SectionHeader"><div class="Full">
<h2>Are You Interested in Becoming a Supporter and/or Exhibitor?</h2>
</div></div>
<ul>
<li>The <a href="/sigcse2011/exhibitors/downloads/SIGCSE_EP11.pdf" target="_blank">SIGCSE 2011 Invitation to Exhibit / Conference Support Opportunities</a> document (PDF; opens in new window) provides details on how your organization can connect with our community. </li>
<li><a href="/sigcse2011/exhibitors/downloads/acm_sigcse_2011_floorplan.pdf">Download the SIGCSE 2011 exhibit hall plan</a> or <a href="http://docs.google.com/viewer?url=http%3A%2F%2Fwww.sigcse.org%2Fsigcse2011%2Fexhibitors%2Fdownloads%2Facm_sigcse_2011_floorplan.pdf">View with Google docs Viewer</a>.</li>
<li>Here are two views of the SIGCSE 2008 Exhibit Hall. The 2011 conference is in a different location, but we hope that these views will give you a sense of what the 2011 exhibition space will look like. (Click on each for a larger version.)</li>
<table border="0" align="center">
<tr>
<td><a href="images/2008Hall01.jpg" rel="lightbox[students]" title="2008 Exhibit Hall"><img src="images/2008Hall01_thumb.jpg" /></a></td>
<td><a href="images/2008Hall02.jpg" rel="lightbox[students]" title="2008 Exhibit Hall"><img src="images/2008Hall02_thumb.jpg" /></a></td>
</tr>
</table>
</ul>
<div class="SectionHeader"><div class="Full">
<h2>SIGCSE 2011 Supporters and Exhibitors</h2>
</div></div>
<table width="100%">
<tr>
- <td align="center" valign="top" colspan="3"><h3>Platinum Supporters</h3></td>
+ <td align="center" valign="top" colspan="5"><h3>Platinum Plus Supporter</h3></td>
+</tr>
+<tr>
+ <td> </td>
+ <?php include("../parts/sponsor_microsoft.php"); ?>
+ <td> </td>
+</tr>
+<tr>
+ <td align="center" valign="top" colspan="5"><h3>Platinum Supporters</h3></td>
</tr>
-<tr>
+<tr>
+<td> </td>
<?php
-$sponsors = array("../parts/sponsor_google.php", "../parts/sponsor_intel.php", "../parts/sponsor_microsoft.php");
+$sponsors = array("../parts/sponsor_google.php", "../parts/sponsor_intel.php");
shuffle($sponsors);
+$doEcho = true;
foreach ($sponsors as $sponsor) {
include($sponsor);
+ if ($doEcho) {
+ echo "<td> </td>";
+ $doEcho = false;
+ }
}
?>
+<td> </td>
</tr>
<tr>
- <td align="center" valign="top" colspan="3"><h3>Gold Supporters</h3></td>
+ <td align="center" valign="top" colspan="5"><h3>Gold Supporters</h3></td>
</tr>
<tr>
+<td> </td>
<?php
$sponsors = array("../parts/sponsor_amazon.php", "../parts/sponsor_ibm.php");
shuffle($sponsors);
$doEcho = true;
foreach ($sponsors as $sponsor) {
include($sponsor);
if ($doEcho) {
echo "<td> </td>";
$doEcho = false;
}
}
?>
+<td> </td>
</tr>
</table>
<div class="SectionHeader"><div class="Full">
<h2>Exhibitors</h2>
</div></div>
<table><tr>
<td valign="top" align="left">
<ul>
<li>ACM SIGADA</li>
<li>ACM-W</li>
<li>AlgoViz.org/ Ensemble Projects</li>
<li>Amazon Web Services</li>
<li>Auburn University</li>
<li>Broadening Participation in Computing</li>
<li>Course Technology Cengage Learning</li>
<li>CRC Press- Taylor & Francis Group LLC</li>
<li>Franklin, Beedle & Associated Incorporated</li>
<li>Google</li>
<li>IBM / Academic Initiative</li>
<li>Intel Corporation</li>
<li>Intersystems Corporation</li>
</ul>
</td>
<td valign="top" align="left">
<ul>
<li>Jones and Bartlett</li>
<li>LEGO Education, North America</li>
<li>Microsoft</li>
<li>Morgan Kaufmann</li>
<li>NSF</li>
<li>Pearson Higher Education</li>
<li>Research In Motion Corporation</li>
<li>RidgeSoft</li>
<li>Springer</li>
<li>The College Board</li>
<li>The MIT Press</li>
<li>Turingâs Craft</li>
<li>Wiley</li>
</ul>
</td></tr></table>
<div class="SectionHeader"><div class="Full">
<h2>In-Kind Donations</h2>
</div></div>
<table><tr>
<td valign="top" align="left"><ul>
<li>Microsoft - Computers and t-shirts for Kids Camp</li>
<li>Morgan Kaufman - Conference bags</li>
<li>Pearson - Lanyards</li>
<li>School of Computer Science, Carnegie Mellon University - Conference signage</li>
<li>Turing's Craft - Student Volunteer T-shirts</li>
<li>UPE - Pizza Party for student volunteers</li>
</ul></td>
<td valign="top" align="left">
</td>
</tr></table>
<div class="SectionHeader"><div class="Full">
<h2>Questions?</h2>
</div></div>
<p>Questions about supporting and exhibiting at SIGCSE 2011 can be
directed to the Exhibit Manager or our Supporter / Exhibitor Liaison.</p>
<h3>Supporter/Exhibitor Liaison</h3>
<p>Prof. Susan Rodger at Duke University is a long time attendee of SIGCSE and
was a Symposium Co-Chair for SIGCSE 2008.<br />
<br />
Email: [email protected]<br />
Phone: 919-660-6595<br />
</p>
<h3>Exhibit Manager</h3>
<p>
Dorothea Heck<br />
D. Lawrence Planners LLC<br />
SIGCSE Exhibition Management<br />
1125 Atlantic Avenue STE 634<br />
Atlantic City, NJ 08401<br />
tel. 609.344.1333 <br />
fax. 609.348.4433<br />
E-mail: <script>write_email( "SIGCSE", "dlplan.com" );</script>
</p>
<?php include("../parts/middle.php"); ?>
<h2>Have a question?</h2>
<p>Find the appropriate SIGCSE 2011
<a href="/sigcse2011/committee/">program committee member</a>
and send us an email.</p>
<?php
$updated = filemtime( $_SERVER["SCRIPT_FILENAME"] );
include("../parts/footer.php");
?>
\ No newline at end of file
diff --git a/images/logos/sponsors/microsoft.png b/images/logos/sponsors/microsoft.png
index b29eed3..6249b13 100644
Binary files a/images/logos/sponsors/microsoft.png and b/images/logos/sponsors/microsoft.png differ
diff --git a/index.php b/index.php
index 3584676..3788692 100644
--- a/index.php
+++ b/index.php
@@ -1,73 +1,41 @@
<?php
$title = "SIGCSE 2011 - Home";
$menu = "home";
include("parts/top.php");
?>
<div id="GoodMessage">Dec 6, 2010: <strong><a href="/sigcse2011/attendees/registration.php">Registration is now open</a>!</strong> Early registration ends January 31, 2011.</div>
<div class="SectionHeader"><div class="Full">
<h2>Welcome to SIGCSE 2011</h2>
</div></div>
<p>SIGCSE 2011 continues our long tradition of bringing together colleagues from around the
world to present papers, panels, posters, special sessions, and workshops, and to discuss
computer science education in birds-of-a-feather sessions and informal settings at breaks
and meals. The SIGCSE Technical Symposium addresses problems common among educators working
to develop, implement and/or evaluate computing programs, curricula, and courses.
The symposium provides a forum for sharing new ideas for syllabi, laboratories,
and other elements of teaching and pedagogy, at all levels of instruction.</p>
<p>We encourage participation that addresses our theme, "reaching out". We need to reach out to colleagues in other fields, to develop interdisciplinary courses and research projects that integrate computer science and other fields, which enriches both. We need to reach out to create programs that attract and educate the next generation of computer scientists, especially currently underserved populations. We need to reach out to policy makers, educating them on the importance and promise of our discipline. Finally, we need to reach out to each other, as always sharing our best ideas and experiences with the SIGCSE community. We invite those interested in computer science education and computer science education research to contribute to SIGCSE 2011.</p>
<div class="SectionHeader"><div class="Full">
<h2>Our Venue : Sheraton Dallas Hotel</h2>
</div></div>
<p>All conference activities will be at the Sheraton hotel and its attached conference center. The Sheraton Dallas Hotel and conference center is located at 400 North Olive Street, Dallas, TX 75201. More information can be found on our <a href="/sigcse2011/attendees/accommodations.php">accommodations page</a>.</p>
<div class="SectionHeader"><div class="Full">
<h2>SIGCSE 2011 Supporters</h2>
</div></div>
-<table width="100%">
-<tr>
- <td align="center" valign="top" colspan="3"><h3>Platinum Supporters</h3></td>
-</tr>
-<tr>
-<?php
-$sponsors = array("parts/sponsor_google.php", "parts/sponsor_intel.php", "parts/sponsor_microsoft.php");
-shuffle($sponsors);
-foreach ($sponsors as $sponsor) {
- include($sponsor);
-}
-?>
-</tr>
-<tr>
- <td align="center" valign="top" colspan="3"><h3>Gold Supporters</h3></td>
-</tr>
-<tr>
-<?php
-$sponsors = array("parts/sponsor_amazon.php", "parts/sponsor_ibm.php");
-shuffle($sponsors);
-$doEcho = true;
-foreach ($sponsors as $sponsor) {
- include($sponsor);
- if ($doEcho) {
- echo "<td> </td>";
- $doEcho = false;
- }
-}
-?>
-</tr>
-</table>
-
<?php include("parts/middle.php"); ?>
<?php include("parts/main_right.php"); ?>
<?php
$updated = filemtime( $_SERVER["SCRIPT_FILENAME"] );
$mainPage = true;
include("parts/footer.php");
?>
\ No newline at end of file
diff --git a/parts/sponsor_microsoft.php b/parts/sponsor_microsoft.php
index af79e62..69a95bd 100644
--- a/parts/sponsor_microsoft.php
+++ b/parts/sponsor_microsoft.php
@@ -1,3 +1,3 @@
-<td align="center" valign="middle">
+<td align="center" valign="middle" colspan="3">
<a href="http://www.microsoft.com/education/highered/faculty/" alt="Microsoft Highered"><img src="/sigcse2011/images/logos/sponsors/microsoft.png" /></a>
</td>
\ No newline at end of file
|
mikehelmick/SIGCSE2011-Web-Site
|
97da415c8d431beb4c58342887729f7cb803d846
|
add Eiselt committee photo
|
diff --git a/committee/index.php b/committee/index.php
index d24a385..ce4698f 100644
--- a/committee/index.php
+++ b/committee/index.php
@@ -1,292 +1,292 @@
<?php
$title = "SIGCSE 2011 - Committee";
$menu = "committee";
include("../parts/top.php");
?>
<p><strong>Full Committee</strong> | <a href="apc.php">Associate Program Chairs</a></p>
<div class="SectionHeader"><div class="Full">
<h2>SIGCSE 2011 Program Committee</h2>
</div></div>
<table class="FadeTable" cellspacing="0" cellpadding="0">
<tr class="header"><td align="left" valign="top" colspan="3">
<strong>Symposium Chairs</strong>
</td></tr>
<tr><td align="left" valign="top">
Thomas Cortina<br />
Carnegie Mellon University<br />
<hr/>
Ellen Walker<br />
Hiram College<br />
<script>write_email( "sigcse11-symposium", "cs.cmu.edu" );</script>
</td>
<td valign="top" align="center"><img src="/sigcse2011/images/committee/Tom_Cortina.jpg" /></td>
<td valign="top" align="center"><img src="/sigcse2011/images/committee/ellen.jpg" /></td></tr>
<tr class="header"><td align="left" valign="top" colspan="3">
<strong>Program Chairs</strong>
</td></tr>
<tr><td align="left" valign="top">
Laurie Smith King<br/>
College of the Holy Cross
<hr/>
Dave Musicant <br/>
Carleton College<br/>
<script>write_email( "sigcse11-program", "cs.cmu.edu" );</script>
</td>
<td valign="top" align="center"><img src="/sigcse2011/images/committee/LaurieKing_2010b.jpg" /></td>
<td valign="top" align="center"><img src="/sigcse2011/images/committee/Dave_Musicant.jpg" /></td></tr>
<tr class="header"><td align="left" valign="top" colspan="3">
<strong>Panels and Special Sessions</strong>
</td></tr>
<tr><td align="left" valign="top">
Pam Cutter<br/>
Kalamazoo College<br />
<script>write_email( "sigcse11-panels", "cs.cmu.edu" );</script><br />
<script>write_email( "sigcse11-specials", "cs.cmu.edu" );</script>
</td>
<td valign="top" align="center"><img src="/sigcse2011/images/committee/PamCutter.jpg" /></td>
<td> </td>
</tr>
<tr class="header"><td align="left" valign="top" colspan="3">
<strong>Workshops</strong>
</td></tr>
<tr><td align="left" valign="top">
Ruth E. Anderson <br/>
University of Washington
<hr/>
Adrienne Decker<br/>
University at Buffalo (SUNY)<br />
<script>write_email( "sigcse11-workshops", "cs.cmu.edu" );</script>
</td>
<td valign="top" align="center"><img src="/sigcse2011/images/committee/Ruth_Anderson.jpg" /></td>
<td valign="top" align="center"><img src="/sigcse2011/images/committee/Adrienne_Decker2.jpg" /></td></tr>
<tr class="header"><td align="left" valign="top" colspan="3">
<strong>Publications</strong>
</td></tr>
<tr><td align="left" valign="top">
Lester I. McCann <br/>
The University of Arizona <br/>
<script>write_email( "sigcse11-publications", "cs.cmu.edu" );</script>
</td>
<td valign="top" align="center"><img src="/sigcse2011/images/committee/Lester_Mccann.jpg" /></td>
<td> </td></tr>
<tr class="header"><td align="left" valign="top" colspan="3">
<strong>Registration</strong>
</td></tr>
<tr><td align="left" valign="top">
Cary Laxer and Lynn Degler<br/>
Rose-Hulman Institute of Technology<br/>
<hr/>
Larry Merkle<br/>
Wright State University<br/>
<script>write_email( "sigcse11-registration", "cs.cmu.edu" );</script>
</td>
<td valign="top" align="center">
<img src="/sigcse2011/images/committee/Cary_Laxer.jpg" /><br/>
<img src="/sigcse2011/images/committee/LynnDegler.png" />
</td>
<td valign="top" align="center"><img src="/sigcse2011/images/committee/Larry_Merkle.jpg" /></td>
</tr>
<tr class="header"><td align="left" valign="top" colspan="3">
<strong>Posters</strong>
</td></tr>
<tr><td align="left" valign="top">
Tzu-Yi Chen<br />
Pomona College<br />
<script>write_email( "sigcse11-posters", "cs.cmu.edu" );</script>
</td>
<td valign="top" align="center"><img src="/sigcse2011/images/committee/Tsu_Yi_Chen2.jpg" /></td>
<td> </td></tr>
<tr class="header"><td align="left" valign="top" colspan="3">
<strong>Birds Of A Feather</strong>
</td></tr>
<tr><td align="left" valign="top">
Deborah Hwang<br/>
University of Evansville
<script>write_email( "sigcse11-bofs", "cs.cmu.edu" );</script>
</td>
<td valign="top" align="center"><img src="/sigcse2011/images/committee/Deborah_Hwang.jpg" /></td>
<td> </td></tr>
<tr class="header"><td align="left" valign="top" colspan="3">
<strong>Videos Coordinator</strong>
</td></tr>
<tr><td align="left" valign="top">
Dennis Bouvier <br/>
Southern Illinois University - Edwardsville <br/>
<script>write_email( "sigcse11-videos", "cs.cmu.edu" );</script>
</td>
<td valign="top" align="center"><img src="/sigcse2011/images/committee/Dennis_Bouvier2.jpg" /></td>
<td> </td></tr>
<tr class="header"><td align="left" valign="top" colspan="3">
<strong>Student Volunteers and Student Activities</strong>
</td></tr>
<tr><td align="left" valign="top">
Brianna Morrison <br/>
Southern Polytechnic State University
<hr/>
Mary Anne Egan<br/>
Siena College<br/>
<script>write_email("sigcse11-volunteers", "cs.cmu.edu");</script>
</td>
<td valign="top" align="center"><img src="/sigcse2011/images/committee/Briana_Morrison.jpg" /></td>
<td valign="top" align="center"><img src="/sigcse2011/images/committee/Mary_Anne_Egan.jpg" /></td>
</tr>
<tr class="header"><td align="left" valign="top" colspan="3">
<strong>Treasurer</strong>
</td></tr>
<tr><td align="left" valign="top">
Scott Grissom<br/>
National Science Foundation & <br/>
Grand Valley State University<br/>
<script>write_email("sigcse11-treasurer", "cs.cmu.edu");</script>
</td>
<td valign="top" align="center"><img src="/sigcse2011/images/committee/Scott_Grissom.jpg" /></td>
<td> </td>
</tr>
<tr class="header"><td align="left" valign="top" colspan="3">
<strong>Database Administrators</strong>
</td></tr>
<tr><td align="left" valign="top">
Henry Walker <br/>
Grinnell College
<hr/>
John Dooley <br/>
Knox College <br/>
<script>write_email( "sigcse11-database", "cs.cmu.edu" );</script>
</td>
<td valign="top" align="center"><img src="/sigcse2011/images/committee/Henry_Walker.jpg" /></td>
<td valign="top" align="center"><img src="/sigcse2011/images/committee/John_Dooley.jpg" /></td></tr>
<tr class="header"><td align="left" valign="top" colspan="3">
<strong>Webmaster</strong>
</td></tr>
<tr><td align="left" valign="top">
Michael T. Helmick <br/>
Google <br/>
<script>write_email( "sigcse11-webmaster", "cs.cmu.edu" );</script>
</td>
<td valign="top" align="center"><img src="/sigcse2011/images/committee/Mike_Helmick.jpg" /></td>
<td> </td></tr>
<tr class="header"><td align="left" valign="top" colspan="3">
<strong>Evaluations</strong>
</td></tr>
<tr><td align="left" valign="top">
Kurt Eiselt <br/>
University of British Columbia <br/>
<script>write_email( "sigcse11-evaluations", "cs.cmu.edu" );</script>
</td>
- <td valign="top" align="center"> </td>
+ <td valign="top" align="center"><img src="/sigcse2011/images/committee/eiselt.jpg" /></td>
<td> </td>
</tr>
<tr class="header"><td align="left" valign="top" colspan="3">
<strong>Kids' Camp</strong>
</td></tr>
<tr><td align="left" valign="top">
Kimberly Voll<br />
University of British Columbia<br />
<hr/>
RoxAnn Stalvey<br/>
College of Charleston<br/>
<script>write_email( "sigcse11-kidscamp", "cs.cmu.edu" );</script>
</td>
<td valign="top" align="center"><img src="/sigcse2011/images/committee/Kim_Voll.jpg" /></td>
<td valign="top" align="center"><img src="/sigcse2011/images/committee/Roxann_Stalvey-4.jpg" /></td></tr>
<tr class="header"><td align="left" valign="top" colspan="3">
<strong>Support/Exhibitor Liaison</strong>
</td></tr>
<tr><td align="left" valign="top">
Susan Rodger<br/>
Duke University<br />
<script>write_email( "sigcse11-exhibitor", "cs.cmu.edu" );</script>
</td>
<td valign="top" align="center"></td>
<td><img src="/sigcse2011/images/committee/Susan_Rodger.jpg" /></td></tr>
<tr class="header"><td align="left" valign="top" colspan="3">
<strong>K-12 Liaisons</strong>
</td></tr>
<tr><td align="left" valign="top">
Stacey Armstrong <br/>
Cypress Woods High School,<br/>
Houston, Texas
<hr/>
Judy Hromcik<br/>
Arlington High School<br/>
Arlington, Texas<br/>
<script>write_email( "sigcse11-k12", "cs.cmu.edu" );</script>
</td>
<td valign="top" align="center"><img src="/sigcse2011/images/committee/Stacey_Armstrong.jpg" /></td>
<td valign="top" align="center"><img src="/sigcse2011/images/committee/JudyHromcik.jpg" /></td></tr>
<tr class="header"><td align="left" valign="top" colspan="3">
<strong>International Liaison</strong>
</td></tr>
<tr><td align="left" valign="top">
Tim Bell <br/>
University of Canterbury<br/>
<script>write_email( "sigcse11-international", "cs.cmu.edu" );</script>
</td>
<td valign="top" align="center"><img src="/sigcse2011/images/committee/Tim_Bell.jpg" /></td>
<td> </td></tr>
<tr class="header"><td align="left" valign="top" colspan="3">
<strong>Pre-Conference Event Liaison</strong>
</td></tr>
<tr><td align="left" valign="top">
Kristine Nagel<br />
Georgia Gwinnett College<br />
<script>write_email( "sigcse11-preconference", "cs.cmu.edu" );</script>
</td>
<td valign="top" align="center"><img src="/sigcse2011/images/committee/Kristine_Nagel.jpg" /></td>
<td> </td></tr>
<tr class="header"><td align="left" valign="top" colspan="3">
<strong>Local Arrangements</strong>
</td></tr>
<tr><td align="left" valign="top">
Jian Zhang<br/>
Texas Women's University<br/>
<script>write_email( "sigcse11-local", "cs.cmu.edu" );</script>
</td>
<td valign="top" align="center"><img src="/sigcse2011/images/committee/Jian_Zhiang.jpg" /></td>
<td> </td></tr>
<tr class="header"><td align="left" valign="top" colspan="3">
<strong>Student Research Competition</strong>
</td></tr>
<tr><td align="left" valign="top">
Ann Sobel <br/>
Miami University (Ohio) <br/>
<script>write_email( "sigcse11-src", "cs.cmu.edu" );</script>
</td>
<td valign="top" align="center"> </td>
<td> </td></tr>
</table>
<?php include("../parts/middle.php"); ?>
<?php include("../parts/main_right.php"); ?>
<?php
$updated = filemtime( $_SERVER["SCRIPT_FILENAME"] );
$mainPage = true;
include("../parts/footer.php");
?>
\ No newline at end of file
diff --git a/images/committee/eiselt.jpg b/images/committee/eiselt.jpg
new file mode 100644
index 0000000..baed223
Binary files /dev/null and b/images/committee/eiselt.jpg differ
|
mikehelmick/SIGCSE2011-Web-Site
|
a2d575e80cd903357f8c4e6b37d9e4443500ef61
|
corrections on exhibitors list
|
diff --git a/exhibitors/index.php b/exhibitors/index.php
index fd3306c..631f20f 100644
--- a/exhibitors/index.php
+++ b/exhibitors/index.php
@@ -1,214 +1,214 @@
<?php
$title = "SIGCSE 2011 - Exhibitors and Supporters";
$menu = "exhibitors";
include("../parts/top.php");
?> <!-- <h2>Important Dates</h2> -->
<div class="GoodMessage">
<p>SIGCSE 2011 <a href="/sigcse2011/exhibitors/downloads/SIGCSE_EP11.pdf" target="_blank"> Invitation to Exhibit / Conference Support Opportunities (PDF)</a> |
<a href="http://docs.google.com/viewer?url=http%3A%2F%2Fwww.sigcse.org%2Fsigcse2011%2Fexhibitors%2Fdownloads%2FSIGCSE_EP11.pdf">View online with Google docs Viewer</a>
</p>
</div>
<div class="SectionHeader"><div class="Full">
<h2>Exhibitors and Supporters</h2>
</div></div>
<p>
The Association for Computing Machinery
(<a href="http://www.acm.org">ACM</a>)
Special Interest Group on Computer Science Education
(<a href="http://www.sigcse.org">SIGCSE</a>)
is a community of approximately 2,600 educators and students
possessing a passion for studying and improving the state
of computer science education at all levels.
The annual SIGCSE Technical Symposium is the flagship conference
of our organization, and is attended by approximately
1,300 people. Conference attendees travel from across the globe
to learn new educational techniques, to examine the latest
textbooks, to share ideas with colleagues, to talk with
computing professionals, and to acquire hands-on experience
with new hardware and software, including software development
environments, classroom presentation technologies, on-line
collaboration tools, and robotics.
</p>
<!--
<p>
The exhibit hall hours will be:
</p>
<table style="width: 35%;">
<tbody>
<tr>
<td> </td>
<td style="font-size: 1.0em"> Thursday, March 5th </td>
<td style="font-size: 1.0em"> 10 a.m. - 6 p.m. </td>
</tr>
<tr>
<td> </td>
<td style="font-size: 1.0em"> Friday, March 6th </td>
<td style="font-size: 1.0em"> 10 a.m. - 6 p.m. </td>
</tr>
<tr>
<td> </td>
<td style="font-size: 1.0em"> Saturday, March 7th </td>
<td style="font-size: 1.0em"> 9:30 a.m. - Noon </td>
</tr>
</tbody>
</table>
-->
<div class="SectionHeader"><div class="Full">
<h2>Are You Interested in Becoming a Supporter and/or Exhibitor?</h2>
</div></div>
<ul>
<li>The <a href="/sigcse2011/exhibitors/downloads/SIGCSE_EP11.pdf" target="_blank">SIGCSE 2011 Invitation to Exhibit / Conference Support Opportunities</a> document (PDF; opens in new window) provides details on how your organization can connect with our community. </li>
<li><a href="/sigcse2011/exhibitors/downloads/acm_sigcse_2011_floorplan.pdf">Download the SIGCSE 2011 exhibit hall plan</a> or <a href="http://docs.google.com/viewer?url=http%3A%2F%2Fwww.sigcse.org%2Fsigcse2011%2Fexhibitors%2Fdownloads%2Facm_sigcse_2011_floorplan.pdf">View with Google docs Viewer</a>.</li>
<li>Here are two views of the SIGCSE 2008 Exhibit Hall. The 2011 conference is in a different location, but we hope that these views will give you a sense of what the 2011 exhibition space will look like. (Click on each for a larger version.)</li>
<table border="0" align="center">
<tr>
<td><a href="images/2008Hall01.jpg" rel="lightbox[students]" title="2008 Exhibit Hall"><img src="images/2008Hall01_thumb.jpg" /></a></td>
<td><a href="images/2008Hall02.jpg" rel="lightbox[students]" title="2008 Exhibit Hall"><img src="images/2008Hall02_thumb.jpg" /></a></td>
</tr>
</table>
</ul>
<div class="SectionHeader"><div class="Full">
<h2>SIGCSE 2011 Supporters and Exhibitors</h2>
</div></div>
<table width="100%">
<tr>
<td align="center" valign="top" colspan="3"><h3>Platinum Supporters</h3></td>
</tr>
<tr>
<?php
$sponsors = array("../parts/sponsor_google.php", "../parts/sponsor_intel.php", "../parts/sponsor_microsoft.php");
shuffle($sponsors);
foreach ($sponsors as $sponsor) {
include($sponsor);
}
?>
</tr>
<tr>
<td align="center" valign="top" colspan="3"><h3>Gold Supporters</h3></td>
</tr>
<tr>
<?php
$sponsors = array("../parts/sponsor_amazon.php", "../parts/sponsor_ibm.php");
shuffle($sponsors);
$doEcho = true;
foreach ($sponsors as $sponsor) {
include($sponsor);
if ($doEcho) {
echo "<td> </td>";
$doEcho = false;
}
}
?>
</tr>
</table>
<div class="SectionHeader"><div class="Full">
<h2>Exhibitors</h2>
</div></div>
<table><tr>
<td valign="top" align="left">
<ul>
<li>ACM SIGADA</li>
<li>ACM-W</li>
<li>AlgoViz.org/ Ensemble Projects</li>
<li>Amazon Web Services</li>
<li>Auburn University</li>
<li>Broadening Participation in Computing</li>
<li>CCS, Inc.</li>
<li>Course Technology Cengage Learning</li>
<li>CRC Press- Taylor & Francis Group LLC</li>
<li>Franklin, Beedle & Associated Incorporated</li>
<li>IBM / Academic Initiative</li>
<li>Intel Corporation</li>
<li>Intersystems Corporation</li>
</ul>
</td>
<td valign="top" align="left">
<ul>
<li>Jones and Bartlett</li>
<li>LEGO Education, North America</li>
<li>Microsoft</li>
<li>Morgan Kaufmann</li>
<li>NSF</li>
<li>Pearson Higher Education</li>
<li>Research In Motion Corporation</li>
- <li>RidgSoft</li>
+ <li>RidgeSoft</li>
<li>Springer</li>
<li>The College Board</li>
<li>The MIT Press</li>
<li>Turingâs Craft</li>
<li>Wiley</li>
</ul>
</td></tr></table>
<div class="SectionHeader"><div class="Full">
<h2>In-Kind Donations</h2>
</div></div>
<table><tr>
<td valign="top" align="left"><ul>
<li>Microsoft - Computers and t-shirts for Kids Camp</li>
<li>Morgan Kaufman - Conference bags</li>
<li>Pearson - Lanyards</li>
<li>School of Computer Science, Carnegie Mellon University - Conference signage</li>
- <li>Turingscraft - Student Volunteer T-shirts</li>
+ <li>Turing's Craft - Student Volunteer T-shirts</li>
<li>UPE - Pizza Party for student volunteers</li>
</ul></td>
<td valign="top" align="left">
</td>
</tr></table>
<div class="SectionHeader"><div class="Full">
<h2>Questions?</h2>
</div></div>
<p>Questions about supporting and exhibiting at SIGCSE 2011 can be
directed to the Exhibit Manager or our Supporter / Exhibitor Liaison.</p>
<h3>Supporter/Exhibitor Liaison</h3>
<p>Prof. Susan Rodger at Duke University is a long time attendee of SIGCSE and
was a Symposium Co-Chair for SIGCSE 2008.<br />
<br />
Email: [email protected]<br />
Phone: 919-660-6595<br />
</p>
<h3>Exhibit Manager</h3>
<p>
Dorothea Heck<br />
D. Lawrence Planners LLC<br />
SIGCSE Exhibition Management<br />
1125 Atlantic Avenue STE 634<br />
Atlantic City, NJ 08401<br />
tel. 609.344.1333 <br />
fax. 609.348.4433<br />
E-mail: <script>write_email( "SIGCSE", "dlplan.com" );</script>
</p>
<?php include("../parts/middle.php"); ?>
<h2>Have a question?</h2>
<p>Find the appropriate SIGCSE 2011
<a href="/sigcse2011/committee/">program committee member</a>
and send us an email.</p>
<?php
$updated = filemtime( $_SERVER["SCRIPT_FILENAME"] );
include("../parts/footer.php");
?>
\ No newline at end of file
|
mikehelmick/SIGCSE2011-Web-Site
|
c6427989ce60c5b6420ab43ff99556852e1b7346
|
remove workshop survey link for 2011
|
diff --git a/attendees/evaluations.php b/attendees/evaluations.php
index 9ba3bba..85154b7 100644
--- a/attendees/evaluations.php
+++ b/attendees/evaluations.php
@@ -1,23 +1,22 @@
<?php
$title = "SIGCSE 2011 - Evaluations";
$menu = "attendees";
include("../parts/top.php");
?>
<div class="SectionHeader" style="clear:left;"><div class="Full">
<h2>SIGCSE 2011 Symposium Evaluations</h2>
</div></div>
<p>The SIGCSE 2011 Conference Committee hopes that you enjoyed (or are still enjoying!) this year's symposium. To help us learn what we did well, and what we could have done better, we invite you to complete the Symposium Evaluation survey. If you attended one or more of the Wednesday and Friday evening workshops, we would appreciate receiving your feedback on those as well. These survey results not only inform the 2010 committee, they also provide valuable insight to the members of the SIGCSE 2012¡ committee.</p>
<p>To complete an evaluation on-line, please select one of the following links. Note that neither survey requires a password:
<ul>
<li><a href="http://www.surveymonkey.com/s/SIGCSE2011">SIGCSE 2011 Symposium Evaluation</a></li>
- <li><a href="http://www.surveymonkey.com/s/SIGCSE2011Workshops">Wednesday Evening, Friday Evening, and Saturday Workshop Evaluations (to be completed once per workshop attended)</a></li>
</ul>
</p>
<p>Please be aware: If you are unable or unwilling to complete either or both of these surveys on-line, paper copies of the surveys are available from the symposium registration desk at the convention center.</p>
<p>Thank you!</p>
<?php include("../parts/middle.php"); ?>
<?php include("../parts/attendees_right.php"); ?>
<?php
$updated = filemtime( $_SERVER["SCRIPT_FILENAME"] );
include("../parts/footer.php");
?>
|
mikehelmick/SIGCSE2011-Web-Site
|
fec9990caa23ecfa9e14803b21198e6c8e46eb4c
|
Add abstracts for Google supporter sessions
|
diff --git a/attendees/supporter_sessions.php b/attendees/supporter_sessions.php
index f393fa9..28961b2 100644
--- a/attendees/supporter_sessions.php
+++ b/attendees/supporter_sessions.php
@@ -1,145 +1,184 @@
<?php
$title = "SIGCSE 2011 - Supporter Sessions";
$menu = "attendees";
include("../parts/top.php");
?>
<h1>SIGCSE 2011 Supporter Sessions</h1>
<div class="SectionHeader" style="clear:left;"><div class="Full">
<h2>SIGCSE 2011 Supporter Sessions</h2>
</div></div>
<ul>
<li><strong>Thursday, March 10, 2011</strong><ul>
<li>10:45 - 12:00 - <a href="#microsoft">Mircrosoft</a></li>
<li>1:45 - 3:00 - <a href="#intel">Intel</a></li>
<li>1:45 - 3:00 - <a href="#aws">Amazon Web Services</a></li>
<li>3:45 - 5:00 - <a href="#ibm">IBM</a></li>
</ul></li>
<li><strong>Friday, March 11, 2011</strong><ul>
<li>10:45 - 12:00 - <a href="#microsoft">Mircrosoft</a></li>
<li>1:45 - 3:00 - <a href="#intel">Intel</a></li>
<li>1:45 - 3:00 - <a href="#google">Google</a></li>
<li>3:45 - 5:00 - <a href="#google">Google</a></li>
</ul></li>
<li><strong>Saturday, March 12, 2011</strong><ul>
<li>10:55 - 12:10</li>
</ul></li>
</ul>
<div class="SectionHeader"><div class="Full">
<h2><a name="google">Google</a></h2>
</div></div>
<p><ul><li>Friday, March 11, 2011 - 1:45pm to 3:00pm</li>
<li>Friday, March 11, 2011 - 3:45pm to 5:00pm</li></ul></p>
<p>
<img src="/sigcse2011/images/logos/sponsors/google.png" align="left" class="headshot" />
+<strong>Googleâs Education Initiatives in 2011</strong><br/>
+<em>Friday, March 11th - 1:45 - 3:00pm</em><br/>
<br/>
+Google believes that all students should have the opportunity to
+become active creators of tomorrow's technology. Our goal is to
+leverage Google's strengths and infrastructure to increase access to
+high-quality, open educational content and technology in science,
+engineering, and math. We support access to computing curriculum and
+educational technology for all students, leveling the playing field so
+that students and educators alike have the opportunity to shape the
+technologies of their future.<br/>
<br/>
- <br/>
- <br/>
- <br/>
- <br/>
- <br/>
- </p>
+During this session we will share what Google Education is planning
+for 2011 and how CS educators can use the following Google programs to
+inspire their students:
+<ul>
+<li>App Inventor for Android</li>
+<li>Google Summer of Code</li>
+<li>Computer Science 4 High School (CS4HS)</li>
+<li>Computational Thinking</li>
+</ul>
+</p>
+
+<p><strong>Talk in Depth with Representatives from Googleâs Education Programs</strong>
+<em>Friday, March 11th - 3:45 - 5:00pm</em><br/> <br/>
+Google supports access to computing curriculum and educational
+technology for all students, leveling the playing field so that
+students and educators alike have the opportunity to shape the
+technologies of their future. The creators of tomorrow's innovations
+are everywhere, ready to be engaged and inspired.<br/> <br/>
+This session will be your opportunity to talk in depth with Google
+representatives from key Google CS education programs. Weâll also
+share material from other Google education programs and provide an
+opportunity to explore how, together, we can inspire students to shape
+the technologies of tomorrow. Representatives from the following
+programs will be present:
+<ul>
+<li>App Inventor for Android</li>
+<li>Google Summer of Code</li>
+<li>Computer Science 4 High School (CS4HS)</li>
+<li>Computational Thinking</li>
+<li>Others TBD</li>
+</ul></p>
+
+<p><strong>Google Beer and Wine Reception</strong><br/>
+<em>Friday, March 11th - 5:00pm - 6:00pm</em><br/> <br/>
+After a great time thinking about how to reach out and take CS education to the next level, come continue the conversation over a drink and some hors d'oeuvre on Google!</p>
<div class="SectionHeader"><div class="Full">
<h2><a name="intel">Intel</a></h2>
</div></div>
<p><ul><li>Thursday, March 10, 2011 - 1:45pm to 3:00pm</li>
<li>Friday, March 11, 2011 - 1:45pm to 3:00pm</li></ul></p>
<p>
<img src="/sigcse2011/images/logos/sponsors/intel.png" align="left" class="headshot" />
<strong>Intel Academic Community â Global MeeGo University ProgramMeeGo</strong><br/>
Speaker: Selwyn You - Intel Corporation, Jukka Heikkilä - University of Jyväskylä, Russel J Clark and Matthew Wolf - Georgia Institute of Technology<br/>
<em>Thursday, March 10: 1:45pm - 3:00pm</em><br/> <br/>
Have you heard the buzz about MeeGo? The newly formed MeeGo Operating System-a combination of Intelâs Moblin and Nokiaâs Maemo-provides a unified development environment for developers with worldwide distribution channels to consumers.<br/> <br/>
Learn how Intelâs Global MeeGo University program can help you integrate application development on netbooks, tablets, and smartphones into your curricula. Professors from the University of Jyväskylä and Georgia Institute of Technology will share insight into classroom modules that meet demand for rich application development on client devices. They will also share student feedback, in addition to how, why, and when you should start introducing MeeGo to your students.</p>
<p><strong>Case Study - Using the Intel Manycore Testing Lab to Test and Scale Applications</strong><br/>
Speaker Name: Bob Chesebrough, Innovative Software Education, Intel<br/>
<em>Friday March 11 - 1:45pm - 3:00pm</em><br/> <br/>
Expand your students' learning experiences with the Intel® Manycore Testing Lab-a unique, global, remote-access facility made available at no charge to members of the Intel Academic Community. The Intel Manycore Testing lab can be used to test, validate, and improve the scalability of classroom labs, homework, and capstone projects. The lab supports both Linux* and Microsoft Windows* with a 32-CPU/64-thread development environment, including up-to-date, essential performance tools to assist professors and their students.
<br/> <br/>
Bob Chesebrough will demonstrate a command-line ray tracer application created by Master's degree student Dave Frogley. The application was tested, scaled, and tuned on the Intel Manycore Testing Lab. Discussions will include scaling methodologies and state-of-the-art software tools. Bob Chesebrough is a senior course architect in Intel's Innovative Software Education department.
</p>
<div class="SectionHeader"><div class="Full">
<h2><a name="microsoft">Microsoft</a></h2>
</div></div>
<p><ul><li>Thursday, March 10, 2011 - 10:45am to 12:00pm</li>
<li>Friday, March 11, 2011 - 10:45am to 12:00pm</li></p>
<p>
<img src="/sigcse2011/images/logos/sponsors/microsoft.png" align="left" class="headshot" />
<strong>F# - From Foundations to Modern Parallel and Data Rich Functional Programming</strong><br/>
Speakers: Don Syme (Microsoft Research, Cambridge) and Nigel Horspool tbc (University of Victoria)<br/>
<em>Thursday, March 10, 2011 - 10:45am to 12:00pm</em><br/>
<br/>
F# is a multi-paradigm programming language, targeting the .NET/Mono platforms. F# brings you type safe, succinct, efficient and expressive functional programming language supporting both the imperative and object-oriented programming disciplines. It is a simple and pragmatic language, and has particular strengths in data-oriented programming, parallel I/O programming, parallel CPU programming, scripting and algorithmic development. F# combines the advantages of typed functional programming with a high-quality, well-supported modern runtime system and set of libraries. This tutorial will teach F# from several angles:
<ul>
<li>F# as a cross platform language for teaching, including using F# on Windows, Macs, with Linux and MonoDevelop, and on the TryF# system</li>
<li>The advanced features of F#, including asynchronous and parallel programming and units of measure</li>
<li>F# type providers and their applications to strongly typed programming with web ontologies</li>
<li>F# as a modern data programming environment, including writing data-rich phone applications</li>
</ul>
Attendees should come away with a good idea of the utility and power of F# in the classroom context, and its use all the way up to postgraduate and research level.</p>
<p>
<strong>PexForFun - Programming Exercises and Automatic Grading in the Cloud</strong><br/>
Speakers: Peli de Halleux and Nikolai Tillmann, Microsoft Research, Redmond<br/>
<em>Friday, March 11, 2011 - 10:45am to 12:00pm</em><br/> <br/>
PexForFun can be used to learn software programming at many levels, from high school all the way through graduate courses. With PexForFun, the student edits the code in any browser and we execute it and analyze it for you in the cloud. PexForFun supports C#, VisualBasic and F#. Because Pex4Fun has Intellisense, learning the syntax is not an obstacle for beginners. PexForFun finds interesting and unexpected input values that help students understand what their code is actually doing. Under the hood, PexForFun uses dynamic symbolic execution to thoroughly explore feasible execution paths. The real fun starts with Coding Duels where the student has to write code that implements a specification. PexForFun finds any discrepancies between the studentâs code and the specification. PexForFun connects teachers, curriculum authors and students in a unique social experience, tracking and streaming progress updates in real time. Enough said, try it for yourself at <a href="http://pex4fun.com/">http://pex4fun.com/</a> and come and hear about it at this tutorial, given by the authors of the system.
</p>
<div class="SectionHeader"><div class="Full">
<h2><a name="aws">Amazon Web Services</a></h2>
</div></div>
<p>Thursday, March 10, 2011 - 1:45pm - 3:00pm</p>
<p><img src="/sigcse2011/images/logos/sponsors/aws.jpg" align="left" class="headshot" />
<strong>Software as a Service, Cloud Computing, and Software Education</strong><br/>
Speaker: Armando Fox<br/>
<br/>
UC Berkeley leverages the combination of cloud computing and Software as a Service (SaaS), with its emphasis on productively creating well-tested, maintainable, reusable code, to let "one-pizza" teams of Berkeley undergrads design, develop, test, and deploy their own SaaS applications. Iteration-based agile development rewards regular progress, test-first design results in students actually enjoying testing, and cloud computing showcases deployed projects to friends, colleagues, and future employers, all while students absorb "big ideas" such as higher-order programming and metaprogramming. I'll also discuss other uses of cloud computing at Berkeley from lower-division through graduate CS courses.<br/>
<br/>
Armando Fox is an Adjunct Professor at UC Berkeley, a co-author of "Above the Clouds: A Berkeley View of Cloud Computing", and a researcher at the intersection of cloud computing, machine learning, and parallel computing.</p>
<div class="SectionHeader"><div class="Full">
<h2><a name="ibm">IBM</a></h2>
</div></div>
<p>Thursday, March 10, 2011: 3:45pm to 5:00pm</p>
<p>
<img src="/sigcse2011/images/logos/sponsors/ibm.png" align="left" class="headshot" />
<strong>Can Students Really Develop Software Collaboratively?</strong><br/>Speaker: Brian Schimpf<br/>
</br/>
In the "real world" of software development, developers rarely work on a project alone.
Development has become a "team sport" with accepted rules, best practices, and preferred
tools. However, too often, students graduate only knowing how to develop code as an individual
- not as part of a team. With IBM's Rational Team Concert (free for classroom use from IBM's
Academic Initiative) students can work in a real-world team development scenario -- each with
different roles on the team. Work items can be sized and assigned to each team member,
and anyone can view real-time status and project health. Even better, professors can use the
dashboards and reports to view each student's contribution to the project to help them assess
each student individually.</p>
<?php include("../parts/middle.php"); ?>
<?php include("../parts/attendees_right.php"); ?>
<?php
$updated = filemtime( $_SERVER["SCRIPT_FILENAME"] );
include("../parts/footer.php");
?>
|
mikehelmick/SIGCSE2011-Web-Site
|
31b14867996a6c1ea36a6dc14da6388ab62330ac
|
add Amazon supporter session abstract
|
diff --git a/attendees/supporter_sessions.php b/attendees/supporter_sessions.php
index 0230a60..f393fa9 100644
--- a/attendees/supporter_sessions.php
+++ b/attendees/supporter_sessions.php
@@ -1,147 +1,145 @@
<?php
$title = "SIGCSE 2011 - Supporter Sessions";
$menu = "attendees";
include("../parts/top.php");
?>
<h1>SIGCSE 2011 Supporter Sessions</h1>
<div class="SectionHeader" style="clear:left;"><div class="Full">
<h2>SIGCSE 2011 Supporter Sessions</h2>
</div></div>
<ul>
<li><strong>Thursday, March 10, 2011</strong><ul>
<li>10:45 - 12:00 - <a href="#microsoft">Mircrosoft</a></li>
<li>1:45 - 3:00 - <a href="#intel">Intel</a></li>
<li>1:45 - 3:00 - <a href="#aws">Amazon Web Services</a></li>
<li>3:45 - 5:00 - <a href="#ibm">IBM</a></li>
</ul></li>
<li><strong>Friday, March 11, 2011</strong><ul>
<li>10:45 - 12:00 - <a href="#microsoft">Mircrosoft</a></li>
<li>1:45 - 3:00 - <a href="#intel">Intel</a></li>
<li>1:45 - 3:00 - <a href="#google">Google</a></li>
<li>3:45 - 5:00 - <a href="#google">Google</a></li>
</ul></li>
<li><strong>Saturday, March 12, 2011</strong><ul>
<li>10:55 - 12:10</li>
</ul></li>
</ul>
<div class="SectionHeader"><div class="Full">
<h2><a name="google">Google</a></h2>
</div></div>
<p><ul><li>Friday, March 11, 2011 - 1:45pm to 3:00pm</li>
<li>Friday, March 11, 2011 - 3:45pm to 5:00pm</li></ul></p>
<p>
<img src="/sigcse2011/images/logos/sponsors/google.png" align="left" class="headshot" />
<br/>
<br/>
<br/>
<br/>
<br/>
<br/>
<br/>
</p>
<div class="SectionHeader"><div class="Full">
<h2><a name="intel">Intel</a></h2>
</div></div>
<p><ul><li>Thursday, March 10, 2011 - 1:45pm to 3:00pm</li>
<li>Friday, March 11, 2011 - 1:45pm to 3:00pm</li></ul></p>
<p>
<img src="/sigcse2011/images/logos/sponsors/intel.png" align="left" class="headshot" />
<strong>Intel Academic Community â Global MeeGo University ProgramMeeGo</strong><br/>
Speaker: Selwyn You - Intel Corporation, Jukka Heikkilä - University of Jyväskylä, Russel J Clark and Matthew Wolf - Georgia Institute of Technology<br/>
<em>Thursday, March 10: 1:45pm - 3:00pm</em><br/> <br/>
Have you heard the buzz about MeeGo? The newly formed MeeGo Operating System-a combination of Intelâs Moblin and Nokiaâs Maemo-provides a unified development environment for developers with worldwide distribution channels to consumers.<br/> <br/>
Learn how Intelâs Global MeeGo University program can help you integrate application development on netbooks, tablets, and smartphones into your curricula. Professors from the University of Jyväskylä and Georgia Institute of Technology will share insight into classroom modules that meet demand for rich application development on client devices. They will also share student feedback, in addition to how, why, and when you should start introducing MeeGo to your students.</p>
<p><strong>Case Study - Using the Intel Manycore Testing Lab to Test and Scale Applications</strong><br/>
Speaker Name: Bob Chesebrough, Innovative Software Education, Intel<br/>
<em>Friday March 11 - 1:45pm - 3:00pm</em><br/> <br/>
Expand your students' learning experiences with the Intel® Manycore Testing Lab-a unique, global, remote-access facility made available at no charge to members of the Intel Academic Community. The Intel Manycore Testing lab can be used to test, validate, and improve the scalability of classroom labs, homework, and capstone projects. The lab supports both Linux* and Microsoft Windows* with a 32-CPU/64-thread development environment, including up-to-date, essential performance tools to assist professors and their students.
<br/> <br/>
Bob Chesebrough will demonstrate a command-line ray tracer application created by Master's degree student Dave Frogley. The application was tested, scaled, and tuned on the Intel Manycore Testing Lab. Discussions will include scaling methodologies and state-of-the-art software tools. Bob Chesebrough is a senior course architect in Intel's Innovative Software Education department.
</p>
<div class="SectionHeader"><div class="Full">
<h2><a name="microsoft">Microsoft</a></h2>
</div></div>
<p><ul><li>Thursday, March 10, 2011 - 10:45am to 12:00pm</li>
<li>Friday, March 11, 2011 - 10:45am to 12:00pm</li></p>
<p>
<img src="/sigcse2011/images/logos/sponsors/microsoft.png" align="left" class="headshot" />
<strong>F# - From Foundations to Modern Parallel and Data Rich Functional Programming</strong><br/>
Speakers: Don Syme (Microsoft Research, Cambridge) and Nigel Horspool tbc (University of Victoria)<br/>
-<em>Thursday, March 10, 2011 - 10:45am to 12:00pm<br/>
+<em>Thursday, March 10, 2011 - 10:45am to 12:00pm</em><br/>
<br/>
F# is a multi-paradigm programming language, targeting the .NET/Mono platforms. F# brings you type safe, succinct, efficient and expressive functional programming language supporting both the imperative and object-oriented programming disciplines. It is a simple and pragmatic language, and has particular strengths in data-oriented programming, parallel I/O programming, parallel CPU programming, scripting and algorithmic development. F# combines the advantages of typed functional programming with a high-quality, well-supported modern runtime system and set of libraries. This tutorial will teach F# from several angles:
<ul>
<li>F# as a cross platform language for teaching, including using F# on Windows, Macs, with Linux and MonoDevelop, and on the TryF# system</li>
<li>The advanced features of F#, including asynchronous and parallel programming and units of measure</li>
<li>F# type providers and their applications to strongly typed programming with web ontologies</li>
<li>F# as a modern data programming environment, including writing data-rich phone applications</li>
</ul>
Attendees should come away with a good idea of the utility and power of F# in the classroom context, and its use all the way up to postgraduate and research level.</p>
<p>
<strong>PexForFun - Programming Exercises and Automatic Grading in the Cloud</strong><br/>
Speakers: Peli de Halleux and Nikolai Tillmann, Microsoft Research, Redmond<br/>
<em>Friday, March 11, 2011 - 10:45am to 12:00pm</em><br/> <br/>
PexForFun can be used to learn software programming at many levels, from high school all the way through graduate courses. With PexForFun, the student edits the code in any browser and we execute it and analyze it for you in the cloud. PexForFun supports C#, VisualBasic and F#. Because Pex4Fun has Intellisense, learning the syntax is not an obstacle for beginners. PexForFun finds interesting and unexpected input values that help students understand what their code is actually doing. Under the hood, PexForFun uses dynamic symbolic execution to thoroughly explore feasible execution paths. The real fun starts with Coding Duels where the student has to write code that implements a specification. PexForFun finds any discrepancies between the studentâs code and the specification. PexForFun connects teachers, curriculum authors and students in a unique social experience, tracking and streaming progress updates in real time. Enough said, try it for yourself at <a href="http://pex4fun.com/">http://pex4fun.com/</a> and come and hear about it at this tutorial, given by the authors of the system.
</p>
<div class="SectionHeader"><div class="Full">
<h2><a name="aws">Amazon Web Services</a></h2>
</div></div>
<p>Thursday, March 10, 2011 - 1:45pm - 3:00pm</p>
<p><img src="/sigcse2011/images/logos/sponsors/aws.jpg" align="left" class="headshot" />
+<strong>Software as a Service, Cloud Computing, and Software Education</strong><br/>
+Speaker: Armando Fox<br/>
<br/>
+UC Berkeley leverages the combination of cloud computing and Software as a Service (SaaS), with its emphasis on productively creating well-tested, maintainable, reusable code, to let "one-pizza" teams of Berkeley undergrads design, develop, test, and deploy their own SaaS applications. Iteration-based agile development rewards regular progress, test-first design results in students actually enjoying testing, and cloud computing showcases deployed projects to friends, colleagues, and future employers, all while students absorb "big ideas" such as higher-order programming and metaprogramming. I'll also discuss other uses of cloud computing at Berkeley from lower-division through graduate CS courses.<br/>
<br/>
- <br/>
- <br/>
- <br/>
- <br/>
- <br/>
- </p>
+Armando Fox is an Adjunct Professor at UC Berkeley, a co-author of "Above the Clouds: A Berkeley View of Cloud Computing", and a researcher at the intersection of cloud computing, machine learning, and parallel computing.</p>
<div class="SectionHeader"><div class="Full">
<h2><a name="ibm">IBM</a></h2>
</div></div>
<p>Thursday, March 10, 2011: 3:45pm to 5:00pm</p>
<p>
<img src="/sigcse2011/images/logos/sponsors/ibm.png" align="left" class="headshot" />
<strong>Can Students Really Develop Software Collaboratively?</strong><br/>Speaker: Brian Schimpf<br/>
</br/>
In the "real world" of software development, developers rarely work on a project alone.
Development has become a "team sport" with accepted rules, best practices, and preferred
tools. However, too often, students graduate only knowing how to develop code as an individual
- not as part of a team. With IBM's Rational Team Concert (free for classroom use from IBM's
Academic Initiative) students can work in a real-world team development scenario -- each with
different roles on the team. Work items can be sized and assigned to each team member,
and anyone can view real-time status and project health. Even better, professors can use the
dashboards and reports to view each student's contribution to the project to help them assess
each student individually.</p>
<?php include("../parts/middle.php"); ?>
<?php include("../parts/attendees_right.php"); ?>
<?php
$updated = filemtime( $_SERVER["SCRIPT_FILENAME"] );
include("../parts/footer.php");
?>
|
mikehelmick/SIGCSE2011-Web-Site
|
9bd31292c4260ac274f25b1cf3b24c1ca6f066e0
|
supporter logs now appear in random order each time the page is loaded
|
diff --git a/exhibitors/index.php b/exhibitors/index.php
index 81e1151..fd3306c 100644
--- a/exhibitors/index.php
+++ b/exhibitors/index.php
@@ -1,211 +1,214 @@
<?php
$title = "SIGCSE 2011 - Exhibitors and Supporters";
$menu = "exhibitors";
include("../parts/top.php");
?> <!-- <h2>Important Dates</h2> -->
<div class="GoodMessage">
<p>SIGCSE 2011 <a href="/sigcse2011/exhibitors/downloads/SIGCSE_EP11.pdf" target="_blank"> Invitation to Exhibit / Conference Support Opportunities (PDF)</a> |
<a href="http://docs.google.com/viewer?url=http%3A%2F%2Fwww.sigcse.org%2Fsigcse2011%2Fexhibitors%2Fdownloads%2FSIGCSE_EP11.pdf">View online with Google docs Viewer</a>
</p>
</div>
<div class="SectionHeader"><div class="Full">
<h2>Exhibitors and Supporters</h2>
</div></div>
<p>
The Association for Computing Machinery
(<a href="http://www.acm.org">ACM</a>)
Special Interest Group on Computer Science Education
(<a href="http://www.sigcse.org">SIGCSE</a>)
is a community of approximately 2,600 educators and students
possessing a passion for studying and improving the state
of computer science education at all levels.
The annual SIGCSE Technical Symposium is the flagship conference
of our organization, and is attended by approximately
1,300 people. Conference attendees travel from across the globe
to learn new educational techniques, to examine the latest
textbooks, to share ideas with colleagues, to talk with
computing professionals, and to acquire hands-on experience
with new hardware and software, including software development
environments, classroom presentation technologies, on-line
collaboration tools, and robotics.
</p>
<!--
<p>
The exhibit hall hours will be:
</p>
<table style="width: 35%;">
<tbody>
<tr>
<td> </td>
<td style="font-size: 1.0em"> Thursday, March 5th </td>
<td style="font-size: 1.0em"> 10 a.m. - 6 p.m. </td>
</tr>
<tr>
<td> </td>
<td style="font-size: 1.0em"> Friday, March 6th </td>
<td style="font-size: 1.0em"> 10 a.m. - 6 p.m. </td>
</tr>
<tr>
<td> </td>
<td style="font-size: 1.0em"> Saturday, March 7th </td>
<td style="font-size: 1.0em"> 9:30 a.m. - Noon </td>
</tr>
</tbody>
</table>
-->
<div class="SectionHeader"><div class="Full">
<h2>Are You Interested in Becoming a Supporter and/or Exhibitor?</h2>
</div></div>
<ul>
<li>The <a href="/sigcse2011/exhibitors/downloads/SIGCSE_EP11.pdf" target="_blank">SIGCSE 2011 Invitation to Exhibit / Conference Support Opportunities</a> document (PDF; opens in new window) provides details on how your organization can connect with our community. </li>
<li><a href="/sigcse2011/exhibitors/downloads/acm_sigcse_2011_floorplan.pdf">Download the SIGCSE 2011 exhibit hall plan</a> or <a href="http://docs.google.com/viewer?url=http%3A%2F%2Fwww.sigcse.org%2Fsigcse2011%2Fexhibitors%2Fdownloads%2Facm_sigcse_2011_floorplan.pdf">View with Google docs Viewer</a>.</li>
<li>Here are two views of the SIGCSE 2008 Exhibit Hall. The 2011 conference is in a different location, but we hope that these views will give you a sense of what the 2011 exhibition space will look like. (Click on each for a larger version.)</li>
<table border="0" align="center">
<tr>
<td><a href="images/2008Hall01.jpg" rel="lightbox[students]" title="2008 Exhibit Hall"><img src="images/2008Hall01_thumb.jpg" /></a></td>
<td><a href="images/2008Hall02.jpg" rel="lightbox[students]" title="2008 Exhibit Hall"><img src="images/2008Hall02_thumb.jpg" /></a></td>
</tr>
</table>
</ul>
<div class="SectionHeader"><div class="Full">
<h2>SIGCSE 2011 Supporters and Exhibitors</h2>
</div></div>
<table width="100%">
<tr>
- <td align="center" valign="top" colspan="5"><h3>Platinum Supporters</h3></td>
+ <td align="center" valign="top" colspan="3"><h3>Platinum Supporters</h3></td>
</tr>
-<tr>
- <td align="center" valign="middle" colspan="2">
- <a href="http://research.google.com/university/" alt="Google"><img src="/sigcse2011/images/logos/sponsors/google.png" /></a>
- </td>
- <td align="center" valign="middle">
- <a href="http://www.intel.com/education/" alt="Intel Education"><img src="/sigcse2011/images/logos/sponsors/intel.png" /></a>
- </td>
- <td align="center" valign="middle" colspan="2">
- <a href="http://www.microsoft.com/education/highered/faculty/" alt="Microsoft Highered"><img src="/sigcse2011/images/logos/sponsors/microsoft.png" /></a>
- </td>
+<tr>
+<?php
+$sponsors = array("../parts/sponsor_google.php", "../parts/sponsor_intel.php", "../parts/sponsor_microsoft.php");
+shuffle($sponsors);
+foreach ($sponsors as $sponsor) {
+ include($sponsor);
+}
+?>
</tr>
<tr>
- <td align="center" valign="top" colspan="5"><h3>Gold Supporters</h3></td>
+ <td align="center" valign="top" colspan="3"><h3>Gold Supporters</h3></td>
</tr>
<tr>
- <td align="center" valign="middle" colspan="2">
- <a href="http://aws.amazon.com/education" alt="Amazon Web Services"><img src="/sigcse2011/images/logos/sponsors/aws.jpg" /></a>
- </td>
- <td> </td>
- <td align="center" valign="middle" colspan="2">
- <a href="http://www.ibm.com/academicinitiative" alt="IBM academic initiative"><img src="/sigcse2011/images/logos/sponsors/ibm.png" /></a>
- </td>
+<?php
+$sponsors = array("../parts/sponsor_amazon.php", "../parts/sponsor_ibm.php");
+shuffle($sponsors);
+$doEcho = true;
+foreach ($sponsors as $sponsor) {
+ include($sponsor);
+ if ($doEcho) {
+ echo "<td> </td>";
+ $doEcho = false;
+ }
+}
+?>
</tr>
</table>
<div class="SectionHeader"><div class="Full">
<h2>Exhibitors</h2>
</div></div>
<table><tr>
<td valign="top" align="left">
<ul>
<li>ACM SIGADA</li>
<li>ACM-W</li>
<li>AlgoViz.org/ Ensemble Projects</li>
<li>Amazon Web Services</li>
<li>Auburn University</li>
<li>Broadening Participation in Computing</li>
<li>CCS, Inc.</li>
<li>Course Technology Cengage Learning</li>
<li>CRC Press- Taylor & Francis Group LLC</li>
<li>Franklin, Beedle & Associated Incorporated</li>
<li>IBM / Academic Initiative</li>
<li>Intel Corporation</li>
<li>Intersystems Corporation</li>
</ul>
</td>
<td valign="top" align="left">
<ul>
<li>Jones and Bartlett</li>
<li>LEGO Education, North America</li>
<li>Microsoft</li>
<li>Morgan Kaufmann</li>
<li>NSF</li>
<li>Pearson Higher Education</li>
<li>Research In Motion Corporation</li>
<li>RidgSoft</li>
<li>Springer</li>
<li>The College Board</li>
<li>The MIT Press</li>
<li>Turingâs Craft</li>
<li>Wiley</li>
</ul>
</td></tr></table>
<div class="SectionHeader"><div class="Full">
<h2>In-Kind Donations</h2>
</div></div>
<table><tr>
<td valign="top" align="left"><ul>
<li>Microsoft - Computers and t-shirts for Kids Camp</li>
<li>Morgan Kaufman - Conference bags</li>
<li>Pearson - Lanyards</li>
<li>School of Computer Science, Carnegie Mellon University - Conference signage</li>
<li>Turingscraft - Student Volunteer T-shirts</li>
<li>UPE - Pizza Party for student volunteers</li>
</ul></td>
<td valign="top" align="left">
</td>
</tr></table>
<div class="SectionHeader"><div class="Full">
<h2>Questions?</h2>
</div></div>
<p>Questions about supporting and exhibiting at SIGCSE 2011 can be
directed to the Exhibit Manager or our Supporter / Exhibitor Liaison.</p>
<h3>Supporter/Exhibitor Liaison</h3>
<p>Prof. Susan Rodger at Duke University is a long time attendee of SIGCSE and
was a Symposium Co-Chair for SIGCSE 2008.<br />
<br />
Email: [email protected]<br />
Phone: 919-660-6595<br />
</p>
<h3>Exhibit Manager</h3>
<p>
Dorothea Heck<br />
D. Lawrence Planners LLC<br />
SIGCSE Exhibition Management<br />
1125 Atlantic Avenue STE 634<br />
Atlantic City, NJ 08401<br />
tel. 609.344.1333 <br />
fax. 609.348.4433<br />
E-mail: <script>write_email( "SIGCSE", "dlplan.com" );</script>
</p>
<?php include("../parts/middle.php"); ?>
<h2>Have a question?</h2>
<p>Find the appropriate SIGCSE 2011
<a href="/sigcse2011/committee/">program committee member</a>
and send us an email.</p>
<?php
$updated = filemtime( $_SERVER["SCRIPT_FILENAME"] );
include("../parts/footer.php");
?>
\ No newline at end of file
diff --git a/index.php b/index.php
index 995de07..3584676 100644
--- a/index.php
+++ b/index.php
@@ -1,70 +1,73 @@
<?php
$title = "SIGCSE 2011 - Home";
$menu = "home";
include("parts/top.php");
?>
<div id="GoodMessage">Dec 6, 2010: <strong><a href="/sigcse2011/attendees/registration.php">Registration is now open</a>!</strong> Early registration ends January 31, 2011.</div>
<div class="SectionHeader"><div class="Full">
<h2>Welcome to SIGCSE 2011</h2>
</div></div>
<p>SIGCSE 2011 continues our long tradition of bringing together colleagues from around the
world to present papers, panels, posters, special sessions, and workshops, and to discuss
computer science education in birds-of-a-feather sessions and informal settings at breaks
and meals. The SIGCSE Technical Symposium addresses problems common among educators working
to develop, implement and/or evaluate computing programs, curricula, and courses.
The symposium provides a forum for sharing new ideas for syllabi, laboratories,
and other elements of teaching and pedagogy, at all levels of instruction.</p>
<p>We encourage participation that addresses our theme, "reaching out". We need to reach out to colleagues in other fields, to develop interdisciplinary courses and research projects that integrate computer science and other fields, which enriches both. We need to reach out to create programs that attract and educate the next generation of computer scientists, especially currently underserved populations. We need to reach out to policy makers, educating them on the importance and promise of our discipline. Finally, we need to reach out to each other, as always sharing our best ideas and experiences with the SIGCSE community. We invite those interested in computer science education and computer science education research to contribute to SIGCSE 2011.</p>
<div class="SectionHeader"><div class="Full">
<h2>Our Venue : Sheraton Dallas Hotel</h2>
</div></div>
<p>All conference activities will be at the Sheraton hotel and its attached conference center. The Sheraton Dallas Hotel and conference center is located at 400 North Olive Street, Dallas, TX 75201. More information can be found on our <a href="/sigcse2011/attendees/accommodations.php">accommodations page</a>.</p>
<div class="SectionHeader"><div class="Full">
<h2>SIGCSE 2011 Supporters</h2>
</div></div>
<table width="100%">
<tr>
- <td align="center" valign="top" colspan="5"><h3>Platinum Supporters</h3></td>
+ <td align="center" valign="top" colspan="3"><h3>Platinum Supporters</h3></td>
</tr>
-<tr>
- <td align="center" valign="middle" colspan="2">
- <a href="http://research.google.com/university/" alt="Google"><img src="/sigcse2011/images/logos/sponsors/google.png" /></a>
- </td>
- <td align="center" valign="middle">
- <a href="http://www.intel.com/education/" alt="Intel Education"><img src="/sigcse2011/images/logos/sponsors/intel.png" /></a>
- </td>
- <td align="center" valign="middle" colspan="2">
- <a href="http://www.microsoft.com/education/highered/faculty/" alt="Microsoft Highered"><img src="/sigcse2011/images/logos/sponsors/microsoft.png" /></a>
- </td>
+<tr>
+<?php
+$sponsors = array("parts/sponsor_google.php", "parts/sponsor_intel.php", "parts/sponsor_microsoft.php");
+shuffle($sponsors);
+foreach ($sponsors as $sponsor) {
+ include($sponsor);
+}
+?>
</tr>
<tr>
- <td align="center" valign="top" colspan="5"><h3>Gold Supporters</h3></td>
+ <td align="center" valign="top" colspan="3"><h3>Gold Supporters</h3></td>
</tr>
<tr>
- <td align="center" valign="middle" colspan="2">
- <a href="http://aws.amazon.com/education" alt="Amazon Web Services"><img src="/sigcse2011/images/logos/sponsors/aws.jpg" /></a>
- </td>
- <td> </td>
- <td align="center" valign="middle" colspan="2">
- <a href="http://www.ibm.com/academicinitiative" alt="IBM academic initiative"><img src="/sigcse2011/images/logos/sponsors/ibm.png" /></a>
- </td>
+<?php
+$sponsors = array("parts/sponsor_amazon.php", "parts/sponsor_ibm.php");
+shuffle($sponsors);
+$doEcho = true;
+foreach ($sponsors as $sponsor) {
+ include($sponsor);
+ if ($doEcho) {
+ echo "<td> </td>";
+ $doEcho = false;
+ }
+}
+?>
</tr>
</table>
<?php include("parts/middle.php"); ?>
<?php include("parts/main_right.php"); ?>
<?php
$updated = filemtime( $_SERVER["SCRIPT_FILENAME"] );
$mainPage = true;
include("parts/footer.php");
?>
\ No newline at end of file
diff --git a/parts/sponsor_amazon.php b/parts/sponsor_amazon.php
new file mode 100644
index 0000000..04a073c
--- /dev/null
+++ b/parts/sponsor_amazon.php
@@ -0,0 +1,3 @@
+<td align="center" valign="middle">
+ <a href="http://aws.amazon.com/education" alt="Amazon Web Services"><img src="/sigcse2011/images/logos/sponsors/aws.jpg" /></a>
+</td>
\ No newline at end of file
diff --git a/parts/sponsor_google.php b/parts/sponsor_google.php
new file mode 100644
index 0000000..6d8713e
--- /dev/null
+++ b/parts/sponsor_google.php
@@ -0,0 +1,3 @@
+<td align="center" valign="middle">
+ <a href="http://research.google.com/university/" alt="Google"><img src="/sigcse2011/images/logos/sponsors/google.png" /></a>
+</td>
\ No newline at end of file
diff --git a/parts/sponsor_ibm.php b/parts/sponsor_ibm.php
new file mode 100644
index 0000000..032c753
--- /dev/null
+++ b/parts/sponsor_ibm.php
@@ -0,0 +1,3 @@
+<td align="center" valign="middle">
+ <a href="http://www.ibm.com/academicinitiative" alt="IBM academic initiative"><img src="/sigcse2011/images/logos/sponsors/ibm.png" /></a>
+</td>
\ No newline at end of file
diff --git a/parts/sponsor_intel.php b/parts/sponsor_intel.php
new file mode 100644
index 0000000..7f2092b
--- /dev/null
+++ b/parts/sponsor_intel.php
@@ -0,0 +1,3 @@
+<td align="center" valign="middle">
+ <a href="http://www.intel.com/education/" alt="Intel Education"><img src="/sigcse2011/images/logos/sponsors/intel.png" /></a>
+</td>
\ No newline at end of file
diff --git a/parts/sponsor_microsoft.php b/parts/sponsor_microsoft.php
new file mode 100644
index 0000000..af79e62
--- /dev/null
+++ b/parts/sponsor_microsoft.php
@@ -0,0 +1,3 @@
+<td align="center" valign="middle">
+ <a href="http://www.microsoft.com/education/highered/faculty/" alt="Microsoft Highered"><img src="/sigcse2011/images/logos/sponsors/microsoft.png" /></a>
+</td>
\ No newline at end of file
|
mikehelmick/SIGCSE2011-Web-Site
|
5b3741d1a0c49999a1f9d7d418aa38551c9b43d2
|
add Google as supporter. Still need to randomize supporter appearance order
|
diff --git a/attendees/supporter_sessions.php b/attendees/supporter_sessions.php
index f46f3f0..f1a8ae1 100644
--- a/attendees/supporter_sessions.php
+++ b/attendees/supporter_sessions.php
@@ -1,143 +1,161 @@
<?php
$title = "SIGCSE 2011 - Supporter Sessions";
$menu = "attendees";
include("../parts/top.php");
?>
<h1>SIGCSE 2011 Supporter Sessions</h1>
<div class="SectionHeader" style="clear:left;"><div class="Full">
<h2>SIGCSE 2011 Supporter Sessions</h2>
</div></div>
<ul>
<li><strong>Thursday, March 10, 2011</strong><ul>
<li>10:45 - 12:00 - <a href="#microsoft">Mircrosoft</a></li>
<li>1:45 - 3:00 - <a href="#intel">Intel</a></li>
<li>1:45 - 3:00 - <a href="#aws">Amazon Web Services</a></li>
<li>3:45 - 5:00 - <a href="#ibm">IBM</a></li>
</ul></li>
<li><strong>Friday, March 11, 2011</strong><ul>
<li>10:45 - 12:00 - <a href="#microsoft">Mircrosoft</a></li>
<li>1:45 - 3:00 - <a href="#intel">Intel</a></li>
- <li>3:45 - 5:00</li>
+ <li>1:45 - 3:00 - <a href="#google">Google</a></li>
+ <li>3:45 - 5:00 - <a href="#google">Google</a></li>
</ul></li>
<li><strong>Saturday, March 12, 2011</strong><ul>
<li>10:55 - 12:10</li>
</ul></li>
</ul>
+<div class="SectionHeader"><div class="Full">
+<h2><a name="intel">Google</a></h2>
+</div></div>
+<p><ul><li>Friday, March 11, 2011 - 1:45pm to 3:00pm</li>
+<li>Friday, March 11, 2011 - 3:45pm to 5:00pm</li></ul></p>
+
+<p>
+<img src="/sigcse2011/images/logos/sponsors/google.png" align="left" class="headshot" />
+ <br/>
+ <br/>
+ <br/>
+ <br/>
+ <br/>
+ <br/>
+ <br/>
+ </p>
+
<div class="SectionHeader"><div class="Full">
<h2><a name="intel">Intel</a></h2>
</div></div>
<p><ul><li>Thursday, March 10, 2011 - 1:45pm to 3:00pm</li>
<li>Friday, March 11, 2011 - 1:45pm to 3:00pm</li></ul></p>
<p>
<img src="/sigcse2011/images/logos/sponsors/intel.png" align="left" class="headshot" />
<strong>Intel Academic Community - Global MeeGo</strong><br/>
Speaker: Selwyn You - Intel Corporation, Jukka Heikkilä - University of Jyväskylä, Russel J Clark and Matthew Wolf - Georgia Institute of Technology<br/>
<em>Thursday, March 10: 1:45-3:00 PM</em><br/> <br/>
Have you heard the buzz about MeeGo? The newly formed MeeGo Operating System, a combination of Intelâs Moblin and Nokiaâs Maemo, provides a unified development environment for developers with worldwide distribution channels to consumers. Learn how Intelâs Global MeeGo University program can help
you integrate application development on netbooks, tablets,
and smartphones into your curricula. Professors from the
University of Jyväskylä and Georgia Institute of Technology will
share insight into classroom modules that meet demand for rich
application development on client devices. They will also share
student feedback, in addition to how, why, and when you should
start introducing MeeGo to your students.</p>
<p><strong>Case Study - Using the Intel Manycore Testing Lab to Test and Scale Applications</strong><br/>
Speaker Name: Bob Chesebrough, Innovative Software Education, Intel<br/>
<em>Friday March 11 - 1:45 pm- 3:00 pm</em><br/> <br/>
Expand your studentsâ learning experiences with the Intel Manycore Testing Labâa
unique, global, remote-access facility made available at no charge to members of the
Intel Academic Community. The Intel Manycore Testing lab can be used to test, validate,
and improve the scalability of classroom labs, homework, and capstone projects. The
lab supports both Linux* and MS Windows* with a 32-CPU/64-thread development
environment, including up-to-date, essential performance tools to assist professors and
their students.</p>
<p>
Bob Chesebrough will demonstrate a command-line ray tracer application created by
Masterâs degree student Dave Frogley. The application was tested, scaled, and tuned
on the Intel Manycore Testing Lab. Discussions will include scaling methodologies and
state-of-the-art software tools. Bob Chesebrough is a senior course architect in Intelâs
Innovative Software Education department.
</p>
<div class="SectionHeader"><div class="Full">
<h2><a name="microsoft">Microsoft</a></h2>
</div></div>
<p><ul><li>Thursday, March 10, 2011 - 10:45am to 12:00pm</li>
<li>Friday, March 11, 2011 - 10:45am to 12:00pm</li></p>
<p>
<img src="/sigcse2011/images/logos/sponsors/microsoft.png" align="left" class="headshot" />
<strong>F# - From Foundations to Modern Parallel and Data Rich Functional Programming</strong><br/>
Speakers: Don Syme (Microsoft Research, Cambridge) and Nigel Horspool tbc (University of Victoria)<br/>
<em>Thursday, March 10, 2011 - 10:45am to 12:00pm<br/>
<br/>
F# is a multi-paradigm programming language, targeting the .NET/Mono platforms. F# brings you type safe, succinct, efficient and expressive functional programming language supporting both the imperative and object-oriented programming disciplines. It is a simple and pragmatic language, and has particular strengths in data-oriented programming, parallel I/O programming, parallel CPU programming, scripting and algorithmic development. F# combines the advantages of typed functional programming with a high-quality, well-supported modern runtime system and set of libraries. This tutorial will teach F# from several angles:
<ul>
<li>F# as a cross platform language for teaching, including using F# on Windows, Macs, with Linux and MonoDevelop, and on the TryF# system</li>
<li>The advanced features of F#, including asynchronous and parallel programming and units of measure</li>
<li>F# type providers and their applications to strongly typed programming with web ontologies</li>
<li>F# as a modern data programming environment, including writing data-rich phone applications</li>
</ul>
Attendees should come away with a good idea of the utility and power of F# in the classroom context, and its use all the way up to postgraduate and research level.</p>
<p>
<strong>PexForFun - Programming Exercises and Automatic Grading in the Cloud</strong><br/>
Speakers: Peli de Halleux and Nikolai Tillmann, Microsoft Research, Redmond<br/>
<em>Friday, March 11, 2011 - 10:45am to 12:00pm</em><br/> <br/>
PexForFun can be used to learn software programming at many levels, from high school all the way through graduate courses. With PexForFun, the student edits the code in any browser and we execute it and analyze it for you in the cloud. PexForFun supports C#, VisualBasic and F#. Because Pex4Fun has Intellisense, learning the syntax is not an obstacle for beginners. PexForFun finds interesting and unexpected input values that help students understand what their code is actually doing. Under the hood, PexForFun uses dynamic symbolic execution to thoroughly explore feasible execution paths. The real fun starts with Coding Duels where the student has to write code that implements a specification. PexForFun finds any discrepancies between the studentâs code and the specification. PexForFun connects teachers, curriculum authors and students in a unique social experience, tracking and streaming progress updates in real time. Enough said, try it for yourself at <a href="http://pex4fun.com/">http://pex4fun.com/</a> and come and hear about it at this tutorial, given by the authors of the system.
</p>
<div class="SectionHeader"><div class="Full">
<h2><a name="aws">Amazon Web Services</a></h2>
</div></div>
-<p>Thursday, March 10, 2011 - 10:45am to 12:00pm</p>
+<p>Thursday, March 10, 2011 - 1:45pm - 3:00pm</p>
<p><img src="/sigcse2011/images/logos/sponsors/aws.jpg" align="left" class="headshot" />
<br/>
<br/>
<br/>
<br/>
<br/>
<br/>
<br/>
</p>
<div class="SectionHeader"><div class="Full">
<h2><a name="ibm">IBM</a></h2>
</div></div>
<p>Thursday, March 10, 2011: 3:45pm to 5:00pm</p>
<p>
<img src="/sigcse2011/images/logos/sponsors/ibm.png" align="left" class="headshot" />
<strong>Can Students Really Develop Software Collaboratively?</strong><br/>Speaker: Brian Schimpf<br/>
</br/>
In the "real world" of software development, developers rarely work on a project alone.
Development has become a "team sport" with accepted rules, best practices, and preferred
tools. However, too often, students graduate only knowing how to develop code as an individual
- not as part of a team. With IBM's Rational Team Concert (free for classroom use from IBM's
Academic Initiative) students can work in a real-world team development scenario -- each with
different roles on the team. Work items can be sized and assigned to each team member,
and anyone can view real-time status and project health. Even better, professors can use the
dashboards and reports to view each student's contribution to the project to help them assess
each student individually.</p>
<?php include("../parts/middle.php"); ?>
<?php include("../parts/attendees_right.php"); ?>
<?php
$updated = filemtime( $_SERVER["SCRIPT_FILENAME"] );
include("../parts/footer.php");
?>
diff --git a/exhibitors/index.php b/exhibitors/index.php
index f6bb67c..81e1151 100644
--- a/exhibitors/index.php
+++ b/exhibitors/index.php
@@ -1,207 +1,211 @@
<?php
$title = "SIGCSE 2011 - Exhibitors and Supporters";
$menu = "exhibitors";
include("../parts/top.php");
?> <!-- <h2>Important Dates</h2> -->
<div class="GoodMessage">
<p>SIGCSE 2011 <a href="/sigcse2011/exhibitors/downloads/SIGCSE_EP11.pdf" target="_blank"> Invitation to Exhibit / Conference Support Opportunities (PDF)</a> |
<a href="http://docs.google.com/viewer?url=http%3A%2F%2Fwww.sigcse.org%2Fsigcse2011%2Fexhibitors%2Fdownloads%2FSIGCSE_EP11.pdf">View online with Google docs Viewer</a>
</p>
</div>
<div class="SectionHeader"><div class="Full">
<h2>Exhibitors and Supporters</h2>
</div></div>
<p>
The Association for Computing Machinery
(<a href="http://www.acm.org">ACM</a>)
Special Interest Group on Computer Science Education
(<a href="http://www.sigcse.org">SIGCSE</a>)
is a community of approximately 2,600 educators and students
possessing a passion for studying and improving the state
of computer science education at all levels.
The annual SIGCSE Technical Symposium is the flagship conference
of our organization, and is attended by approximately
1,300 people. Conference attendees travel from across the globe
to learn new educational techniques, to examine the latest
textbooks, to share ideas with colleagues, to talk with
computing professionals, and to acquire hands-on experience
with new hardware and software, including software development
environments, classroom presentation technologies, on-line
collaboration tools, and robotics.
</p>
<!--
<p>
The exhibit hall hours will be:
</p>
<table style="width: 35%;">
<tbody>
<tr>
<td> </td>
<td style="font-size: 1.0em"> Thursday, March 5th </td>
<td style="font-size: 1.0em"> 10 a.m. - 6 p.m. </td>
</tr>
<tr>
<td> </td>
<td style="font-size: 1.0em"> Friday, March 6th </td>
<td style="font-size: 1.0em"> 10 a.m. - 6 p.m. </td>
</tr>
<tr>
<td> </td>
<td style="font-size: 1.0em"> Saturday, March 7th </td>
<td style="font-size: 1.0em"> 9:30 a.m. - Noon </td>
</tr>
</tbody>
</table>
-->
<div class="SectionHeader"><div class="Full">
<h2>Are You Interested in Becoming a Supporter and/or Exhibitor?</h2>
</div></div>
<ul>
<li>The <a href="/sigcse2011/exhibitors/downloads/SIGCSE_EP11.pdf" target="_blank">SIGCSE 2011 Invitation to Exhibit / Conference Support Opportunities</a> document (PDF; opens in new window) provides details on how your organization can connect with our community. </li>
<li><a href="/sigcse2011/exhibitors/downloads/acm_sigcse_2011_floorplan.pdf">Download the SIGCSE 2011 exhibit hall plan</a> or <a href="http://docs.google.com/viewer?url=http%3A%2F%2Fwww.sigcse.org%2Fsigcse2011%2Fexhibitors%2Fdownloads%2Facm_sigcse_2011_floorplan.pdf">View with Google docs Viewer</a>.</li>
<li>Here are two views of the SIGCSE 2008 Exhibit Hall. The 2011 conference is in a different location, but we hope that these views will give you a sense of what the 2011 exhibition space will look like. (Click on each for a larger version.)</li>
<table border="0" align="center">
<tr>
<td><a href="images/2008Hall01.jpg" rel="lightbox[students]" title="2008 Exhibit Hall"><img src="images/2008Hall01_thumb.jpg" /></a></td>
<td><a href="images/2008Hall02.jpg" rel="lightbox[students]" title="2008 Exhibit Hall"><img src="images/2008Hall02_thumb.jpg" /></a></td>
</tr>
</table>
</ul>
<div class="SectionHeader"><div class="Full">
<h2>SIGCSE 2011 Supporters and Exhibitors</h2>
</div></div>
<table width="100%">
<tr>
- <td align="center" valign="top" colspan="2"><h3>Platinum Supporters</h3></td>
+ <td align="center" valign="top" colspan="5"><h3>Platinum Supporters</h3></td>
</tr>
<tr>
- <td align="center" valign="top">
- <a href="http://www.intel.com/education/" alt="Intel Education"> <img src="/sigcse2011/images/logos/sponsors/intel.png" /></a>
+ <td align="center" valign="middle" colspan="2">
+ <a href="http://research.google.com/university/" alt="Google"><img src="/sigcse2011/images/logos/sponsors/google.png" /></a>
</td>
- <td align="center" valign="middle">
+ <td align="center" valign="middle">
+ <a href="http://www.intel.com/education/" alt="Intel Education"><img src="/sigcse2011/images/logos/sponsors/intel.png" /></a>
+ </td>
+ <td align="center" valign="middle" colspan="2">
<a href="http://www.microsoft.com/education/highered/faculty/" alt="Microsoft Highered"><img src="/sigcse2011/images/logos/sponsors/microsoft.png" /></a>
</td>
</tr>
<tr>
- <td align="center" valign="top" colspan="2"><h3>Gold Supporters</h3></td>
+ <td align="center" valign="top" colspan="5"><h3>Gold Supporters</h3></td>
</tr>
<tr>
- <td align="center" valign="middle">
+ <td align="center" valign="middle" colspan="2">
<a href="http://aws.amazon.com/education" alt="Amazon Web Services"><img src="/sigcse2011/images/logos/sponsors/aws.jpg" /></a>
</td>
- <td align="center" valign="middle">
- <a href="http://www.ibm.com/academicinitiative" alt="IBMim"><img src="/sigcse2011/images/logos/sponsors/ibm.png" /></a>
+ <td> </td>
+ <td align="center" valign="middle" colspan="2">
+ <a href="http://www.ibm.com/academicinitiative" alt="IBM academic initiative"><img src="/sigcse2011/images/logos/sponsors/ibm.png" /></a>
</td>
</tr>
</table>
<div class="SectionHeader"><div class="Full">
<h2>Exhibitors</h2>
</div></div>
<table><tr>
<td valign="top" align="left">
<ul>
<li>ACM SIGADA</li>
<li>ACM-W</li>
<li>AlgoViz.org/ Ensemble Projects</li>
<li>Amazon Web Services</li>
<li>Auburn University</li>
<li>Broadening Participation in Computing</li>
<li>CCS, Inc.</li>
<li>Course Technology Cengage Learning</li>
<li>CRC Press- Taylor & Francis Group LLC</li>
<li>Franklin, Beedle & Associated Incorporated</li>
<li>IBM / Academic Initiative</li>
<li>Intel Corporation</li>
<li>Intersystems Corporation</li>
</ul>
</td>
<td valign="top" align="left">
<ul>
<li>Jones and Bartlett</li>
<li>LEGO Education, North America</li>
<li>Microsoft</li>
<li>Morgan Kaufmann</li>
<li>NSF</li>
<li>Pearson Higher Education</li>
<li>Research In Motion Corporation</li>
<li>RidgSoft</li>
<li>Springer</li>
<li>The College Board</li>
<li>The MIT Press</li>
<li>Turingâs Craft</li>
<li>Wiley</li>
</ul>
</td></tr></table>
<div class="SectionHeader"><div class="Full">
<h2>In-Kind Donations</h2>
</div></div>
<table><tr>
<td valign="top" align="left"><ul>
<li>Microsoft - Computers and t-shirts for Kids Camp</li>
<li>Morgan Kaufman - Conference bags</li>
<li>Pearson - Lanyards</li>
<li>School of Computer Science, Carnegie Mellon University - Conference signage</li>
<li>Turingscraft - Student Volunteer T-shirts</li>
<li>UPE - Pizza Party for student volunteers</li>
</ul></td>
<td valign="top" align="left">
</td>
</tr></table>
<div class="SectionHeader"><div class="Full">
<h2>Questions?</h2>
</div></div>
<p>Questions about supporting and exhibiting at SIGCSE 2011 can be
directed to the Exhibit Manager or our Supporter / Exhibitor Liaison.</p>
<h3>Supporter/Exhibitor Liaison</h3>
<p>Prof. Susan Rodger at Duke University is a long time attendee of SIGCSE and
was a Symposium Co-Chair for SIGCSE 2008.<br />
<br />
Email: [email protected]<br />
Phone: 919-660-6595<br />
</p>
<h3>Exhibit Manager</h3>
<p>
Dorothea Heck<br />
D. Lawrence Planners LLC<br />
SIGCSE Exhibition Management<br />
1125 Atlantic Avenue STE 634<br />
Atlantic City, NJ 08401<br />
tel. 609.344.1333 <br />
fax. 609.348.4433<br />
E-mail: <script>write_email( "SIGCSE", "dlplan.com" );</script>
</p>
<?php include("../parts/middle.php"); ?>
<h2>Have a question?</h2>
<p>Find the appropriate SIGCSE 2011
<a href="/sigcse2011/committee/">program committee member</a>
and send us an email.</p>
<?php
$updated = filemtime( $_SERVER["SCRIPT_FILENAME"] );
include("../parts/footer.php");
?>
\ No newline at end of file
diff --git a/index.php b/index.php
index 9760968..995de07 100644
--- a/index.php
+++ b/index.php
@@ -1,66 +1,70 @@
<?php
$title = "SIGCSE 2011 - Home";
$menu = "home";
include("parts/top.php");
?>
<div id="GoodMessage">Dec 6, 2010: <strong><a href="/sigcse2011/attendees/registration.php">Registration is now open</a>!</strong> Early registration ends January 31, 2011.</div>
<div class="SectionHeader"><div class="Full">
<h2>Welcome to SIGCSE 2011</h2>
</div></div>
<p>SIGCSE 2011 continues our long tradition of bringing together colleagues from around the
world to present papers, panels, posters, special sessions, and workshops, and to discuss
computer science education in birds-of-a-feather sessions and informal settings at breaks
and meals. The SIGCSE Technical Symposium addresses problems common among educators working
to develop, implement and/or evaluate computing programs, curricula, and courses.
The symposium provides a forum for sharing new ideas for syllabi, laboratories,
and other elements of teaching and pedagogy, at all levels of instruction.</p>
<p>We encourage participation that addresses our theme, "reaching out". We need to reach out to colleagues in other fields, to develop interdisciplinary courses and research projects that integrate computer science and other fields, which enriches both. We need to reach out to create programs that attract and educate the next generation of computer scientists, especially currently underserved populations. We need to reach out to policy makers, educating them on the importance and promise of our discipline. Finally, we need to reach out to each other, as always sharing our best ideas and experiences with the SIGCSE community. We invite those interested in computer science education and computer science education research to contribute to SIGCSE 2011.</p>
<div class="SectionHeader"><div class="Full">
<h2>Our Venue : Sheraton Dallas Hotel</h2>
</div></div>
<p>All conference activities will be at the Sheraton hotel and its attached conference center. The Sheraton Dallas Hotel and conference center is located at 400 North Olive Street, Dallas, TX 75201. More information can be found on our <a href="/sigcse2011/attendees/accommodations.php">accommodations page</a>.</p>
<div class="SectionHeader"><div class="Full">
<h2>SIGCSE 2011 Supporters</h2>
</div></div>
<table width="100%">
<tr>
- <td align="center" valign="top" colspan="2"><h3>Platinum Supporters</h3></td>
+ <td align="center" valign="top" colspan="5"><h3>Platinum Supporters</h3></td>
</tr>
<tr>
+ <td align="center" valign="middle" colspan="2">
+ <a href="http://research.google.com/university/" alt="Google"><img src="/sigcse2011/images/logos/sponsors/google.png" /></a>
+ </td>
<td align="center" valign="middle">
<a href="http://www.intel.com/education/" alt="Intel Education"><img src="/sigcse2011/images/logos/sponsors/intel.png" /></a>
</td>
- <td align="center" valign="middle">
+ <td align="center" valign="middle" colspan="2">
<a href="http://www.microsoft.com/education/highered/faculty/" alt="Microsoft Highered"><img src="/sigcse2011/images/logos/sponsors/microsoft.png" /></a>
</td>
</tr>
<tr>
- <td align="center" valign="top" colspan="2"><h3>Gold Supporters</h3></td>
+ <td align="center" valign="top" colspan="5"><h3>Gold Supporters</h3></td>
</tr>
<tr>
- <td align="center" valign="middle">
+ <td align="center" valign="middle" colspan="2">
<a href="http://aws.amazon.com/education" alt="Amazon Web Services"><img src="/sigcse2011/images/logos/sponsors/aws.jpg" /></a>
</td>
- <td align="center" valign="middle">
+ <td> </td>
+ <td align="center" valign="middle" colspan="2">
<a href="http://www.ibm.com/academicinitiative" alt="IBM academic initiative"><img src="/sigcse2011/images/logos/sponsors/ibm.png" /></a>
</td>
</tr>
</table>
<?php include("parts/middle.php"); ?>
<?php include("parts/main_right.php"); ?>
<?php
$updated = filemtime( $_SERVER["SCRIPT_FILENAME"] );
$mainPage = true;
include("parts/footer.php");
?>
\ No newline at end of file
|
mikehelmick/SIGCSE2011-Web-Site
|
b48257331de9865f2d346738d2a4285217a5368b
|
clarify that wifi is included in hotel rate
|
diff --git a/attendees/accommodations.php b/attendees/accommodations.php
index 876926a..2176f0f 100644
--- a/attendees/accommodations.php
+++ b/attendees/accommodations.php
@@ -1,78 +1,78 @@
<?php
$title = "SIGCSE 2011 - Accommodations";
$menu = "attendees";
include("../parts/top.php");
?>
<!-- right area -->
<h1>SIGCSE 2011 Accommodations</h1>
<p>To help conference attendees begin their travel planning, we are happy to
provide the following information about the hotel which will have blocks
of rooms available at special conference rates. And, as SIGCSE has done in
the past, we will have a roommate matching website to help pair you with a
roommate to reduce the cost of attending the symposium.</p>
<div class="SectionHeader"><div class="Full">
<h2>Conference Hotel</h2>
</div></div>
<br/>
<p><img src="/sigcse2011/images/sheraton-dallas-hotel.jpg" width="300" align="left" class="headshot" />
The conference hotel is Sheraton Dallas Hotel, 400 North Olive Street, Dallas, TX 75201. The group rate is $159 + tax. This rate includes free wireless
-access in hotel rooms in the Sheraton.<br/>
+access in hotel rooms in the Sheraton. <em>When making your reservation, you may see that Wifi costs extra. Don't panic! As long as make your hotel reservation through this link, wireless internet access is included in your stay.</em><br/>
<strong><a href="http://www.starwoodmeeting.com/StarGroupsWeb/res?id=1011221675&key=112A2">Click here to make your hotel reservations</a></strong>
<br/> <br/>
<strong>All conference activities will be at the Sheraton hotel and its attached conference center.</strong>
<br/>
<em><a href="travel_information.php">View a map and see travel information.</a></em>
</p>
<div class="SectionHeader" style="clear: left;"><div class="Full">
<h2>Why should I stay at the conference hotel?</h2>
</div></div>
<p>If you stay at the conference hotel, you'll be able to network easily with
other conference attendees. It's a quick trip to get to the program and
functions, and just as quick to zip back to your room for a break. Plus,
we've negotiated for free Internet at the conference hotel and a
significantly reduced room rate to stay in downtown Dallas. Overall,
you'll have a much better conference experience if you stay at the
conference hotel. Staying at the conference hotel also supports SIGCSE
since we are required to pay for unused rooms in our reserved block which
raises costs for future SIGCSE conferences. So make your conference
experience a better one and help SIGCSE at the same time --- please
reserve your room at the Sheraton Dallas.</p>
<p><em>(If you somehow obtain a better rate online than the one listed on our
site, your stay will still be counted toward our required room block, but
keep in mind that there are often restrictions and/or penalties associated
with these rates. )</em></p>
<p><strong>WIN A FREE UPGRADE</strong>: Every attendee that preregisters for SIGCSE 2011 at
the regular conference rate and reserves a room at the Sheraton Dallas
will be entered into a drawing to win a complimentary upgrade to a suite.
(Free upgrade drawing not available with exhibits-only, teacher or student
rates.)</p>
<div class="SectionHeader" style="clear: left"><div class="Full">
<h2>Roommate matching</h2>
</div></div>
<p>We recognize that many SIGCSE attendees work at schools with very limited, even nonexistent!, travel budgets. To help you reduce your cost to participate in the symposium, we are happy to once again provide
assistance with roommate matching: The <a href="http://www.tymann.us/sigcse" target="_blank">SIGCSE 2011 Roommate Database</a>. Once registered, you can input your preferences and see other registrants who have compatible preferences. The rest is up to you!</p>
<p>The roommate database is hosted and administered by <a href="http://www.cs.rit.edu/~ptt/" target="_blank">Paul Tymann</a>. Please contact Paul (<script>write_email("ptt", "cs.rit.edu")</script>) with any questions that you may have about this
service.
<?php include("../parts/middle.php"); ?>
<?php include("../parts/attendees_right.php"); ?>
<?php
$updated = filemtime( $_SERVER["SCRIPT_FILENAME"] );
include("../parts/footer.php");
?>
|
VsVim/VsVim
|
6cf43acaa10cf1d0a9586d2a8d4aa70af441a3f5
|
Temporary fix for https://github.com/dotnet/sdk/issues/34438
|
diff --git a/Src/VimApp/VimApp.csproj b/Src/VimApp/VimApp.csproj
index 054ccbe..a190190 100644
--- a/Src/VimApp/VimApp.csproj
+++ b/Src/VimApp/VimApp.csproj
@@ -1,46 +1,47 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>VimApp</RootNamespace>
<AssemblyName>VimApp</AssemblyName>
<TargetFramework>net472</TargetFramework>
<DefineConstants>$(DefineConstants);VS_SPECIFIC_VIM_APP</DefineConstants>
<VsVimVisualStudioTargetVersion>17.0</VsVimVisualStudioTargetVersion>
<VsVimProjectType>EditorHost</VsVimProjectType>
-
+ <!-- Temporary fix for https://github.com/dotnet/sdk/issues/34438 -->
+ <EmbedUntrackedSources>false</EmbedUntrackedSources>
<!--
Disabling the VS threading analyzers here. This is a run of the mill WPF project and
doesn't benefit from these analyzers.
-->
<NoWarn>$(NoWarn);VSTHRD110;VSTHRD001</NoWarn>
</PropertyGroup>
<ItemGroup>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Core" />
<Reference Include="System.Xaml" />
<Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup>
<ApplicationDefinition Include="App.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</ApplicationDefinition>
<Page Include="MainWindow.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\VimCore\VimCore.fsproj" />
<ProjectReference Include="..\VimTestUtils\VimTestUtils.csproj" />
<Reference Include="Microsoft.VisualStudio.Setup.Configuration.Interop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
</ItemGroup>
<Import Project="..\VimWpf\VimWpf.projitems" Label="Shared" />
<Import Project="..\VimEditorHost\VimEditorHost.projitems" Label="Shared" />
</Project>
diff --git a/Src/VsVim2019/VsVim2019.csproj b/Src/VsVim2019/VsVim2019.csproj
index 10457de..91e7912 100644
--- a/Src/VsVim2019/VsVim2019.csproj
+++ b/Src/VsVim2019/VsVim2019.csproj
@@ -1,82 +1,85 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<PlatformTarget>x86</PlatformTarget>
<ProductVersion>10.0.20305</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<OutputType>Library</OutputType>
<RootNamespace>Vim.VisualStudio</RootNamespace>
<AssemblyName>VsVim</AssemblyName>
<TargetFramework>net472</TargetFramework>
<StartAction>Program</StartAction>
<UseCodebase>true</UseCodebase>
<StartProgram>$(DevEnvDir)\devenv.exe</StartProgram>
<StartArguments>/rootsuffix Exp</StartArguments>
<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
<VsVimProjectType>Vsix</VsVimProjectType>
<VsVimVisualStudioTargetVersion>16.0</VsVimVisualStudioTargetVersion>
<DeployExtension Condition="'$(VisualStudioVersion)' != '16.0' OR '$(BuildingInsideVisualStudio)' != 'true'">False</DeployExtension>
<!-- This is needed to prevent forced migrations when opening the project in Vs2017 -->
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
+
+ <!-- Temporary fix for https://github.com/dotnet/sdk/issues/34438 -->
+ <EmbedUntrackedSources>false</EmbedUntrackedSources>
</PropertyGroup>
<ItemGroup>
<!-- Shared items -->
<Content Include="..\VsVimShared\Metadata\Images_32bit.bmp" Link="Images_32bit.bmp" />
<Content Include="..\VsVimShared\Metadata\KeyboardInputRouting.txt" Link="KeyboardInputRouting.txt" />
<Content Include="..\VsVimShared\Metadata\License.txt" Link="License.txt">
<IncludeInVSIX>true</IncludeInVSIX>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="..\VsVimShared\Metadata\Package.ico" Link="Package.ico" />
<Content Include="..\VsVimShared\Metadata\VsVim_large.png" Link="VsVim_large.png">
<IncludeInVSIX>true</IncludeInVSIX>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="..\VsVimShared\Metadata\VsVim_small.png" Link="VsVim_small.png">
<IncludeInVSIX>true</IncludeInVSIX>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="..\VsVimShared\Metadata\Colors.pkgdef" Link="Colors.pkgdef">
<IncludeInVSIX>true</IncludeInVSIX>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="..\VsVimShared\Metadata\VsVim_full.pdf" Link="VsVim_full.pdf">
<IncludeInVSIX>true</IncludeInVSIX>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="..\VsVimShared\Metadata\VsVim.vsct" Link="VsVim.vsct" />
<VSCTCompile Include="..\VsVimShared\Metadata\VsVim.vsct">
<ResourceName>Menus.ctmenu</ResourceName>
<SubType>Designer</SubType>
</VSCTCompile>
<None Include="source.extension.vsixmanifest">
<SubType>Designer</SubType>
</None>
</ItemGroup>
<ItemGroup>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Core" />
<Reference Include="System.Data" />
<Reference Include="System.Design" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="System.Xaml" />
<Reference Include="WindowsBase" />
<Reference Include="WindowsFormsIntegration" />
<ProjectReference Include="..\VimCore\VimCore.fsproj">
<Name>VimCore</Name>
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bBuiltProjectOutputGroupDependencies%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
<ForceIncludeInVSIX>true</ForceIncludeInVSIX>
</ProjectReference>
</ItemGroup>
<Import Project="..\VsVimShared\VsVimShared.projitems" Label="Shared" />
<Import Project="..\VimWpf\VimWpf.projitems" Label="Shared" />
</Project>
diff --git a/Src/VsVim2022/VsVim2022.csproj b/Src/VsVim2022/VsVim2022.csproj
index a73e691..d00abca 100644
--- a/Src/VsVim2022/VsVim2022.csproj
+++ b/Src/VsVim2022/VsVim2022.csproj
@@ -1,81 +1,84 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<ProductVersion>10.0.20305</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<OutputType>Library</OutputType>
<RootNamespace>Vim.VisualStudio</RootNamespace>
<AssemblyName>VsVim</AssemblyName>
<TargetFramework>net472</TargetFramework>
<StartAction>Program</StartAction>
<UseCodebase>true</UseCodebase>
<StartProgram>$(DevEnvDir)\devenv.exe</StartProgram>
<StartArguments>/rootsuffix Exp</StartArguments>
<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
<VsVimProjectType>Vsix</VsVimProjectType>
<VsVimVisualStudioTargetVersion>17.0</VsVimVisualStudioTargetVersion>
<DeployExtension Condition="'$(VisualStudioVersion)' != '17.0' OR '$(BuildingInsideVisualStudio)' != 'true'">False</DeployExtension>
<!-- This is needed to prevent forced migrations when opening the project in Vs2017 -->
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
+
+ <!-- Temporary fix for https://github.com/dotnet/sdk/issues/34438 -->
+ <EmbedUntrackedSources>false</EmbedUntrackedSources>
</PropertyGroup>
<ItemGroup>
<!-- Shared items -->
<Content Include="..\VsVimShared\Metadata\Images_32bit.bmp" Link="Images_32bit.bmp" />
<Content Include="..\VsVimShared\Metadata\KeyboardInputRouting.txt" Link="KeyboardInputRouting.txt" />
<Content Include="..\VsVimShared\Metadata\License.txt" Link="License.txt">
<IncludeInVSIX>true</IncludeInVSIX>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="..\VsVimShared\Metadata\Package.ico" Link="Package.ico" />
<Content Include="..\VsVimShared\Metadata\VsVim_large.png" Link="VsVim_large.png">
<IncludeInVSIX>true</IncludeInVSIX>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="..\VsVimShared\Metadata\VsVim_small.png" Link="VsVim_small.png">
<IncludeInVSIX>true</IncludeInVSIX>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="..\VsVimShared\Metadata\Colors.pkgdef" Link="Colors.pkgdef">
<IncludeInVSIX>true</IncludeInVSIX>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="..\VsVimShared\Metadata\VsVim_full.pdf" Link="VsVim_full.pdf">
<IncludeInVSIX>true</IncludeInVSIX>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="..\VsVimShared\Metadata\VsVim.vsct" Link="VsVim.vsct" />
<VSCTCompile Include="..\VsVimShared\Metadata\VsVim.vsct">
<ResourceName>Menus.ctmenu</ResourceName>
<SubType>Designer</SubType>
</VSCTCompile>
<None Include="source.extension.vsixmanifest">
<SubType>Designer</SubType>
</None>
</ItemGroup>
<ItemGroup>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Core" />
<Reference Include="System.Data" />
<Reference Include="System.Design" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="System.Xaml" />
<Reference Include="WindowsBase" />
<Reference Include="WindowsFormsIntegration" />
<ProjectReference Include="..\VimCore\VimCore.fsproj">
<Name>VimCore</Name>
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bBuiltProjectOutputGroupDependencies%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
<ForceIncludeInVSIX>true</ForceIncludeInVSIX>
</ProjectReference>
</ItemGroup>
<Import Project="..\VsVimShared\VsVimShared.projitems" Label="Shared" />
<Import Project="..\VimWpf\VimWpf.projitems" Label="Shared" />
</Project>
diff --git a/Test/VimCoreTest2019/VimCoreTest2019.csproj b/Test/VimCoreTest2019/VimCoreTest2019.csproj
index a93d172..d199820 100644
--- a/Test/VimCoreTest2019/VimCoreTest2019.csproj
+++ b/Test/VimCoreTest2019/VimCoreTest2019.csproj
@@ -1,43 +1,45 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<PlatformTarget>x86</PlatformTarget>
<OutputType>Library</OutputType>
<RootNamespace>Vim.UnitTest</RootNamespace>
<AssemblyName>Vim.Core.2019.UnitTest</AssemblyName>
<TargetFramework>net472</TargetFramework>
<VsVimProjectType>EditorHost</VsVimProjectType>
<VsVimVisualStudioTargetVersion>16.0</VsVimVisualStudioTargetVersion>
<DefineConstants>$(DefineConstants);VS_UNIT_TEST_HOST</DefineConstants>
<!-- Enabling tracked by https://github.com/VsVim/VsVim/issues/2904 -->
<RunAnalyzers>false</RunAnalyzers>
+ <!-- Temporary fix for https://github.com/dotnet/sdk/issues/34438 -->
+ <EmbedUntrackedSources>false</EmbedUntrackedSources>
</PropertyGroup>
<ItemGroup>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Core" />
<Reference Include="System.Data" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Xaml" />
<Reference Include="System.Xml" />
<Reference Include="WindowsBase" />
<Reference Include="Microsoft.VisualStudio.Setup.Configuration.Interop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.VisualStudio.TextManager.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<PackageReference Include="Castle.Core" Version="4.0.0-beta002" />
<PackageReference Include="Moq" Version="4.5.28" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="xunit.runner.console" Version="2.4.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Src\VimCore\VimCore.fsproj" />
<ProjectReference Include="..\..\Src\VimTestUtils\VimTestUtils.csproj" />
</ItemGroup>
<Import Project="..\..\Src\VimWpf\VimWpf.projitems" Label="Shared" />
<Import Project="..\..\Src\VimEditorHost\VimEditorHost.projitems" Label="Shared" />
<Import Project="..\VimCoreTest\VimCoreTest.projitems" Label="Shared" />
</Project>
diff --git a/Test/VimCoreTest2022/VimCoreTest2022.csproj b/Test/VimCoreTest2022/VimCoreTest2022.csproj
index 82e7992..fe16d4a 100644
--- a/Test/VimCoreTest2022/VimCoreTest2022.csproj
+++ b/Test/VimCoreTest2022/VimCoreTest2022.csproj
@@ -1,41 +1,43 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<RootNamespace>Vim.UnitTest</RootNamespace>
<AssemblyName>Vim.Core.2022.UnitTest</AssemblyName>
<TargetFramework>net472</TargetFramework>
<VsVimProjectType>EditorHost</VsVimProjectType>
<VsVimVisualStudioTargetVersion>17.0</VsVimVisualStudioTargetVersion>
<DefineConstants>$(DefineConstants);VS_UNIT_TEST_HOST</DefineConstants>
<!-- Enabling tracked by https://github.com/VsVim/VsVim/issues/2904 -->
<RunAnalyzers>false</RunAnalyzers>
+ <!-- Temporary fix for https://github.com/dotnet/sdk/issues/34438 -->
+ <EmbedUntrackedSources>false</EmbedUntrackedSources>
</PropertyGroup>
<ItemGroup>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Core" />
<Reference Include="System.Data" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Xaml" />
<Reference Include="System.Xml" />
<Reference Include="WindowsBase" />
<Reference Include="Microsoft.VisualStudio.Setup.Configuration.Interop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<PackageReference Include="Castle.Core" Version="4.0.0-beta002" />
<PackageReference Include="Moq" Version="4.5.28" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="xunit.runner.console" Version="2.4.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Src\VimCore\VimCore.fsproj" />
<ProjectReference Include="..\..\Src\VimTestUtils\VimTestUtils.csproj" />
</ItemGroup>
<Import Project="..\..\Src\VimWpf\VimWpf.projitems" Label="Shared" />
<Import Project="..\..\Src\VimEditorHost\VimEditorHost.projitems" Label="Shared" />
<Import Project="..\VimCoreTest\VimCoreTest.projitems" Label="Shared" />
</Project>
diff --git a/Test/VsVimTest2019/VsVimTest2019.csproj b/Test/VsVimTest2019/VsVimTest2019.csproj
index c5d4904..2d0be72 100644
--- a/Test/VsVimTest2019/VsVimTest2019.csproj
+++ b/Test/VsVimTest2019/VsVimTest2019.csproj
@@ -1,42 +1,44 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<PlatformTarget>x86</PlatformTarget>
<OutputType>Library</OutputType>
<RootNamespace>Vim.VisualStudio.UnitTest</RootNamespace>
<AssemblyName>Vim.VisualStudio.Shared.2019.UnitTest</AssemblyName>
<TargetFramework>net472</TargetFramework>
<VsVimVisualStudioTargetVersion>16.0</VsVimVisualStudioTargetVersion>
<VsVimProjectType>EditorHost</VsVimProjectType>
<DefineConstants>$(DefineConstants);VS_UNIT_TEST_HOST</DefineConstants>
<!-- Enabling tracked by https://github.com/VsVim/VsVim/issues/2904 -->
<RunAnalyzers>false</RunAnalyzers>
+ <!-- Temporary fix for https://github.com/dotnet/sdk/issues/34438 -->
+ <EmbedUntrackedSources>false</EmbedUntrackedSources>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.VisualStudio.Setup.Configuration.Interop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Core" />
<Reference Include="System.Data" />
<Reference Include="System.Xaml" />
<Reference Include="System.Xml" />
<Reference Include="WindowsBase" />
<PackageReference Include="Castle.Core" Version="4.0.0-beta002" />
<PackageReference Include="Moq" Version="4.5.28" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="xunit.runner.console" Version="2.4.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Src\VimCore\VimCore.fsproj" />
<ProjectReference Include="..\..\Src\VimTestUtils\VimTestUtils.csproj" />
<ProjectReference Include="..\..\Src\VsVim2019\VsVim2019.csproj" />
</ItemGroup>
<Import Project="..\..\Src\VimEditorHost\VimEditorHost.projitems" Label="Shared" />
<Import Project="..\VsVimSharedTest\VsVimSharedTest.projitems" Label="Shared" />
<Import Project="..\VimWpfTest\VimWpfTest.projitems" Label="Shared" />
</Project>
diff --git a/Test/VsVimTest2022/VsVimTest2022.csproj b/Test/VsVimTest2022/VsVimTest2022.csproj
index a442ffd..72d1357 100644
--- a/Test/VsVimTest2022/VsVimTest2022.csproj
+++ b/Test/VsVimTest2022/VsVimTest2022.csproj
@@ -1,41 +1,43 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<RootNamespace>Vim.VisualStudio.UnitTest</RootNamespace>
<AssemblyName>Vim.VisualStudio.Shared.2022.UnitTest</AssemblyName>
<TargetFramework>net472</TargetFramework>
<VsVimVisualStudioTargetVersion>17.0</VsVimVisualStudioTargetVersion>
<VsVimProjectType>EditorHost</VsVimProjectType>
<DefineConstants>$(DefineConstants);VS_UNIT_TEST_HOST</DefineConstants>
<!-- Enabling tracked by https://github.com/VsVim/VsVim/issues/2904 -->
<RunAnalyzers>false</RunAnalyzers>
+ <!-- Temporary fix for https://github.com/dotnet/sdk/issues/34438 -->
+ <EmbedUntrackedSources>false</EmbedUntrackedSources>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.VisualStudio.Setup.Configuration.Interop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Core" />
<Reference Include="System.Data" />
<Reference Include="System.Xaml" />
<Reference Include="System.Xml" />
<Reference Include="WindowsBase" />
<PackageReference Include="Castle.Core" Version="4.0.0-beta002" />
<PackageReference Include="Moq" Version="4.5.28" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="xunit.runner.console" Version="2.4.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Src\VimCore\VimCore.fsproj" />
<ProjectReference Include="..\..\Src\VimTestUtils\VimTestUtils.csproj" />
<ProjectReference Include="..\..\Src\VsVim2022\VsVim2022.csproj" />
</ItemGroup>
<Import Project="..\..\Src\VimEditorHost\VimEditorHost.projitems" Label="Shared" />
<Import Project="..\VsVimSharedTest\VsVimSharedTest.projitems" Label="Share" />
<Import Project="..\VimWpfTest\VimWpfTest.projitems" Label="Shared" />
</Project>
|
VsVim/VsVim
|
86a2d5473273be3aa1dae990cb540f430f891798
|
Fix code hygiene unit test
|
diff --git a/Test/VimCoreTest/CodeHygieneTest.cs b/Test/VimCoreTest/CodeHygieneTest.cs
index 8517cb0..c27daea 100644
--- a/Test/VimCoreTest/CodeHygieneTest.cs
+++ b/Test/VimCoreTest/CodeHygieneTest.cs
@@ -1,191 +1,192 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Text;
using Xunit;
using Vim.Extensions;
using Microsoft.FSharp.Core;
namespace Vim.UnitTest
{
/// <summary>
/// Pedantic code hygiene tests for the code base
/// </summary>
public abstract class CodeHygieneTest
{
private readonly Assembly _testAssembly = typeof(CodeHygieneTest).Assembly;
private readonly Assembly _sourceAssembly = typeof(VimImpl).Assembly;
private static bool IsDiscriminatedUnion(Type type)
{
var attribute = type.GetCustomAttributes(typeof(CompilationMappingAttribute), inherit: true);
if (attribute == null || attribute.Length != 1)
{
return false;
}
var compilatioMappingAttribute = (CompilationMappingAttribute)attribute[0];
var flags = compilatioMappingAttribute.SourceConstructFlags & ~SourceConstructFlags.NonPublicRepresentation;
return flags == SourceConstructFlags.SumType;
}
/// <summary>
/// Determine if this type is one that was embedded from FSharp.Core.dll
/// </summary>
private static bool IsFSharpCore(Type type)
{
return type.FullName.StartsWith("Microsoft.FSharp", StringComparison.Ordinal);
}
public sealed class NamingTest : CodeHygieneTest
{
[Fact]
private void TestNamespace()
{
foreach (var type in _testAssembly.GetTypes().Where(x => x.IsPublic))
{
if (type.FullName.StartsWith("Vim.UnitTest.", StringComparison.Ordinal) ||
type.FullName.StartsWith("Vim.EditorHost.", StringComparison.Ordinal) ||
type.FullName.StartsWith("Vim.UI.Wpf.", StringComparison.Ordinal))
{
continue;
}
Assert.False(true, $"Type {type.FullName} has incorrect namespace");
}
}
[Fact]
public void CodeNamespace()
{
const string prefix = "Vim.";
foreach (var type in typeof(IVim).Assembly.GetTypes())
{
if (type.FullName.StartsWith("<Startup", StringComparison.Ordinal) ||
type.FullName.StartsWith("Microsoft.FSharp", StringComparison.Ordinal) ||
type.FullName.StartsWith("Microsoft.BuildSettings", StringComparison.Ordinal) ||
+ type.FullName.StartsWith("System.Diagnostics.CodeAnalysis", StringComparison.Ordinal) ||
type.FullName.StartsWith("FSharp.BuildProperties", StringComparison.Ordinal))
{
continue;
}
Assert.True(type.FullName.StartsWith(prefix, StringComparison.Ordinal), $"Type {type.FullName} has incorrect prefix");
}
}
/// <summary>
/// Make sure all discriminated unions in the code base have RequiresQualifiedAccess
/// on them
/// </summary>
[Fact]
public void RequiresQualifiedAccess()
{
var any = false;
var list = new List<string>();
var types = _sourceAssembly
.GetTypes()
.Where(IsDiscriminatedUnion)
.Where(x => !IsFSharpCore(x));
foreach (var type in types)
{
any = true;
var attrib = type.GetCustomAttributes(typeof(RequireQualifiedAccessAttribute), inherit: true);
if (attrib == null || attrib.Length != 1)
{
list.Add($"{type.Name} does not have [<RequiresQualifiedAccess>]");
}
}
Assert.True(any);
var msg = list.Count == 0
? string.Empty
: list.Aggregate((x, y) => x + Environment.NewLine + y);
Assert.True(0 == list.Count, msg);
}
/// <summary>
/// Make sure all discriminated union values have explicit names
/// </summary>
[Fact]
public void UseExplicitRecordNames()
{
var any = false;
var list = new List<string>();
var types = _sourceAssembly
.GetTypes()
.Where(x => x.BaseType != null && IsDiscriminatedUnion(x.BaseType))
.Where(x => !IsFSharpCore(x));
foreach (var type in types)
{
any = true;
var anyItem = false;
foreach (var prop in type.GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.DeclaredOnly))
{
if (prop.Name.StartsWith("Item"))
{
anyItem = true;
break;
}
}
if (anyItem)
{
list.Add($"{type.BaseType.Name}.{type.Name} values do not have an explicit name");
}
}
Assert.True(any);
var msg = list.Count == 0
? string.Empty
: $"{list.Count} union values do not have explicit names" + Environment.NewLine + list.Aggregate((x, y) => x + Environment.NewLine + y);
Assert.True(0 == list.Count, msg);
}
}
/// <summary>
/// Simple code coverage checks that just don't merit and entire class to themselves
/// </summary>
public abstract class CodeCoverageTest : CodeHygieneTest
{
public sealed class Equality : CodeCoverageTest
{
private void Run<T>(T value, T otherValue)
{
EqualityUtil.RunAll(EqualityUnit.Create(value)
.WithEqualValues(value)
.WithNotEqualValues(otherValue));
}
[Fact]
public void DiscriminatedUnions()
{
Run(BlockCaretLocation.BottomLeft, BlockCaretLocation.BottomRight);
Run(CaretColumn.NewInLastLine(0), CaretColumn.NewInLastLine(1));
Run(CaretColumn.NewInLastLine(0), CaretColumn.NewInLastLine(2));
Run(CaseSpecifier.IgnoreCase, CaseSpecifier.None);
Run(ChangeCharacterKind.Rot13, ChangeCharacterKind.ToggleCase);
Run(CharSearchKind.TillChar, CharSearchKind.ToChar);
Run(KeyRemapMode.Language, KeyRemapMode.Normal);
Run(DirectiveKind.If, DirectiveKind.Else);
Run(MagicKind.NoMagic, MagicKind.Magic);
Run(MatchingTokenKind.Braces, MatchingTokenKind.Brackets);
Run(MotionContext.AfterOperator, MotionContext.Movement);
Run(MotionKind.LineWise, MotionKind.CharacterWiseExclusive);
Run(NumberFormat.Alpha, NumberFormat.Decimal);
Run(NumberValue.NewAlpha('c'), NumberValue.NewDecimal(1));
Run(OperationKind.CharacterWise, OperationKind.LineWise);
Run(RegisterOperation.Delete, RegisterOperation.Yank);
Run(SectionKind.Default, SectionKind.OnCloseBrace);
Run(SentenceKind.Default, SentenceKind.NoTrailingCharacters);
Run(SettingKind.Number, SettingKind.String);
Run(SelectionKind.Exclusive, SelectionKind.Inclusive);
Run(SettingValue.NewNumber(1), SettingValue.NewNumber(2));
Run(TextObjectKind.AlwaysCharacter, TextObjectKind.AlwaysLine);
Run(UnmatchedTokenKind.CurlyBracket, UnmatchedTokenKind.Paren);
Run(WordKind.BigWord, WordKind.NormalWord);
}
}
}
}
}
|
VsVim/VsVim
|
7653ed6c2844e1767582dc159c19d97102d7492e
|
$(VSToolsPath) no longer resolves
|
diff --git a/References/Vs2019/Vs2019.Build.targets b/References/Vs2019/Vs2019.Build.targets
index 57aca74..47e62d9 100644
--- a/References/Vs2019/Vs2019.Build.targets
+++ b/References/Vs2019/Vs2019.Build.targets
@@ -1,36 +1,36 @@
<Project>
<PropertyGroup>
<DefineConstants>$(DefineConstants);VS_SPECIFIC_2019</DefineConstants>
<DefineConstants Condition="'$(VsVimProjectType)' == 'EditorHost'">$(DefineConstants);VIM_SPECIFIC_TEST_HOST</DefineConstants>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.VisualStudio.Sdk" Version="16.0.206" />
<PackageReference Include="Microsoft.VisualStudio.Sdk.EmbedInteropTypes" Version="15.0.36" ExcludeAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.0.0" />
<PackageReference Include="Microsoft.VisualStudio.TextManager.Interop.10.0" Version="16.7.30328.74" />
<!--
These are private assemblies and not typically considered as a part of the official VS SDK. But
they are needed for some of the window / tab management code hence are used here -->
<Reference Include="Microsoft.VisualStudio.Platform.WindowManagement, Version=16.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.Shell.ViewManager, Version=16.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.Diagnostics.Assert, Version=16.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
</ItemGroup>
<ItemGroup Condition="'$(VsVimProjectType)' == 'EditorHost'">
<Reference Include="Microsoft.VisualStudio.Setup.Configuration.Interop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.VisualStudio.Platform.VSEditor, Version=16.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.Text.Internal, Version=16.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.TextManager.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<None Include="$(MSBuildThisFileDirectory)App.config">
<Link>app.config</Link>
</None>
</ItemGroup>
- <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VsVimProjectType)' == 'Vsix' AND '$(VSToolsPath)' != ''" />
+ <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VsVimProjectType)' == 'Vsix' AND '$(VSToolsPath)' != ''" />
</Project>
diff --git a/References/Vs2022/Vs2022.Build.targets b/References/Vs2022/Vs2022.Build.targets
index 09e1d73..fc81312 100644
--- a/References/Vs2022/Vs2022.Build.targets
+++ b/References/Vs2022/Vs2022.Build.targets
@@ -1,33 +1,33 @@
<Project>
<PropertyGroup>
<DefineConstants>$(DefineConstants);VS_SPECIFIC_2022</DefineConstants>
<DefineConstants Condition="'$(VsVimProjectType)' == 'EditorHost'">$(DefineConstants);VIM_SPECIFIC_TEST_HOST</DefineConstants>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.VisualStudio.Sdk" Version="17.0.31902.203" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.0.0-1.final" />
<!--
These are private assemblies and not typically considered as a part of the official VS SDK. But
they are needed for some of the window / tab management code hence are used here -->
<Reference Include="Microsoft.VisualStudio.Platform.WindowManagement, Version=17.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.Shell.ViewManager, Version=17.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.Diagnostics.Assert, Version=17.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
</ItemGroup>
<ItemGroup Condition="'$(VsVimProjectType)' == 'EditorHost'">
<Reference Include="Microsoft.VisualStudio.Setup.Configuration.Interop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.VisualStudio.Platform.VSEditor, Version=17.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.Text.Internal, Version=17.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<None Include="$(MSBuildThisFileDirectory)App.config">
<Link>app.config</Link>
</None>
</ItemGroup>
- <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VsVimProjectType)' == 'Vsix' AND '$(VSToolsPath)' != ''" />
+ <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VsVimProjectType)' == 'Vsix' AND '$(VSToolsPath)' != ''" />
</Project>
|
VsVim/VsVim
|
b3170730dc9f446222e1c739083db291c106667a
|
Bump version number
|
diff --git a/Src/VimMac/Properties/AddinInfo.cs b/Src/VimMac/Properties/AddinInfo.cs
index 87b8db3..cf06daa 100644
--- a/Src/VimMac/Properties/AddinInfo.cs
+++ b/Src/VimMac/Properties/AddinInfo.cs
@@ -1,15 +1,15 @@
using System;
using Mono.Addins;
using Mono.Addins.Description;
[assembly: Addin(
"VsVim",
Namespace = "Vim.Mac",
- Version = "2.8.0.19"
+ Version = "2.8.0.20"
)]
[assembly: AddinName("VsVim")]
[assembly: AddinCategory("IDE extensions")]
[assembly: AddinUrl("https://github.com/VsVim/VsVim")]
[assembly: AddinDescription("VIM emulation layer for Visual Studio")]
[assembly: AddinAuthor("Jared Parsons")]
|
VsVim/VsVim
|
45efb3ec74722707b3f9d2a89903cf6d24921232
|
Fix indent
|
diff --git a/Scripts/build.sh b/Scripts/build.sh
index 9f69b6d..34f191a 100755
--- a/Scripts/build.sh
+++ b/Scripts/build.sh
@@ -1,27 +1,27 @@
echo "Downloading VSMac"
- url="https://download.visualstudio.microsoft.com/download/pr/93f43532-c75a-43bf-a335-9c62d3ad7c56/a0c1df1aa17141472362c80cef1a2581/visualstudioformac-preview-17.6.0.402-pre.1-x64.dmg"
+url="https://download.visualstudio.microsoft.com/download/pr/93f43532-c75a-43bf-a335-9c62d3ad7c56/a0c1df1aa17141472362c80cef1a2581/visualstudioformac-preview-17.6.0.402-pre.1-x64.dmg"
wget --quiet $url
hdiutil attach `basename $url`
echo "Removing existing VSMac installation"
sudo rm -rf "/Applications/Visual Studio.app"
echo "Installing VSMac 17.6"
ditto -rsrc "/Volumes/Visual Studio (Preview)/" /Applications/
mv "/Applications/Visual Studio (Preview).app" "/Applications/Visual Studio.app"
ls -la /Applications/
echo "installing dotnet 7.0.2xx"
wget https://dot.net/v1/dotnet-install.sh
bash dotnet-install.sh --channel 7.0.2xx
~/.dotnet/dotnet workload install macos
echo "Building the extension"
~/.dotnet/dotnet msbuild /p:Configuration=ReleaseMac /p:Platform="Any CPU" /t:Restore
cd Src/VimMac
~/.dotnet/dotnet msbuild /p:Configuration=ReleaseMac /p:Platform="Any CPU" /t:Build
echo "Creating and installing Extension"
# Generate mpack extension artifact
~/.dotnet/dotnet msbuild VimMac.csproj /t:InstallAddin
|
VsVim/VsVim
|
045b519d7a7a1ab859776db7945f04faff08e37f
|
Fix indent
|
diff --git a/Scripts/build.sh b/Scripts/build.sh
index 610384b..9f69b6d 100755
--- a/Scripts/build.sh
+++ b/Scripts/build.sh
@@ -1,27 +1,27 @@
- echo "Downloading VSMac"
+echo "Downloading VSMac"
url="https://download.visualstudio.microsoft.com/download/pr/93f43532-c75a-43bf-a335-9c62d3ad7c56/a0c1df1aa17141472362c80cef1a2581/visualstudioformac-preview-17.6.0.402-pre.1-x64.dmg"
- wget --quiet $url
+wget --quiet $url
- hdiutil attach `basename $url`
+hdiutil attach `basename $url`
echo "Removing existing VSMac installation"
sudo rm -rf "/Applications/Visual Studio.app"
echo "Installing VSMac 17.6"
ditto -rsrc "/Volumes/Visual Studio (Preview)/" /Applications/
mv "/Applications/Visual Studio (Preview).app" "/Applications/Visual Studio.app"
ls -la /Applications/
echo "installing dotnet 7.0.2xx"
wget https://dot.net/v1/dotnet-install.sh
bash dotnet-install.sh --channel 7.0.2xx
~/.dotnet/dotnet workload install macos
echo "Building the extension"
~/.dotnet/dotnet msbuild /p:Configuration=ReleaseMac /p:Platform="Any CPU" /t:Restore
cd Src/VimMac
~/.dotnet/dotnet msbuild /p:Configuration=ReleaseMac /p:Platform="Any CPU" /t:Build
echo "Creating and installing Extension"
# Generate mpack extension artifact
~/.dotnet/dotnet msbuild VimMac.csproj /t:InstallAddin
|
VsVim/VsVim
|
633d5da0951043d2a407868b05ca724bbcb38923
|
Fix other path to artefact
|
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 154d5f2..accbfbc 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,104 +1,104 @@
# This is a basic workflow to help you get started with Actions
name: VsVim CI
on:
push:
branches: [ "master", "main" ]
tags:
- '*'
pull_request:
branches: [ "master", "main", "dev/gha" ]
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
jobs:
windows-build:
name: Windows Build and Test
runs-on: windows-2022
steps:
- uses: actions/checkout@v3
- name: Build
shell: powershell
run: Scripts\Build.ps1 -ci -config Debug -build
- name: Test
shell: powershell
run: Scripts\Build.ps1 -ci -config Debug -test
- name: Test Extra
shell: powershell
run: Scripts\Build.ps1 -ci -config Debug -testExtra
- name: Upload Artifacts
uses: actions/upload-artifact@v3
with:
name: Logs
path: Binaries\Logs
# This job is meant for building a Release VSIX for consumption and
# publishing it to two locations:
# - An Azure DevOps artifact for easy download / use on PR or CI
# - The Open VSIX gallery during CI
windows-publish:
name: Publish VSIX
runs-on: windows-2022
steps:
- uses: actions/checkout@v3
- name: Build VSIX
shell: powershell
run: Scripts\Build.ps1 -ci -build -updateVsixVersion -config Release
- name: Upload VSIX Artifacts
uses: actions/upload-artifact@v3
with:
name: Vsix
path: Binaries\Deploy
- name: Publish VSIX to Open VSIX Gallery
shell: powershell
run: Scripts\Build.ps1 -ci -uploadVsix -config Release
if: ${{ success() && github.ref == 'refs/heads/master' }}
macos-build:
name: MacOS Build and Publish
runs-on: macOS-11
steps:
# Must use fetch-depth 0 because the workflow requires that tags be present
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Set VERSION_TAG
run: echo "VERSION_TAG=`git describe --tags`" >> $GITHUB_ENV
- name: Set EXTENSION_VERSION
run: echo "EXTENSION_VERSION=`grep Version Src/VimMac/Properties/AddinInfo.cs | cut -d '\"' -f2`" >> $GITHUB_ENV
- name: Build
run: Scripts/build.sh
- name: Publish mpack
uses: actions/upload-artifact@v3
with:
name: VSMacExtension
- path: 'Binaries/Debug/VimMac/net6.0-macos/Vim.Mac.VsVim_${{ env.EXTENSION_VERSION }}.mpack'
+ path: 'Binaries/Debug/VimMac/net7.0/Vim.Mac.VsVim_${{ env.EXTENSION_VERSION }}.mpack'
- name: Create VS Mac extension release
uses: softprops/action-gh-release@v1
id: vsmac_release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ env.VERSION_TAG }}
name: 'Visual Studio for Mac ${{ env.VERSION_TAG }}'
draft: false
generate_release_notes: true
files: 'Binaries/Debug/VimMac/net7.0/Vim.Mac.VsVim_${{ env.EXTENSION_VERSION }}.mpack'
if: ${{ success() && startsWith(github.ref, 'refs/tags') && contains(github.ref, 'vsm') }}
|
VsVim/VsVim
|
daefafc4cbdef9acfbf28742fce688d05dcb2900
|
Fix path to artefact
|
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8eae6fc..154d5f2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,104 +1,104 @@
# This is a basic workflow to help you get started with Actions
name: VsVim CI
on:
push:
branches: [ "master", "main" ]
tags:
- '*'
pull_request:
branches: [ "master", "main", "dev/gha" ]
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
jobs:
windows-build:
name: Windows Build and Test
runs-on: windows-2022
steps:
- uses: actions/checkout@v3
- name: Build
shell: powershell
run: Scripts\Build.ps1 -ci -config Debug -build
- name: Test
shell: powershell
run: Scripts\Build.ps1 -ci -config Debug -test
- name: Test Extra
shell: powershell
run: Scripts\Build.ps1 -ci -config Debug -testExtra
- name: Upload Artifacts
uses: actions/upload-artifact@v3
with:
name: Logs
path: Binaries\Logs
# This job is meant for building a Release VSIX for consumption and
# publishing it to two locations:
# - An Azure DevOps artifact for easy download / use on PR or CI
# - The Open VSIX gallery during CI
windows-publish:
name: Publish VSIX
runs-on: windows-2022
steps:
- uses: actions/checkout@v3
- name: Build VSIX
shell: powershell
run: Scripts\Build.ps1 -ci -build -updateVsixVersion -config Release
- name: Upload VSIX Artifacts
uses: actions/upload-artifact@v3
with:
name: Vsix
path: Binaries\Deploy
- name: Publish VSIX to Open VSIX Gallery
shell: powershell
run: Scripts\Build.ps1 -ci -uploadVsix -config Release
if: ${{ success() && github.ref == 'refs/heads/master' }}
macos-build:
name: MacOS Build and Publish
runs-on: macOS-11
steps:
# Must use fetch-depth 0 because the workflow requires that tags be present
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Set VERSION_TAG
run: echo "VERSION_TAG=`git describe --tags`" >> $GITHUB_ENV
- name: Set EXTENSION_VERSION
run: echo "EXTENSION_VERSION=`grep Version Src/VimMac/Properties/AddinInfo.cs | cut -d '\"' -f2`" >> $GITHUB_ENV
- name: Build
run: Scripts/build.sh
- name: Publish mpack
uses: actions/upload-artifact@v3
with:
name: VSMacExtension
path: 'Binaries/Debug/VimMac/net6.0-macos/Vim.Mac.VsVim_${{ env.EXTENSION_VERSION }}.mpack'
- name: Create VS Mac extension release
uses: softprops/action-gh-release@v1
id: vsmac_release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ env.VERSION_TAG }}
name: 'Visual Studio for Mac ${{ env.VERSION_TAG }}'
draft: false
generate_release_notes: true
- files: 'Binaries/Debug/VimMac/net6.0-macos/Vim.Mac.VsVim_${{ env.EXTENSION_VERSION }}.mpack'
+ files: 'Binaries/Debug/VimMac/net7.0/Vim.Mac.VsVim_${{ env.EXTENSION_VERSION }}.mpack'
if: ${{ success() && startsWith(github.ref, 'refs/tags') && contains(github.ref, 'vsm') }}
|
VsVim/VsVim
|
843d9b34aace2d5198b08991a31ddff474070ba4
|
Bump Microsoft.CodeAnalysis.Scripting
|
diff --git a/Src/VimMac/VimMac.csproj b/Src/VimMac/VimMac.csproj
index 7f20944..672f1ed 100644
--- a/Src/VimMac/VimMac.csproj
+++ b/Src/VimMac/VimMac.csproj
@@ -1,29 +1,29 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<RootNamespace>Vim.Mac</RootNamespace>
<AssemblyName>Vim.Mac</AssemblyName>
<TargetFramework>net7.0</TargetFramework>
<DefineConstants>$(DefineConstants);VS_SPECIFIC_MAC</DefineConstants>
<!-- Suppress warning CA1416 -->
<EnableNETAnalyzers>false</EnableNETAnalyzers>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\VimCore\VimCore.fsproj" />
<PackageReference Include="Microsoft.VisualStudioMac.Sdk" Version="17.0.0" />
- <PackageReference Include="Microsoft.CodeAnalysis.Scripting" Version="4.3.0.0" />
+ <PackageReference Include="Microsoft.CodeAnalysis.Scripting" Version="4.5.0-2.final" />
</ItemGroup>
<ItemGroup>
<AddinReference Include="MonoDevelop.TextEditor" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\beep.wav" />
<EmbeddedResource Include="Resources\KeyBindingSchemeVim.xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\VimWpf\Implementation\Misc\ClipboardDevice.cs">
<Link>ClipboardDevice.cs</Link>
</Compile>
</ItemGroup>
</Project>
|
VsVim/VsVim
|
fa89c8db95bd9a99751a71124a6e0e893cb23be5
|
.app is silent
|
diff --git a/Scripts/build.sh b/Scripts/build.sh
index c7b244f..610384b 100755
--- a/Scripts/build.sh
+++ b/Scripts/build.sh
@@ -1,27 +1,27 @@
echo "Downloading VSMac"
url="https://download.visualstudio.microsoft.com/download/pr/93f43532-c75a-43bf-a335-9c62d3ad7c56/a0c1df1aa17141472362c80cef1a2581/visualstudioformac-preview-17.6.0.402-pre.1-x64.dmg"
wget --quiet $url
hdiutil attach `basename $url`
echo "Removing existing VSMac installation"
sudo rm -rf "/Applications/Visual Studio.app"
echo "Installing VSMac 17.6"
ditto -rsrc "/Volumes/Visual Studio (Preview)/" /Applications/
-mv "/Applications/Visual Studio (Preview)" "/Applications/Visual Studio"
+mv "/Applications/Visual Studio (Preview).app" "/Applications/Visual Studio.app"
ls -la /Applications/
echo "installing dotnet 7.0.2xx"
wget https://dot.net/v1/dotnet-install.sh
bash dotnet-install.sh --channel 7.0.2xx
~/.dotnet/dotnet workload install macos
echo "Building the extension"
~/.dotnet/dotnet msbuild /p:Configuration=ReleaseMac /p:Platform="Any CPU" /t:Restore
cd Src/VimMac
~/.dotnet/dotnet msbuild /p:Configuration=ReleaseMac /p:Platform="Any CPU" /t:Build
echo "Creating and installing Extension"
# Generate mpack extension artifact
~/.dotnet/dotnet msbuild VimMac.csproj /t:InstallAddin
|
VsVim/VsVim
|
0dcf5e5f0068f88ea3365d3126c8e31a56af9671
|
Move Preview install location to Final install location
|
diff --git a/Scripts/build.sh b/Scripts/build.sh
index 6188cf9..c7b244f 100755
--- a/Scripts/build.sh
+++ b/Scripts/build.sh
@@ -1,26 +1,27 @@
echo "Downloading VSMac"
url="https://download.visualstudio.microsoft.com/download/pr/93f43532-c75a-43bf-a335-9c62d3ad7c56/a0c1df1aa17141472362c80cef1a2581/visualstudioformac-preview-17.6.0.402-pre.1-x64.dmg"
wget --quiet $url
hdiutil attach `basename $url`
echo "Removing existing VSMac installation"
sudo rm -rf "/Applications/Visual Studio.app"
echo "Installing VSMac 17.6"
ditto -rsrc "/Volumes/Visual Studio (Preview)/" /Applications/
+mv "/Applications/Visual Studio (Preview)" "/Applications/Visual Studio"
ls -la /Applications/
echo "installing dotnet 7.0.2xx"
wget https://dot.net/v1/dotnet-install.sh
bash dotnet-install.sh --channel 7.0.2xx
~/.dotnet/dotnet workload install macos
echo "Building the extension"
~/.dotnet/dotnet msbuild /p:Configuration=ReleaseMac /p:Platform="Any CPU" /t:Restore
cd Src/VimMac
~/.dotnet/dotnet msbuild /p:Configuration=ReleaseMac /p:Platform="Any CPU" /t:Build
echo "Creating and installing Extension"
# Generate mpack extension artifact
~/.dotnet/dotnet msbuild VimMac.csproj /t:InstallAddin
|
VsVim/VsVim
|
50c09869ec40db2281daee8ff7fb1ade69714185
|
remove vs.app
|
diff --git a/Scripts/build.sh b/Scripts/build.sh
index 92e97f4..6188cf9 100755
--- a/Scripts/build.sh
+++ b/Scripts/build.sh
@@ -1,26 +1,26 @@
echo "Downloading VSMac"
url="https://download.visualstudio.microsoft.com/download/pr/93f43532-c75a-43bf-a335-9c62d3ad7c56/a0c1df1aa17141472362c80cef1a2581/visualstudioformac-preview-17.6.0.402-pre.1-x64.dmg"
wget --quiet $url
hdiutil attach `basename $url`
echo "Removing existing VSMac installation"
-sudo rm -rf "/Applications/Visual Studio"
+sudo rm -rf "/Applications/Visual Studio.app"
echo "Installing VSMac 17.6"
ditto -rsrc "/Volumes/Visual Studio (Preview)/" /Applications/
ls -la /Applications/
echo "installing dotnet 7.0.2xx"
wget https://dot.net/v1/dotnet-install.sh
bash dotnet-install.sh --channel 7.0.2xx
~/.dotnet/dotnet workload install macos
echo "Building the extension"
~/.dotnet/dotnet msbuild /p:Configuration=ReleaseMac /p:Platform="Any CPU" /t:Restore
cd Src/VimMac
~/.dotnet/dotnet msbuild /p:Configuration=ReleaseMac /p:Platform="Any CPU" /t:Build
echo "Creating and installing Extension"
# Generate mpack extension artifact
~/.dotnet/dotnet msbuild VimMac.csproj /t:InstallAddin
|
VsVim/VsVim
|
ce0999c638d1a8ad9c3f0faa936ac15f113ea5ba
|
Remove pre-existing vsmac from CI
|
diff --git a/Scripts/build.sh b/Scripts/build.sh
index fb88769..92e97f4 100755
--- a/Scripts/build.sh
+++ b/Scripts/build.sh
@@ -1,23 +1,26 @@
echo "Downloading VSMac"
url="https://download.visualstudio.microsoft.com/download/pr/93f43532-c75a-43bf-a335-9c62d3ad7c56/a0c1df1aa17141472362c80cef1a2581/visualstudioformac-preview-17.6.0.402-pre.1-x64.dmg"
wget --quiet $url
hdiutil attach `basename $url`
+echo "Removing existing VSMac installation"
+sudo rm -rf "/Applications/Visual Studio"
+
echo "Installing VSMac 17.6"
ditto -rsrc "/Volumes/Visual Studio (Preview)/" /Applications/
ls -la /Applications/
echo "installing dotnet 7.0.2xx"
wget https://dot.net/v1/dotnet-install.sh
bash dotnet-install.sh --channel 7.0.2xx
~/.dotnet/dotnet workload install macos
echo "Building the extension"
~/.dotnet/dotnet msbuild /p:Configuration=ReleaseMac /p:Platform="Any CPU" /t:Restore
cd Src/VimMac
~/.dotnet/dotnet msbuild /p:Configuration=ReleaseMac /p:Platform="Any CPU" /t:Build
echo "Creating and installing Extension"
# Generate mpack extension artifact
~/.dotnet/dotnet msbuild VimMac.csproj /t:InstallAddin
|
VsVim/VsVim
|
7c65a6173191a393011536207c889691ad505815
|
NFloat is now part of System.Runtime.InteropServices
|
diff --git a/Src/VimMac/RelativeLineNumbers/CocoaLineNumberMarginDrawingVisual.cs b/Src/VimMac/RelativeLineNumbers/CocoaLineNumberMarginDrawingVisual.cs
index a1a9746..d008f8a 100644
--- a/Src/VimMac/RelativeLineNumbers/CocoaLineNumberMarginDrawingVisual.cs
+++ b/Src/VimMac/RelativeLineNumbers/CocoaLineNumberMarginDrawingVisual.cs
@@ -1,95 +1,95 @@
using System;
using System.Globalization;
-
+using System.Runtime.InteropServices;
using AppKit;
using CoreAnimation;
using CoreGraphics;
using CoreText;
using Foundation;
using ObjCRuntime;
using Vim.UI.Wpf.Implementation.RelativeLineNumbers;
namespace Vim.UI.Cocoa.Implementation.RelativeLineNumbers
{
internal sealed class CocoaLineNumberMarginDrawingVisual : CALayer, ICALayerDelegate
{
private NSStringAttributes stringAttributes;
private CGRect lineBounds;
- private nfloat lineAscent;
+ private NFloat lineAscent;
private CTLine ctLine;
public int LineNumber { get; private set; }
public int DisplayNumber { get; private set; }
public bool InUse
{
get => !Hidden;
set => Hidden = !value;
}
public CocoaLineNumberMarginDrawingVisual()
{
Delegate = this;
NeedsDisplayOnBoundsChange = true;
this.DisableImplicitAnimations();
}
internal void Update(
NSStringAttributes stringAttributes,
Line line,
- nfloat lineWidth)
+ NFloat lineWidth)
{
// NOTE: keep this in sync with CocoaRenderedLineVisual regarding any font
// metric handling, transforms, etc. Ensure that line numbers are always
// exactly aligned with the actual editor text lines. Test with Fluent
// Calibri and many other fonts at various sizes.
if (DisplayNumber != line.DisplayNumber || this.stringAttributes != stringAttributes)
{
DisplayNumber = line.DisplayNumber;
this.stringAttributes = stringAttributes;
ctLine?.Dispose();
ctLine = new CTLine(new NSAttributedString(
line.DisplayNumber.ToString(CultureInfo.CurrentUICulture.NumberFormat),
stringAttributes));
lineBounds = ctLine.GetBounds(0);
ctLine.GetTypographicBounds(out lineAscent, out _, out _);
SetNeedsDisplay();
}
AffineTransform = new CGAffineTransform(
1, 0,
0, 1,
- 0, (nfloat)line.TextTop);
+ 0, (NFloat)line.TextTop);
var transformRect = AffineTransform.TransformRect(new CGRect(
line.IsCaretLine ? 0 : lineWidth - lineBounds.Width, // right justify
line.Baseline - lineAscent,
lineBounds.Width,
lineBounds.Height));
Frame = new CGRect(
NMath.Floor(transformRect.X),
NMath.Floor(transformRect.Y),
NMath.Ceiling(transformRect.Width),
NMath.Ceiling(transformRect.Height));
}
[Export("drawLayer:inContext:")]
private void Draw(CALayer _, CGContext context)
{
if (ctLine == null)
return;
CocoaTextManager.ConfigureContext(context);
context.TextPosition = new CGPoint(0, -lineAscent);
context.ScaleCTM(1, -1);
ctLine.Draw(context);
}
}
}
|
VsVim/VsVim
|
88de0a68c3fd28d427a88eee23bdabf43ba9f471
|
The latest F# compiler complains about the parameter named differently
|
diff --git a/Src/VimCore/CoreInterfaces.fs b/Src/VimCore/CoreInterfaces.fs
index 17a413a..d05b607 100644
--- a/Src/VimCore/CoreInterfaces.fs
+++ b/Src/VimCore/CoreInterfaces.fs
@@ -206,1025 +206,1025 @@ type IUndoTransaction =
/// Call when it completes
abstract Complete: unit -> unit
/// Cancels the transaction
abstract Cancel: unit -> unit
inherit System.IDisposable
/// This is a IUndoTransaction that is specific to a given ITextView instance
type ITextViewUndoTransaction =
/// Adds an ITextUndoPrimitive which will reset the selection to the current
/// state when redoing this edit
abstract AddAfterTextBufferChangePrimitive: unit -> unit
/// Adds an ITextUndoPrimitive which will reset the selection to the current
/// state when undoing this change
abstract AddBeforeTextBufferChangePrimitive: unit -> unit
inherit IUndoTransaction
/// Flags controlling the linked undo transaction behavior
[<System.Flags>]
type LinkedUndoTransactionFlags =
| None = 0x0
| CanBeEmpty = 0x1
| EndsWithInsert = 0x2
/// Wraps a set of IUndoTransaction items such that they undo and redo as a single
/// entity.
type ILinkedUndoTransaction =
/// Complete the linked operation
abstract Complete: unit -> unit
inherit System.IDisposable
/// Wraps all of the undo and redo operations
type IUndoRedoOperations =
abstract TextUndoHistory: ITextUndoHistory option
/// Is there an open linked undo transaction
abstract InLinkedUndoTransaction: bool
/// StatusUtil instance that is used to report errors
abstract StatusUtil: IStatusUtil
/// Close the IUndoRedoOperations and remove any attached event handlers
abstract Close: unit -> unit
/// Creates an Undo Transaction
abstract CreateUndoTransaction: name: string -> IUndoTransaction
/// Creates an Undo Transaction specific to the given ITextView. Use when operations
/// like caret position need to be a part of the undo / redo stack
abstract CreateTextViewUndoTransaction: name: string -> textView: ITextView -> ITextViewUndoTransaction
/// Creates a linked undo transaction
abstract CreateLinkedUndoTransaction: name: string -> ILinkedUndoTransaction
/// Creates a linked undo transaction with flags
abstract CreateLinkedUndoTransactionWithFlags: name: string -> flags: LinkedUndoTransactionFlags -> ILinkedUndoTransaction
/// Wrap the passed in "action" inside an undo transaction. This is needed
/// when making edits such as paste so that the cursor will move properly
/// during an undo operation
abstract EditWithUndoTransaction: name: string -> textView: ITextView -> action: (unit -> 'T) -> 'T
/// Redo the last "count" operations
abstract Redo: count:int -> unit
/// Undo the last "count" operations
abstract Undo: count:int -> unit
/// Represents a set of changes to a contiguous region.
[<RequireQualifiedAccess>]
type TextChange =
| DeleteLeft of Count: int
| DeleteRight of Count: int
| Insert of Text: string
| Combination of Left: TextChange * Right: TextChange
with
/// Get the insert text resulting from the change if there is any
member x.InsertText =
let rec inner textChange (text: string) =
match textChange with
| Insert data -> text + data |> Some
| DeleteLeft count ->
if count > text.Length then
None
else
text.Substring(0, text.Length - count) |> Some
| DeleteRight _ -> None
| Combination (left, right) ->
match inner left text with
| None -> None
| Some text -> inner right text
inner x StringUtil.Empty
/// Get the last / most recent change in the TextChange tree
member x.LastChange =
match x with
| DeleteLeft _ -> x
| DeleteRight _ -> x
| Insert _ -> x
| Combination (_, right) -> right.LastChange
member x.IsEmpty =
match x with
| Insert text -> StringUtil.IsNullOrEmpty text
| DeleteLeft count -> count = 0
| DeleteRight count -> count = 0
| Combination (left, right) -> left.IsEmpty && right.IsEmpty
member x.Reduce =
match x with
| Combination (left, right) ->
match TextChange.ReduceCore left right with
| Some reduced -> reduced
| None -> x
| _ -> x
/// Merge two TextChange values together. The goal is to produce a the smallest TextChange
/// value possible. This will return Some if a reduction is made and None if there is
/// no possible reduction
static member private ReduceCore left right =
// This is called for combination merges. Some progress was made but it's possible further
// progress could be made by reducing the specified values. If further progress can be made
// keep it else keep at least the progress already made
let tryReduceAgain left right =
Some (TextChange.CreateReduced left right)
// Insert can only merge with a previous insert operation. It can't
// merge with any deletes that came before it
let reduceInsert before (text: string) =
match before with
| Insert otherText -> Some (Insert (otherText + text))
| _ -> None
// DeleteLeft can merge with deletes and previous insert operations.
let reduceDeleteLeft before count =
match before with
| Insert otherText ->
if count <= otherText.Length then
let text = otherText.Substring(0, otherText.Length - count)
Some (Insert text)
else
let count = count - otherText.Length
Some (DeleteLeft count)
| DeleteLeft beforeCount -> Some (DeleteLeft (count + beforeCount))
| _ -> None
// Delete right can merge only with other DeleteRight operations
let reduceDeleteRight before count =
match before with
| DeleteRight beforeCount -> Some (DeleteRight (beforeCount + count))
| _ -> None
// The item on the left isn't a Combination item. So do simple merge semantics
let simpleMerge () =
match right with
| Insert text -> reduceInsert left text
| DeleteLeft count -> reduceDeleteLeft left count
| DeleteRight count -> reduceDeleteRight left count
| Combination (rightSubLeft, rightSubRight) ->
// First just see if the combination itself can be reduced
match TextChange.ReduceCore rightSubLeft rightSubRight with
| Some reducedTextChange -> tryReduceAgain left reducedTextChange
| None ->
match TextChange.ReduceCore left rightSubLeft with
| None -> None
| Some reducedTextChange -> tryReduceAgain reducedTextChange rightSubRight
// The item on the left is a Combination item.
let complexMerge leftSubLeft leftSubRight =
// First check if the left can be merged against itself. This can easily happen
// for hand built trees
match TextChange.ReduceCore leftSubLeft leftSubRight with
| Some reducedTextChange -> tryReduceAgain reducedTextChange right
| None ->
// It can't be reduced. Still a change that the right can be reduced against
// the subRight value
match TextChange.ReduceCore leftSubRight right with
| None -> None
| Some reducedTextChange -> tryReduceAgain leftSubLeft reducedTextChange
if left.IsEmpty then
Some right
elif right.IsEmpty then
Some left
else
match left with
| Insert _ -> simpleMerge ()
| DeleteLeft _ -> simpleMerge ()
| DeleteRight _ -> simpleMerge ()
| Combination (leftSubLeft, leftSubRight) -> complexMerge leftSubLeft leftSubRight
static member Replace str =
let left = str |> StringUtil.Length |> TextChange.DeleteLeft
let right = TextChange.Insert str
TextChange.Combination (left, right)
static member CreateReduced left right =
match TextChange.ReduceCore left right with
| None -> Combination (left, right)
| Some textChange -> textChange
type TextChangeEventArgs(_textChange: TextChange) =
inherit System.EventArgs()
member x.TextChange = _textChange
[<System.Flags>]
type SearchOptions =
| None = 0x0
/// Consider the "ignorecase" option when doing the search
| ConsiderIgnoreCase = 0x1
/// Consider the "smartcase" option when doing the search
| ConsiderSmartCase = 0x2
/// Whether to include the start point when doing the search
| IncludeStartPoint = 0x4
/// ConsiderIgnoreCase ||| ConsiderSmartCase
| Default = 0x3
/// Information about a search of a pattern
type PatternData = {
/// The Pattern to search for
Pattern: string
/// The direction in which the pattern was searched for
Path: SearchPath
}
type PatternDataEventArgs(_patternData: PatternData) =
inherit System.EventArgs()
member x.PatternData = _patternData
/// An incremental search can be augmented with a offset of characters or a line
/// count. This is described in full in :help searh-offset'
[<RequireQualifiedAccess>]
[<StructuralEquality>]
[<NoComparison>]
[<DebuggerDisplay("{ToString(),nq}")>]
type SearchOffsetData =
| None
| Line of Line: int
| Start of Start: int
| End of End: int
| Search of PatternData: PatternData
with
static member private ParseCore (offset: string) =
Contract.Requires (offset.Length > 0)
let index = ref 0
let isForward = ref true
let movePastPlusOrMinus () =
if index.Value < offset.Length then
match offset.[index.Value] with
| '+' ->
isForward := true
index := index.Value + 1
true
| '-' ->
isForward := false
index := index.Value + 1
true
| _ -> false
else
false
let parseNumber () =
if movePastPlusOrMinus () && index.Value = offset.Length then
// a single + or - counts as a value if it's not followed by
// a number
if isForward.Value then 1
else -1
else
// parse out the digits after the value
let mutable num = 0
let mutable isBad = index.Value >= offset.Length
while index.Value < offset.Length do
num <- num * 10
match CharUtil.GetDigitValue (offset.[index.Value]) with
| Option.None ->
isBad <- true
index := offset.Length
| Option.Some d ->
num <- num + d
index := index.Value + 1
if isBad then
0
elif isForward.Value then
num
else
-num
let parseLine () =
let number = parseNumber ()
SearchOffsetData.Line number
let parseEnd () =
index := index.Value + 1
let number = parseNumber ()
SearchOffsetData.End number
let parseStart () =
index := index.Value + 1
let number = parseNumber ()
SearchOffsetData.Start number
let parseSearch () =
index := index.Value + 1
match StringUtil.CharAtOption index.Value offset with
| Option.Some '/' ->
let path = SearchPath.Forward
let pattern = offset.Substring(index.Value + 1)
SearchOffsetData.Search ({ Pattern = pattern; Path = path})
| Option.Some '?' ->
let path = SearchPath.Backward
let pattern = offset.Substring(index.Value + 1)
SearchOffsetData.Search ({ Pattern = pattern; Path = path})
| _ ->
SearchOffsetData.None
if CharUtil.IsDigit (offset.[0]) then
parseLine ()
else
match offset.[0] with
| '-' -> parseLine ()
| '+' -> parseLine ()
| 'e' -> parseEnd ()
| 's' -> parseStart ()
| 'b' -> parseStart ()
| ';' -> parseSearch ()
| _ -> SearchOffsetData.None
static member Parse (offset: string) =
if StringUtil.IsNullOrEmpty offset then
SearchOffsetData.None
else
SearchOffsetData.ParseCore offset
[<Sealed>]
[<DebuggerDisplay("{ToString(),nq}")>]
type SearchData
(
_pattern: string,
_offset: SearchOffsetData,
_kind: SearchKind,
_options: SearchOptions
) =
new (pattern: string, path: SearchPath, isWrap: bool) =
let kind = SearchKind.OfPathAndWrap path isWrap
SearchData(pattern, SearchOffsetData.None, kind, SearchOptions.Default)
new (pattern: string, path: SearchPath) =
let kind = SearchKind.OfPathAndWrap path true
SearchData(pattern, SearchOffsetData.None, kind, SearchOptions.Default)
/// The pattern being searched for in the buffer
member x.Pattern = _pattern
/// The offset that is applied to the search
member x.Offset = _offset
member x.Kind = _kind
member x.Options = _options
member x.Path = x.Kind.Path
/// The PatternData which was searched for. This does not include the pattern searched
/// for in the offset
member x.PatternData = { Pattern = x.Pattern; Path = x.Kind.Path }
/// The SearchData which should be used for IVimData.LastSearchData if this search needs
/// to update that value. It takes into account the search pattern in an offset string
/// as specified in ':help //;'
member x.LastSearchData =
let path = x.Path
let pattern =
match x.Offset with
| SearchOffsetData.Search patternData -> patternData.Pattern
| _ -> x.Pattern
SearchData(pattern, x.Offset, x.Kind, x.Options)
member x.Equals(other: SearchData) =
if obj.ReferenceEquals(other, null) then
false
else
_pattern = other.Pattern &&
_offset = other.Offset &&
_kind = other.Kind &&
_options = other.Options
override x.Equals(other: obj) =
match other with
| :? SearchData as otherSearchData -> x.Equals(otherSearchData)
| _ -> false
override x.GetHashCode() =
_pattern.GetHashCode()
override x.ToString() =
x.Pattern
static member op_Equality(this, other) = System.Collections.Generic.EqualityComparer<SearchData>.Default.Equals(this, other)
static member op_Inequality(this, other) = not (System.Collections.Generic.EqualityComparer<SearchData>.Default.Equals(this, other))
/// Parse out a SearchData value given the specific pattern and SearchKind. The pattern should
/// not include a beginning / or ?. That should be removed by this point
static member Parse (pattern: string) (searchKind: SearchKind) searchOptions =
let mutable index = -1
let mutable i = 1
let targetChar =
if searchKind.IsAnyForward then '/'
else '?'
while i < pattern.Length do
if pattern.[i] = targetChar && pattern.[i-1] <> '\\' then
index <- i
i <- pattern.Length
else
i <- i + 1
if index < 0 then
SearchData(pattern, SearchOffsetData.None, searchKind, searchOptions)
else
let offset = SearchOffsetData.Parse (pattern.Substring(index + 1))
let pattern = pattern.Substring(0, index)
SearchData(pattern, offset, searchKind, searchOptions)
interface System.IEquatable<SearchData> with
member x.Equals other = x.Equals(other)
type SearchDataEventArgs(_searchData: SearchData) =
inherit System.EventArgs()
member x.SearchData = _searchData
/// Result of an individual search
[<RequireQualifiedAccess>]
type SearchResult =
/// The pattern was found. The two spans here represent the following pieces of data
/// respectively
///
/// - the span of the pattern + the specified offset
/// - the span of the found pattern
///
/// In general the first should be used by consumers. The second is only interesting
/// to items that need to tag the value
///
/// The bool at the end of the tuple represents whether not
/// a wrap occurred while searching for the value
| Found of SearchData: SearchData * SpanWithOffset: SnapshotSpan * Span: SnapshotSpan * DidWrap: bool
/// The pattern was not found. The bool is true if the word was present in the ITextBuffer
/// but wasn't found do to the lack of a wrap in the SearchData value
| NotFound of SeachData: SearchData * CanFindWithWrap: bool
/// The search was cancelled
| Cancelled of SearchData: SearchData
/// There was an error converting the pattern to a searchable value. The string value is the
/// error message
| Error of SearchData: SearchData * Error: string
with
/// Returns the SearchData which was searched for
member x.SearchData =
match x with
| SearchResult.Found (searchData, _, _, _) -> searchData
| SearchResult.NotFound (searchData, _) -> searchData
| SearchResult.Cancelled (searchData) -> searchData
| SearchResult.Error (searchData, _) -> searchData
type SearchResultEventArgs(_searchResult: SearchResult) =
inherit System.EventArgs()
member x.SearchResult = _searchResult
/// Global information about searches within Vim.
///
/// This interface is usable from any thread
[<UsedInBackgroundThread()>]
type ISearchService =
/// Find the next occurrence of the pattern in the buffer starting at the
/// given SnapshotPoint
abstract FindNext: searchPoint: SnapshotPoint -> searchData: SearchData -> navigator: SnapshotWordNavigator -> SearchResult
/// Find the next 'count' occurrence of the specified pattern. Note: The first occurrence won't
/// match anything at the provided start point. That will be adjusted appropriately
- abstract FindNextPattern: searchPoint: SnapshotPoint -> searchPoint: SearchData -> navigator: SnapshotWordNavigator -> count: int -> SearchResult
+ abstract FindNextPattern: searchPoint: SnapshotPoint -> searchData: SearchData -> navigator: SnapshotWordNavigator -> count: int -> SearchResult
/// Column information about the caret in relation to this Motion Result
[<RequireQualifiedAccess>]
[<NoComparison>]
type CaretColumn =
/// No column information was provided
| None
/// Caret should be placed in the specified character on the last line in
/// the MotionResult
///
/// This column should be specified in terms of a character offset in the ITextBuffer
/// and shouldn't consider items like how wide a tab is. A tab should be a single
/// character
| InLastLine of ColumnNumber: int
/// Caret should be placed in the specified column on the last line in
/// the MotionResult
///
/// This column should be specified in terms number of screen columns, where
/// some characters like tabs may span many columns.
| ScreenColumn of ColumnNumber: int
/// Caret should be placed at the start of the line after the last line
/// in the motion
| AfterLastLine
/// These are the types of motions which must be handled separately
[<RequireQualifiedAccess>]
type MotionResultFlags =
/// No special information for this motion
| None = 0
/// Any of the word motions
| AnyWord = 0x1
/// This motion was promoted under rule #2 to a line wise motion
| ExclusiveLineWise = 0x2
/// This motion when used as a movement should maintain the caret column
/// setting.
| MaintainCaretColumn = 0x4
/// This flag is needed to disambiguate the cases which come up when there
/// is an empty last line in the buffer. When that happens it's ambiguous
/// if a line wise motion meant to include the last line or merely just
/// the line above. The End is the same in both cases.
| IncludeEmptyLastLine = 0x8
/// Marker for the end of line motion. This affects how the caret column
/// is maintained
| EndOfLine = 0x10
/// When used as a delete argument force a big delete
| BigDelete = 0x20
/// Suppress 'exclusive linewise' adjustment
| SuppressAdjustment = 0x40
/// Information about the type of the motion this was.
[<RequireQualifiedAccess>]
[<NoComparison>]
type MotionKind =
| CharacterWiseInclusive
| CharacterWiseExclusive
| LineWise
/// Data about a complete motion operation.
type MotionResult = {
/// Span of the motion.
Span: SnapshotSpan
/// In the case this MotionResult is the result of an exclusive promotion, this will
/// hold the original SnapshotSpan
SpanBeforeExclusivePromotion: SnapshotSpan option
/// A linewise motion may also have a logical characterwise counter part. Consider for
/// example motions like j and k. The motion can be described by the caret point and
/// column above / below. This is useful when converting between linewise and characterwise
/// motions using v or V (:help o_v).
SpanBeforeLineWise: SnapshotSpan option
/// Is the motion forward
IsForward: bool
/// Kind of the motion
MotionKind: MotionKind
/// The flags on the MotionRelult
MotionResultFlags: MotionResultFlags
/// In addition to recording the Span, certain motions like j, k, and | also
/// record data about the desired column within the span. This value may or may not
/// be a valid point within the line
CaretColumn: CaretColumn
} with
member x.ColumnSpan = SnapshotColumnSpan(x.Span)
/// The Span as an EditSpan value
member x.EditSpan = EditSpan.Single x.ColumnSpan
/// The OperationKind of the MotionResult
member x.OperationKind =
match x.MotionKind with
| MotionKind.CharacterWiseExclusive -> OperationKind.CharacterWise
| MotionKind.CharacterWiseInclusive -> OperationKind.CharacterWise
| MotionKind.LineWise _ -> OperationKind.LineWise
/// Is this a word motion
member x.IsAnyWordMotion = Util.IsFlagSet x.MotionResultFlags MotionResultFlags.AnyWord
/// Is this an exclusive motion
member x.IsExclusive =
match x.MotionKind with
| MotionKind.CharacterWiseExclusive -> true
| MotionKind.CharacterWiseInclusive -> false
| MotionKind.LineWise _ -> false
/// Is this an inclusive motion
member x.IsInclusive = not x.IsExclusive
/// The Span as a SnapshotLineRange value
member x.LineRange = SnapshotLineRangeUtil.CreateForSpan x.Span
/// The Start or Last line depending on whether the motion is forward or not. The returned
/// line will be in the document <see cref="ITextSnapshot">.
member x.DirectionLastLine =
if x.IsForward then
// Need to handle the empty last line case here. If the flag to include
// the empty last line is set and we are at the empty line then it gets
// included as the last line
if SnapshotPointUtil.IsEndPoint x.Span.End && Util.IsFlagSet x.MotionResultFlags MotionResultFlags.IncludeEmptyLastLine then
SnapshotPointUtil.GetContainingLine x.Span.End
else
SnapshotSpanUtil.GetLastLine x.Span
else
SnapshotSpanUtil.GetStartLine x.Span
member x.Start = x.Span.Start
member x.End = x.Span.End
member x.Last = SnapshotSpanUtil.GetLastIncludedPoint x.Span
member x.LastOrStart = x.Last |> OptionUtil.getOrDefault x.Start
/// This will map every Span inside the MotionResult using the provided mapFunc value and
/// return the resulting MotionResult.
member x.MapSpans mapFunc =
let map s =
match s with
| None -> (true, None)
| Some s ->
match mapFunc s with
| Some s -> (true, Some s)
| None -> (false, None)
match mapFunc x.Span, map x.SpanBeforeExclusivePromotion, map x.SpanBeforeLineWise with
| Some s, (true, e), (true, l) -> Some { x with Span = s; SpanBeforeExclusivePromotion = e; SpanBeforeLineWise = l }
| _ -> None
static member Create(span: SnapshotSpan, motionKind: MotionKind, ?isForward, ?motionResultFlags, ?caretColumn): MotionResult =
let isForward = defaultArg isForward true
let motionResultFlags = defaultArg motionResultFlags MotionResultFlags.None
let caretColumn = defaultArg caretColumn CaretColumn.None
{
Span = span
SpanBeforeExclusivePromotion = None
SpanBeforeLineWise = None
IsForward = isForward
MotionKind = motionKind
MotionResultFlags = motionResultFlags
CaretColumn = caretColumn
}
static member Create(span: SnapshotSpan, motionKind: MotionKind, isForward: bool) = MotionResult.Create(span, motionKind, isForward, MotionResultFlags.None, CaretColumn.None)
static member CreateCharacterWise(span, ?isForward, ?isExclusive, ?motionResultFlags, ?caretColumn) =
let isForward = defaultArg isForward true
let isExclusive = defaultArg isExclusive true
let motionResultFlags = defaultArg motionResultFlags MotionResultFlags.None
let caretColumn = defaultArg caretColumn CaretColumn.None
let kind =
if isExclusive then MotionKind.CharacterWiseExclusive
else MotionKind.CharacterWiseInclusive
MotionResult.Create(span, kind, isForward, motionResultFlags, caretColumn)
static member CreateLineWise(span, ?spanBeforeLineWise, ?isForward, ?motionResultFlags, ?caretColumn) =
let isForward = defaultArg isForward true
let motionResultFlags = defaultArg motionResultFlags MotionResultFlags.None
let caretColumn = defaultArg caretColumn CaretColumn.None
{
Span = span
SpanBeforeExclusivePromotion = None
SpanBeforeLineWise = spanBeforeLineWise
IsForward = isForward
MotionKind = MotionKind.LineWise
MotionResultFlags = motionResultFlags
CaretColumn = caretColumn
}
/// Context on how the motion is being used. Several motions (]] for example)
/// change behavior based on how they are being used
[<RequireQualifiedAccess>]
[<NoComparison>]
type MotionContext =
| Movement
| AfterOperator
/// Arguments necessary to building a Motion
type MotionArgument
(
motionContext: MotionContext,
operatorCount: int option,
motionCount: int option
) =
/// Context of the Motion
member x.MotionContext = motionContext
/// Count passed to the operator
member x.OperatorCount = operatorCount
/// Count passed to the motion
member x.MotionCount = motionCount
/// Provides the raw count which is a combination of the OperatorCount
/// and MotionCount values.
member x.Count =
match x.MotionCount, x.OperatorCount with
| None, None -> None
| Some c, None -> Some c
| None, Some c -> Some c
| Some l, Some r -> Some (l*r)
/// Resolves the count to a value. It will use the default 1 for
/// any count which is not provided
member x.CountOrDefault =
match x.Count with
| Some c -> c
| None -> 1
new(motionContext) = MotionArgument(motionContext, None, None)
/// Char searches are interesting because they are defined in one IVimBuffer
/// and can be repeated in any IVimBuffer. Use a discriminated union here
/// to name the motion without binding it to a given IVimBuffer or ITextView
/// which would increase the chance of an accidental memory leak
[<RequireQualifiedAccess>]
[<NoComparison>]
type CharSearchKind =
/// Used for the 'f' and 'F' motion. To the specified char
| ToChar
/// Used for the 't' and 'T' motion. Till the specified char
| TillChar
[<RequireQualifiedAccess>]
type BlockKind =
/// A [] block
| Bracket
/// A () block
| Paren
/// A <> block
| AngleBracket
/// A {} block
| CurlyBracket
with
member x.Characters =
match x with
| Bracket -> '[', ']'
| Paren -> '(', ')'
| AngleBracket -> '<', '>'
| CurlyBracket -> '{', '}'
[<RequireQualifiedAccess>]
[<NoComparison>]
type UnmatchedTokenKind =
| Paren
| CurlyBracket
[<RequireQualifiedAccess>]
type TagBlockKind =
| Inner
| All
/// A discriminated union of the Motion types supported. These are the primary
/// repeat mechanisms for Motion arguments so it's very important that these
/// are ITextView / IVimBuffer agnostic. It will be very common for a Motion
/// item to be stored and then applied to many IVimBuffer instances.
[<RequireQualifiedAccess>]
type Motion =
/// Implement the all block motion
| AllBlock of BlockKind: BlockKind
/// Implement the 'aw' motion. This is called once the a key is seen.
| AllWord of WordKind: WordKind
/// Implement the 'ap' motion
| AllParagraph
/// Gets count full sentences from the cursor. If used on a blank line this will
/// not return a value
| AllSentence
/// Move to the beginning of the line. Interestingly since this command is bound to the '0' it
/// can't be associated with a count. Doing a command like 30 binds as count 30 vs. count 3
/// for command '0'
| BeginingOfLine
/// Implement the 'ge' / 'gE' motion. Goes backward to the end of the previous word
| BackwardEndOfWord of WordKind: WordKind
/// The left motion for h
| CharLeft
/// The right motion for l
| CharRight
/// The backspace motion
| SpaceLeft
/// The space motion
| SpaceRight
/// The arrow motion for <Left>
| ArrowLeft
/// The arrow motion for <Right>
| ArrowRight
/// Implements the f, F, t and T motions
| CharSearch of CharSearchKind: CharSearchKind * SearchPath: SearchPath * Character: char
/// Get the span of "count" display lines upward. Display lines can differ when
/// wrap is enabled
| DisplayLineUp
/// Get the span of "count" display lines downward. Display lines can differ when
/// wrap is enabled
| DisplayLineDown
/// Start of the display line
| DisplayLineStart
/// End of the display line
| DisplayLineEnd
/// First non blank character on the display line
| DisplayLineFirstNonBlank
/// Get the point in the middle of the screen. This looks at the entire screen not just
/// the width of the current line
| DisplayLineMiddleOfScreen
/// Implement the 'e' motion. This goes to the end of the current word. If we're
/// not currently on a word it will find the next word and then go to the end of that
| EndOfWord of WordKind: WordKind
/// Implement an end of line motion. Typically in response to the $ key. Even though
/// this motion deals with lines, it's still a character wise motion motion.
| EndOfLine
/// Find the first non-blank character as the start of the span. This is an exclusive
/// motion so be careful we don't go to far forward. Providing a count to this motion has
/// no effect
| FirstNonBlankOnCurrentLine
/// Find the first non-blank character on the (count - 1) line below this line
| FirstNonBlankOnLine
/// Forces a line wise version of the specified motion
| ForceLineWise of Motion: Motion
/// Forces a characterwise version of the specified motion
| ForceCharacterWise of Motion: Motion
/// Inner word motion
| InnerWord of WordKind: WordKind
/// Inner paragraph motion
| InnerParagraph
/// Inner block motion
| InnerBlock of BlockKind: BlockKind
/// Find the last non-blank character on the line. Count causes it to go "count" lines
/// down and perform the search
| LastNonBlankOnLine
/// Find the next occurrence of the last search. The bool parameter is true if the search
/// should be in the opposite direction
| LastSearch of UseOppositeDirection: bool
/// Handle the lines down to first non-blank motion. This is one of the motions which
/// can accept a count of 0.
| LineDownToFirstNonBlank
/// Handle the - motion
| LineUpToFirstNonBlank
/// Get the span of "count" lines upward careful not to run off the beginning of the
/// buffer. Implementation of the "k" motion
| LineUp
/// Get the span of "count" lines downward careful not to run off the end of the
/// buffer. Implementation of the "j" motion
| LineDown
/// Go to the specified line number or the first line if no line number is provided
| LineOrFirstToFirstNonBlank
/// Go to the specified line number or the last line of no line number is provided
| LineOrLastToFirstNonBlank
/// Go to the "count - 1" line from the top of the visible window. If the count exceeds
/// the number of visible lines it will end on the last visible line
| LineFromTopOfVisibleWindow
/// Go to the "count -1" line from the bottom of the visible window. If the count
/// exceeds the number of visible lines it will end on the first visible line
| LineFromBottomOfVisibleWindow
/// Go to the middle line in the visible window.
| LineInMiddleOfVisibleWindow
/// Get the motion to the specified mark. This is typically accessed via
/// the ` (back tick) operator and results in an exclusive motion
| Mark of LocalMark: LocalMark
/// Get the motion to the line of the specified mark. This is typically
/// accessed via the ' (single quote) operator and results in a
/// line wise motion
| MarkLine of LocalMark: LocalMark
/// Get the matching token from the next token on the line. This is used to implement
/// the % motion
/// If a number is specified, go to {count} percentage in the file
| MatchingTokenOrDocumentPercent
/// Move the caret to the position of the mouse
| MoveCaretToMouse
/// Get the motion to the nearest lowercase mark in the specified direction
| NextMark of SearchPath: SearchPath
/// Get the motion to the nearest lowercase mark line in the specified direction
| NextMarkLine of SearchPath: SearchPath
/// Operate on the next match for last pattern searched for
| NextMatch of SearchPath: SearchPath
/// Search for the next occurrence of the word under the caret
| NextWord of SearchPath: SearchPath
/// Search for the next partial occurrence of the word under the caret
| NextPartialWord of SearchPath: SearchPath
/// Count paragraphs backwards
| ParagraphBackward
/// Count paragraphs forward
| ParagraphForward
/// The quoted string including the quotes
| QuotedString of Character: char
/// The quoted string excluding the quotes
| QuotedStringContents of Character: char
/// Repeat the last CharSearch value
| RepeatLastCharSearch
/// Repeat the last CharSearch value in the opposite direction
| RepeatLastCharSearchOpposite
/// A search for the specified pattern
| Search of SearchData: SearchData
/// Backward a section in the editor or to a close brace
| SectionBackwardOrCloseBrace
/// Backward a section in the editor or to an open brace
| SectionBackwardOrOpenBrace
/// Forward a section in the editor or to a close brace
| SectionForwardOrCloseBrace
/// Forward a section in the editor
| SectionForward
/// Count sentences backward
| SentenceBackward
/// Count sentences forward
| SentenceForward
|
VsVim/VsVim
|
2bd865f942090a18f39f57121a63e5197fdd8d6f
|
Build against VSMac 17.6
|
diff --git a/Scripts/build.sh b/Scripts/build.sh
index b829719..701de12 100755
--- a/Scripts/build.sh
+++ b/Scripts/build.sh
@@ -1,23 +1,23 @@
-echo "Downloading VSMac"
-url="https://download.visualstudio.microsoft.com/download/pr/e81e04d3-768a-4310-9c9b-f32e8ba00eaa/889c20580d7989524e9b42726510452e/visualstudioformac-17.3.0.2102-x64.dmg"
-wget --quiet $url
+ echo "Downloading VSMac"
+ url="https://download.visualstudio.microsoft.com/download/pr/93f43532-c75a-43bf-a335-9c62d3ad7c56/a0c1df1aa17141472362c80cef1a2581/visualstudioformac-preview-17.6.0.402-pre.1-x64.dmg"
+ wget --quiet $url
-hdiutil attach `basename $url`
+ hdiutil attach `basename $url`
-echo "Installing VSMac 17.3"
-ditto -rsrc "/Volumes/Visual Studio/" /Applications/
-ls -la /Applications/
+ echo "Installing VSMac 17.6"
+ ditto -rsrc "/Volumes/Visual Studio (Preview)/" /Applications/
+ ls -la /Applications/
-echo "installing dotnet 6.0.3xx"
-wget https://dot.net/v1/dotnet-install.sh
-bash dotnet-install.sh --channel 6.0.3xx
-sudo ~/.dotnet/dotnet workload install macos
+ echo "installing dotnet 6.0.3xx"
+ wget https://dot.net/v1/dotnet-install.sh
+ bash dotnet-install.sh --channel 6.0.3xx
+ sudo ~/.dotnet/dotnet workload install macos
echo "Building the extension"
~/.dotnet/dotnet msbuild /p:Configuration=ReleaseMac /p:Platform="Any CPU" /t:Restore
cd Src/VimMac
~/.dotnet/dotnet msbuild /p:Configuration=ReleaseMac /p:Platform="Any CPU" /t:Build
echo "Creating and installing Extension"
# Generate mpack extension artifact
~/.dotnet/dotnet msbuild VimMac.csproj /t:InstallAddin
|
VsVim/VsVim
|
ecc310096b91070d2797a21c8baf0b90714b154f
|
net7.0 changes
|
diff --git a/Src/VimCore/AutoCommandRunner.fs b/Src/VimCore/AutoCommandRunner.fs
index c683a8a..636bc6a 100644
--- a/Src/VimCore/AutoCommandRunner.fs
+++ b/Src/VimCore/AutoCommandRunner.fs
@@ -1,114 +1,114 @@
#light
namespace Vim
open Microsoft.VisualStudio.Text
open Microsoft.VisualStudio.Text.Operations
open Microsoft.VisualStudio.Text.Editor
open System.ComponentModel.Composition
open StringBuilderExtensions
open Vim
open Vim.Interpreter
open System.Text.RegularExpressions
open VimCoreExtensions
[<Sealed>]
[<Export(typeof<IVimBufferCreationListener>)>]
type internal AutoCommandRunner
[<ImportingConstructor>]
(
_vim: IVim
) as this =
let _vimData = _vim.VimData
let _vimHost = _vim.VimHost
let _globalSettings = _vim.GlobalSettings
do
_vim.VimHost.ActiveTextViewChanged
|> Observable.add this.OnActiveTextViewChanged
/// Create the Regex for the specified pattern. The allowed items are specified in ':help autocmd-patterns'
static let CreateFilePatternRegex (pattern: string) =
let builder = System.Text.StringBuilder()
let mutable i = 0
while i < pattern.Length do
match pattern.[i] with
| '*' -> builder.AppendString ".*"
| '.' -> builder.AppendString "\."
| '\\' ->
if i + 1 < pattern.Length then
builder.AppendChar pattern.[i + 1]
i <- i + 1
else
builder.AppendChar '\\'
| _ ->
builder.AppendChar pattern.[i]
i <- i + 1
builder.AppendChar '$'
let bclPattern = builder.ToString()
VimRegexFactory.CreateBcl bclPattern RegexOptions.None
- static let FileNameEndsWithPattern fileName pattern =
+ static let FileNameEndsWithPattern (fileName: string) pattern =
try
let regex = CreateFilePatternRegex pattern
match regex with
| None -> false
| Some regex -> regex.IsMatch fileName
with
_ -> false
member x.GetAutoCommands fileName eventKind =
_vimData.AutoCommands
|> Seq.filter (fun autoCommand -> autoCommand.EventKind = eventKind)
|> Seq.filter (fun autoCommand -> FileNameEndsWithPattern fileName autoCommand.Pattern)
|> List.ofSeq
/// Run the specified AutoCommand against the IVimBuffer in question
member x.RunAutoCommands (vimBuffer: IVimBuffer) eventKind =
if _vimHost.IsAutoCommandEnabled then
let fileName = _vimHost.GetName vimBuffer.TextBuffer
let autoCommandList = x.GetAutoCommands fileName eventKind
if autoCommandList.Length > 0 then
let vimInterpreter = _vim.GetVimInterpreter vimBuffer
let parser = Parser(_globalSettings, _vimData)
autoCommandList
|> Seq.iter (fun autoCommand ->
parser.ParseLineCommand autoCommand.LineCommandText
|> vimInterpreter.RunLineCommand
|> ignore)
/// Called when the active ITextView changes according to the host
member x.OnActiveTextViewChanged (e: TextViewChangedEventArgs) =
match OptionUtil.map2 _vim.GetVimBuffer e.OldTextView with
| Some vimBuffer -> x.RunAutoCommands vimBuffer EventKind.BufLeave
| None -> ()
match OptionUtil.map2 _vim.GetVimBuffer e.NewTextView with
| Some vimBuffer -> x.RunAutoCommands vimBuffer EventKind.BufEnter
| None -> ()
/// VimBufferCreated is the closest event we have for BufEnter.
member x.OnVimBufferCreated (vimBuffer: IVimBuffer) =
// TODO: BufEnter should really be raised every time the text buffer gets edit
// focus. Hard to detect that in WPF / VS though because keyboard focus is very
// different than edit focus. For now just raise it once here.
x.RunAutoCommands vimBuffer EventKind.BufEnter
x.RunAutoCommands vimBuffer EventKind.FileType
x.RunAutoCommands vimBuffer EventKind.BufWinEnter
let bag = DisposableBag()
vimBuffer.Closing
|> Observable.subscribe (fun _ ->
x.RunAutoCommands vimBuffer EventKind.BufWinLeave
bag.DisposeAll())
|> bag.Add
interface IVimBufferCreationListener with
member x.VimBufferCreated vimBuffer = x.OnVimBufferCreated vimBuffer
diff --git a/Src/VimCore/VimCore.fsproj b/Src/VimCore/VimCore.fsproj
index 0c051e5..fe5022b 100644
--- a/Src/VimCore/VimCore.fsproj
+++ b/Src/VimCore/VimCore.fsproj
@@ -1,155 +1,156 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<RootNamespace>Vim.Core</RootNamespace>
<AssemblyName>Vim.Core</AssemblyName>
- <TargetFrameworks>net472;net6.0</TargetFrameworks>
+ <TargetFrameworks>net472;net7.0</TargetFrameworks>
<OtherFlags>--standalone</OtherFlags>
<NoWarn>2011</NoWarn>
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
<DebugType>portable</DebugType>
+ <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
</PropertyGroup>
<ItemGroup>
<None Include="README.md" />
<Compile Include="Resources.fs" />
<Compile Include="Constants.fs" />
<Compile Include="FSharpUtil.fs" />
<Compile Include="VimTrace.fs" />
<Compile Include="StringUtil.fs" />
<Compile Include="Util.fs" />
<Compile Include="VimKey.fs" />
<Compile Include="KeyInput.fsi" />
<Compile Include="KeyInput.fs" />
<Compile Include="Unicode.fsi" />
<Compile Include="Unicode.fs" />
<Compile Include="CoreTypes.fs" />
<Compile Include="EditorUtil.fs" />
<Compile Include="Register.fs" />
<Compile Include="VimCharSet.fsi" />
<Compile Include="VimCharSet.fs" />
<Compile Include="VimSettingsInterface.fs" />
<Compile Include="Interpreter_Expression.fs" />
<Compile Include="TaggingInterfaces.fs" />
<Compile Include="WordUtil.fsi" />
<Compile Include="WordUtil.fs" />
<Compile Include="CoreInterfaces.fs" />
<Compile Include="CoreInternalInterfaces.fs" />
<Compile Include="CountCapture.fs" />
<Compile Include="VimRegexOptions.fs" />
<Compile Include="VimRegex.fsi" />
<Compile Include="VimRegex.fs" />
<Compile Include="MefInterfaces.fs" />
<Compile Include="KeyNotationUtil.fsi" />
<Compile Include="KeyNotationUtil.fs" />
<Compile Include="DigraphUtil.fs" />
<Compile Include="MotionCapture.fs" />
<Compile Include="RegexUtil.fs" />
<Compile Include="HistoryUtil.fsi" />
<Compile Include="HistoryUtil.fs" />
<Compile Include="PatternUtil.fs" />
<Compile Include="CommonOperations.fsi" />
<Compile Include="CommonOperations.fs" />
<Compile Include="Interpreter_Tokens.fs" />
<Compile Include="Interpreter_Tokenizer.fsi" />
<Compile Include="Interpreter_Tokenizer.fs" />
<Compile Include="Interpreter_Parser.fsi" />
<Compile Include="Interpreter_Parser.fs" />
<Compile Include="Interpreter_Interpreter.fsi" />
<Compile Include="Interpreter_Interpreter.fs" />
<Compile Include="CommandFactory.fsi" />
<Compile Include="CommandFactory.fs" />
<Compile Include="Modes_Command_CommandMode.fsi" />
<Compile Include="Modes_Command_CommandMode.fs" />
<Compile Include="Modes_Normal_NormalMode.fsi" />
<Compile Include="Modes_Normal_NormalMode.fs" />
<Compile Include="Modes_Insert_Components.fs" />
<Compile Include="Modes_Insert_InsertMode.fsi" />
<Compile Include="Modes_Insert_InsertMode.fs" />
<Compile Include="Modes_Visual_ISelectionTracker.fs" />
<Compile Include="Modes_Visual_SelectionTracker.fs" />
<Compile Include="Modes_Visual_VisualMode.fsi" />
<Compile Include="Modes_Visual_VisualMode.fs" />
<Compile Include="Modes_Visual_SelectMode.fsi" />
<Compile Include="Modes_Visual_SelectMode.fs" />
<Compile Include="Modes_SubstituteConfirm_SubstituteConfirmMode.fsi" />
<Compile Include="Modes_SubstituteConfirm_SubstituteConfirmMode.fs" />
<Compile Include="IncrementalSearch.fsi" />
<Compile Include="IncrementalSearch.fs" />
<Compile Include="CommandUtil.fsi" />
<Compile Include="CommandUtil.fs" />
<Compile Include="InsertUtil.fsi" />
<Compile Include="InsertUtil.fs" />
<Compile Include="TaggerUtil.fsi" />
<Compile Include="TaggerUtil.fs" />
<Compile Include="Tagger.fsi" />
<Compile Include="Tagger.fs" />
<Compile Include="CaretChangeTracker.fsi" />
<Compile Include="CaretChangeTracker.fs" />
<Compile Include="SelectionChangeTracker.fsi" />
<Compile Include="SelectionChangeTracker.fs" />
<Compile Include="MultiSelectionTracker.fsi" />
<Compile Include="MultiSelectionTracker.fs" />
<Compile Include="FoldManager.fsi" />
<Compile Include="FoldManager.fs" />
<Compile Include="ModeLineInterpreter.fsi" />
<Compile Include="ModeLineInterpreter.fs" />
<Compile Include="VimTextBuffer.fsi" />
<Compile Include="VimTextBuffer.fs" />
<Compile Include="VimBuffer.fsi" />
<Compile Include="VimBuffer.fs" />
<Compile Include="TextObjectUtil.fsi" />
<Compile Include="TextObjectUtil.fs" />
<Compile Include="MotionUtil.fsi" />
<Compile Include="MotionUtil.fs" />
<Compile Include="SearchService.fsi" />
<Compile Include="SearchService.fs" />
<Compile Include="RegisterMap.fsi" />
<Compile Include="RegisterMap.fs" />
<Compile Include="CaretRegisterMap.fsi" />
<Compile Include="CaretRegisterMap.fs" />
<Compile Include="ExternalEdit.fs" />
<Compile Include="DisabledMode.fs" />
<Compile Include="MarkMap.fsi" />
<Compile Include="MarkMap.fs" />
<Compile Include="MacroRecorder.fsi" />
<Compile Include="MacroRecorder.fs" />
<Compile Include="KeyMap.fsi" />
<Compile Include="KeyMap.fs" />
<Compile Include="DigraphMap.fsi" />
<Compile Include="DigraphMap.fs" />
<Compile Include="JumpList.fs" />
<Compile Include="LineNumbersMarginOption.fs" />
<Compile Include="VimSettings.fsi" />
<Compile Include="VimSettings.fs" />
<Compile Include="FileSystem.fs" />
<Compile Include="UndoRedoOperations.fsi" />
<Compile Include="UndoRedoOperations.fs" />
<Compile Include="CommandRunner.fsi" />
<Compile Include="CommandRunner.fs" />
<Compile Include="AutoCommandRunner.fsi" />
<Compile Include="AutoCommandRunner.fs" />
<Compile Include="Vim.fs" />
<Compile Include="StatusUtil.fsi" />
<Compile Include="StatusUtil.fs" />
<Compile Include="LineChangeTracker.fsi" />
<Compile Include="LineChangeTracker.fs" />
<Compile Include="MefComponents.fsi" />
<Compile Include="MefComponents.fs" />
<Compile Include="FSharpExtensions.fs" />
<Compile Include="AssemblyInfo.fs" />
</ItemGroup>
<ItemGroup>
<!-- Using element form vs. attributes to work around NuGet restore bug
https://github.com/NuGet/Home/issues/6367
https://github.com/dotnet/project-system/issues/3493 -->
<PackageReference Include="FSharp.Core" Version="6.0.3">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="System.ComponentModel.Composition" Version="6.0.0" />
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="16.0.102" />
<Reference Include="Microsoft.VisualStudio.CoreUtility, Version=16.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.Text.Data, Version=16.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.Text.Logic, Version=16.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.Text.UI, Version=16.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
</ItemGroup>
</Project>
diff --git a/Src/VimCore/VimRegex.fs b/Src/VimCore/VimRegex.fs
index 1527a92..34812e8 100644
--- a/Src/VimCore/VimRegex.fs
+++ b/Src/VimCore/VimRegex.fs
@@ -1,775 +1,775 @@
#light
namespace Vim
open System
open System.Text
open System.Text.RegularExpressions
open StringBuilderExtensions
module VimRegexUtils =
let StartGroupName = "start"
let EndGroupName = "end"
/// Profiling reveals that one of the biggest expenses of fast editing with :hlsearch
/// enabled in large files is the creation of the regex. With editting we never change
/// the regex but waste up to 25% of the CPU cycles recreating it over and over
/// again. Cache the most recent few Regex values here to remove the needless work.
///
/// Note: This is shared amongst threads but not protected by a lock. We don't want
/// any contention issues here.
let mutable _sharedRegexCache: (string * RegexOptions * Regex) list = List.empty
let GetRegexFromCache pattern options =
let list = _sharedRegexCache
list
|> Seq.ofList
|> Seq.tryFind (fun (cachedPattern, cachedOptions, _) -> pattern = cachedPattern && cachedOptions = options)
|> Option.map (fun (_, _, regex) -> regex)
let SaveRegexToCache pattern options regex =
let list = _sharedRegexCache
let list =
let maxLength = 10
if list.Length > maxLength then
// Truncate the list to 5. Don't want to be constantly copying the list
// so cut it in half every time we need to reclaim values
list |> Seq.truncate (maxLength / 2) |> List.ofSeq
else
list
_sharedRegexCache <- (pattern, options, regex) :: list
/// Create a regex. Returns None if the regex has invalid characters
let TryCreateRegex pattern options =
match GetRegexFromCache pattern options with
| Some regex -> Some regex
| None ->
try
let r = new Regex(pattern, options)
SaveRegexToCache pattern options r
Some r
with
| :? System.ArgumentException -> None
let Escape c = c |> StringUtil.OfChar |> Regex.Escape
[<RequireQualifiedAccess>]
[<NoComparison>]
type VimReplaceCaseState =
| None
| UpperChar
| UpperUntil
| LowerChar
| LowerUtil
/// Type responsible for generating replace strings.
[<Sealed>]
type VimRegexReplaceUtil
(
_input: string,
_regex: Regex,
_matchCollection: MatchCollection,
_registerMap: IRegisterMap
) =
let _hasStartGroup =
_regex.GetGroupNames()
|> Seq.contains VimRegexUtils.StartGroupName
let _hasEndGroup =
_regex.GetGroupNames()
|> Seq.contains VimRegexUtils.EndGroupName
let mutable _replaceCount = 0
let mutable _replacement = ""
let mutable _index = 0
let mutable _caseState = VimReplaceCaseState.None
let mutable _builder = StringBuilder()
let mutable _replaceData = VimRegexReplaceData.Default
member private x.AppendReplaceChar c =
match _caseState with
| VimReplaceCaseState.None ->
_builder.AppendChar c
| VimReplaceCaseState.LowerChar ->
_builder.AppendChar (CharUtil.ToLower c)
_caseState <- VimReplaceCaseState.None
| VimReplaceCaseState.LowerUtil ->
_builder.AppendChar (CharUtil.ToLower c)
| VimReplaceCaseState.UpperChar ->
_builder.AppendChar (CharUtil.ToUpper c)
_caseState <- VimReplaceCaseState.None
| VimReplaceCaseState.UpperUntil ->
_builder.AppendChar (CharUtil.ToUpper c)
member private x.AppendReplaceString str =
str |> Seq.iter x.AppendReplaceChar
member private x.AppendGroup (m: Match) digit =
Contract.Requires (digit <> 0)
if digit < m.Groups.Count then
let group = m.Groups.[digit]
x.AppendReplaceString group.Value
member private x.AppendRegister (c: char) =
match RegisterName.OfChar c with
| None -> ()
| Some name ->
let register = _registerMap.GetRegister name
x.AppendReplaceString register.StringValue
_index <- _index + 2
/// Append the next element from the replace string. This is typically a character but can
/// be more if the character is an escape sequence.
///
/// This method is responsible for updating _index based on the value consumed
member private x.AppendNextElement (m: Match) =
Contract.Requires (_index < _replacement.Length)
match _replacement.[_index] with
| '&' when _replaceData.Magic ->
x.AppendReplaceString m.Value
_index <- _index + 1
| '~' when _replaceData.Magic ->
x.AppendReplaceString _replaceData.PreviousReplacement
_index <- _index + 1
| '\\' when (_index + 1) < _replacement.Length ->
match _replacement.[_index + 1] with
| '\\' -> _builder.AppendChar '\\'
| 't' -> _builder.AppendChar '\t'
| '*' -> _builder.AppendChar '*'
| 'n' -> _builder.AppendChar (char 0)
| '0' -> x.AppendReplaceString m.Value
| '&' ->
if _replaceData.Magic then
_builder.AppendChar '&'
else
x.AppendReplaceString m.Value
| '~' ->
if _replaceData.Magic then
_builder.AppendChar '~'
else
x.AppendReplaceString _replaceData.PreviousReplacement
| 'u' -> _caseState <- VimReplaceCaseState.UpperChar
| 'U' -> _caseState <- VimReplaceCaseState.UpperUntil
| 'l' -> _caseState <- VimReplaceCaseState.LowerChar
| 'L' -> _caseState <- VimReplaceCaseState.LowerUtil
| 'e' -> _caseState <- VimReplaceCaseState.None
| 'E' -> _caseState <- VimReplaceCaseState.None
| 'r' -> _builder.AppendString _replaceData.NewLine
| c ->
if c = CharCodes.Enter then
_builder.AppendString _replaceData.NewLine
elif c = '=' && _index + 3 < _replacement.Length && _replacement.[_index + 2] = '@' then
x.AppendRegister _replacement.[_index + 3]
else
match CharUtil.GetDigitValue c with
| Some d-> x.AppendGroup m d
| None ->
_builder.AppendChar '\\'
_builder.AppendChar c
_index <- _index + 2
| c ->
if c = CharCodes.Enter then
_builder.AppendString _replaceData.NewLine
else
x.AppendReplaceChar c
_index <- _index + 1
member private x.AppendReplacementCore (m: Match) =
_caseState <- VimReplaceCaseState.None
_index <- 0
while _index < _replacement.Length do
x.AppendNextElement m
member private x.AppendReplacement (m: Match) =
match _replaceData.Count with
| VimRegexReplaceCount.All -> x.AppendReplacementCore m
| VimRegexReplaceCount.One when _replaceCount = 0 -> x.AppendReplacementCore m
| _ -> _builder.AppendString m.Value
_replaceCount <- _replaceCount + 1
/// Get the position of the match start group or the start of the whole match
/// (the match start group is present when the regex contained '\zs')
member x.MatchStart (m: Match) =
if _hasStartGroup then
m.Groups.[VimRegexUtils.StartGroupName].Index
else
m.Index
/// Get the position of the match end group or the end of the whole match
/// (the match end group is present when the regex contained '\ze')
member x.MatchEnd (m: Match) =
if _hasEndGroup then
m.Groups.[VimRegexUtils.EndGroupName].Index
else
m.Index + m.Length
/// Append the text which occurred before the match specified by this index.
member private x.AppendInputBefore (matchIndex: int) =
if matchIndex = 0 then
let m = _matchCollection.[matchIndex]
_builder.AppendSubstring _input 0 (x.MatchStart m)
else
let current = _matchCollection.[matchIndex]
let before = _matchCollection.[matchIndex - 1]
let charSpan = CharSpan.FromBounds _input (x.MatchEnd before) (x.MatchStart current)CharComparer.Exact
_builder.AppendCharSpan charSpan
member private x.AppendInputEnd() =
let last = _matchCollection.[_matchCollection.Count - 1]
let charSpan = CharSpan.FromBounds _input (x.MatchEnd last) _input.Length CharComparer.Exact
_builder.AppendCharSpan charSpan
member x.Replace (replacement: string) (replaceData: VimRegexReplaceData) =
_replaceCount <- 0
_replacement <- replacement
_replaceData <- replaceData
_builder.Length <- 0
_caseState <- VimReplaceCaseState.None
_index <- 0
let mutable matchIndex = 0
while matchIndex < _matchCollection.Count do
let m = _matchCollection.[matchIndex]
x.AppendInputBefore matchIndex
x.AppendReplacement m
matchIndex <- matchIndex + 1
x.AppendInputEnd()
_builder.ToString()
/// Represents a Vim style regular expression
[<Sealed>]
type VimRegex
(
_vimPattern: string,
_caseSpecifier: CaseSpecifier,
_regexPattern: string,
_regex: Regex,
_includesNewLine: bool,
_matchesVisualSelection: bool
) =
member x.CaseSpecifier = _caseSpecifier
member x.VimPattern = _vimPattern
member x.RegexPattern = _regexPattern
member x.Regex = _regex
member x.IncludesNewLine = _includesNewLine
member x.MatchesVisualSelection = _matchesVisualSelection
- member x.IsMatch pattern = _regex.IsMatch(pattern)
+ member x.IsMatch (pattern: string) = _regex.IsMatch(pattern)
member x.Replace (input: string) (replacement: string) (replaceData: VimRegexReplaceData) (registerMap: IRegisterMap) =
let collection = _regex.Matches(input)
if collection.Count > 0 then
let util = VimRegexReplaceUtil(input, _regex, collection, registerMap)
util.Replace replacement replaceData
else
input
override x.ToString() = sprintf "vim %O -> bcl %O" x.VimPattern x.RegexPattern
[<RequireQualifiedAccess>]
[<NoComparison>]
type MagicKind =
| NoMagic
| Magic
| VeryMagic
| VeryNoMagic
with
member x.IsAnyNoMagic =
match x with
| MagicKind.NoMagic -> true
| MagicKind.VeryNoMagic -> true
| MagicKind.Magic -> false
| MagicKind.VeryMagic -> false
member x.IsAnyMagic = not x.IsAnyNoMagic
/// This type is responsible for converting a vim style regex into a .Net based
/// one.
type VimRegexBuilder
(
_pattern: string,
_magicKind: MagicKind,
_matchCase: bool,
_options: VimRegexOptions
) =
let mutable _builder = StringBuilder()
let mutable _index = 0
let mutable _magicKind = _magicKind
let mutable _matchCase = _matchCase
let mutable _caseSpecifier = CaseSpecifier.None
let mutable _isAlternate = false
let mutable _isBroken = false
let mutable _groupCount = 0
let mutable _isStartOfPattern = true
let mutable _isStartOfCollection = false
let mutable _isRangeOpen = false
let mutable _isRangeGreedy = false
let mutable _isCollectionOpen = false
let mutable _includesNewLine = false
let mutable _matchesVisualSelection = false
member x.Pattern = _pattern
member x.Index
with get () = _index
and set value = _index <- value
member x.Builder = _builder
/// The original options
member x.Options = _options
member x.MagicKind
with get() = _magicKind
and set value = _magicKind <- value
member x.MatchCase
with get() = _matchCase
and set value = _matchCase <- value
/// Which case specifier appeared in the pattern
member x.CaseSpecifier
with get() = _caseSpecifier
and set value = _caseSpecifier <- value
/// Whether this is an expression alternate prefixed by '\_'
member x.IsAlternate
with get() = _isAlternate
and set value = _isAlternate <- value
/// Is the match completely broken and should match nothing
member x.IsBroken = _isBroken
/// Is this the start of the pattern
member x.IsStartOfPattern
with get() = _isStartOfPattern
and set value = _isStartOfPattern <- value
/// Is this the first character inside of a collection [] construct
member x.IsStartOfCollection
with get() = _isStartOfCollection
and set value = _isStartOfCollection <- value
/// Is this in the middle of a range?
member x.IsRangeOpen = _isRangeOpen
/// Is this in the middle of a collection?
member x.IsCollectionOpen = _isCollectionOpen
/// Is this in the middle of a group?
member x.IsGroupOpen = _groupCount > 0
/// Includes a \n reference
member x.IncludesNewLine
with get() = _includesNewLine
and set value = _includesNewLine <- value
/// Matches the visual selection
member x.MatchesVisualSelection
with get() = _matchesVisualSelection
and set value = _matchesVisualSelection <- value
member x.IncrementGroupCount() =
_groupCount <- _groupCount + 1
member x.DecrementGroupCount() =
_groupCount <- _groupCount - 1
member x.IncrementIndex count =
_index <- _index + count
member x.DecrementIndex count =
_index <- _index - count
member x.CharAtIndex =
StringUtil.CharAtOption x.Index x.Pattern
member x.CharAtIndexOrDefault =
match StringUtil.CharAtOption x.Index x.Pattern with
| Some c -> c
| None -> char 0
member x.CharAt index =
StringUtil.CharAtOption index x.Pattern
member x.CharAtOrDefault index =
match StringUtil.CharAtOption index x.Pattern with
| None -> char 0
| Some c -> c
member x.AppendString str =
_builder.AppendString str
member x.AppendChar c =
x.Builder.AppendChar c
member x.AppendEscapedChar c =
c |> StringUtil.OfChar |> Regex.Escape |> x.AppendString
member x.BeginCollection() =
x.AppendChar '['
_isCollectionOpen <- true
_isStartOfCollection <- true
member x.EndCollection() =
x.AppendChar ']'
_isCollectionOpen <- false
member x.BeginRange isGreedy =
x.AppendChar '{'
_isRangeOpen <- true
_isRangeGreedy <- isGreedy
member x.EndRange() =
x.AppendChar '}'
if not _isRangeGreedy then
x.AppendChar '?'
_isRangeOpen <- false
member x.Break() =
_isBroken <- true
override x.ToString() = sprintf "pattern %s index %d index char %c" _pattern x.Index x.CharAtIndexOrDefault
module VimRegexFactory =
let EndOfLineCharacters = @"\r\n"
let DotRegex = "[^" + EndOfLineCharacters + "]"
let DollarRegex = @"(?<!\r)(?=\r?$)"
let NewLineRegex = @"(?<!\r)\r?\n"
let MatchStartRegex = "(?<" + VimRegexUtils.StartGroupName + ">)"
let MatchEndRegex = "(?<" + VimRegexUtils.EndGroupName + ">)"
/// Generates strings based on a char filter func. Easier than hand writing out
/// the values
let GenerateCharString filterFunc =
[0 .. 255]
|> Seq.map (fun x -> char x)
|> Seq.filter filterFunc
|> StringUtil.OfCharSeq
let ControlCharString = GenerateCharString CharUtil.IsControl
let PunctuationCharString = GenerateCharString Char.IsPunctuation
let SpaceCharString = (GenerateCharString Char.IsWhiteSpace).Replace("\n", "") // vim excludes newline
let BlankCharString = " \t"
let BlankCharRegex = "[" + BlankCharString + "]"
let PrintableGroupPattern =
let str = [0 .. 255] |> Seq.map (fun i -> char i) |> Seq.filter (fun c -> not (Char.IsControl c)) |> StringUtil.OfCharSeq
"[" + str + "]"
let PrintableGroupNoDigitsPattern =
let str = [0 .. 255] |> Seq.map (fun i -> char i) |> Seq.filter (fun c -> not (Char.IsControl c) && not (Char.IsDigit c)) |> StringUtil.OfCharSeq
"[" + str + "]"
/// These are the named collections specified out inside of :help E769. These are always
/// appended inside a .Net [] collection and hence need to be valid in that context
let NamedCollectionMap =
[|
("alnum", "A-Za-z0-9")
("alpha", "A-Za-z")
("blank", BlankCharString)
("cntrl", ControlCharString)
("digit", "0-9")
("lower", "a-z")
("punct", PunctuationCharString)
("space", SpaceCharString)
("upper", "A-Z")
("xdigit", "A-Fa-f0-9")
("return", StringUtil.OfChar CharCodes.Enter)
("tab", "\t")
("escape", StringUtil.OfChar CharCodes.Escape)
("backspace", StringUtil.OfChar CharCodes.Backspace)
|] |> Map.ofArray
/// Combine two patterns using alternation into a non-capturing group
let CombineAlternatives (pattern1: string) (pattern2: string) =
"(?:" + pattern1 + "|" + pattern2 + ")"
/// In Vim if a collection is unmatched then it is appended literally into the match
/// stream. Can't determine if it's unmatched though until the string is fully
/// processed. At this point we just go backwards and esacpe it
let FixOpenCollection (data: VimRegexBuilder) =
let builder = data.Builder
let mutable i = builder.Length - 1
while i >= 0 do
if builder.[i] = '[' && (i = 0 || builder.[i - 1] <> '\\') then
builder.Insert(i, '\\') |> ignore
i <- -1
else
i <- i - 1
// Create the actual Vim regex
let CreateVimRegex (data: VimRegexBuilder) =
let regexOptions =
let regexOptions =
if Util.IsFlagSet data.Options VimRegexOptions.NotCompiled then
RegexOptions.None
else
RegexOptions.Compiled
let regexOptions =
if data.IncludesNewLine then
regexOptions
else
regexOptions ||| RegexOptions.Multiline
if data.MatchCase then
regexOptions
else
regexOptions ||| RegexOptions.IgnoreCase
if data.IsCollectionOpen then
FixOpenCollection data
if data.IsBroken then
VimResult.Error Resources.Regex_Unknown
elif data.IsRangeOpen then
VimResult.Error Resources.Regex_UnmatchedBrace
elif data.IsGroupOpen then
VimResult.Error Resources.Regex_UnmatchedParen
else
let bclPattern = data.Builder.ToString()
let regex = VimRegexUtils.TryCreateRegex bclPattern regexOptions
match regex with
| None -> VimResult.Error Resources.Regex_Unknown
| Some regex -> VimRegex(data.Pattern, data.CaseSpecifier, bclPattern, regex, data.IncludesNewLine, data.MatchesVisualSelection) |> VimResult.Result
/// Try and parse out the name of a named collection. This is called when the
/// index points to ':' assuming this is a valid named collection
let TryParseNamedCollectionName (data: VimRegexBuilder) =
let index = data.Index
if data.CharAtOrDefault index = ':' then
let mutable endIndex = index + 1
while endIndex < data.Pattern.Length && data.CharAtOrDefault endIndex <> ':' do
endIndex <- endIndex + 1
if data.CharAtOrDefault (endIndex + 1) = ']' then
// It's a named collection
let startIndex = index + 1
let name = data.Pattern.Substring(startIndex, endIndex - startIndex)
Some name
else
None
else
None
/// Try and append one of the named collections. These are covered in :help E769.
let TryAppendNamedCollection (data: VimRegexBuilder) c =
if data.IsCollectionOpen && c = '[' then
match TryParseNamedCollectionName data with
| None -> false
| Some name ->
match Map.tryFind name NamedCollectionMap with
| Some value ->
// Length of the name + characters in the named "::]"
data.Index <- data.Index + (name.Length + 3)
data.AppendString value
true
| None -> false
else
false
/// Clear state related to previous parsing
let ClearState (data: VimRegexBuilder) =
let isStartOfPattern = data.IsStartOfPattern
let isStartOfCollection = data.IsStartOfCollection
let isAlternate = data.IsAlternate
data.IsStartOfPattern <- false
data.IsStartOfCollection <- false
data.IsAlternate <- false
isStartOfPattern, isStartOfCollection, isAlternate
/// Convert a normal unescaped char. This still needs to consider open patterns.
let ConvertCharAsNormal (data: VimRegexBuilder) c =
if not (TryAppendNamedCollection data c) then
data.AppendEscapedChar c
ClearState data |> ignore
/// Convert the given character as a special character. This is done independent of any
/// magic setting.
let ConvertCharAsSpecial (data: VimRegexBuilder) c =
let isStartOfPattern, isStartOfCollection, isAlternate =
ClearState data
match c with
| '.' ->
if data.IsCollectionOpen then
ConvertCharAsNormal data '.'
else
data.AppendString DotRegex
| '+' -> data.AppendChar '+'
| '=' -> data.AppendChar '?'
| '?' -> data.AppendChar '?'
| '*' -> data.AppendChar '*'
| '(' ->
data.IncrementGroupCount()
data.AppendChar '('
| ')' ->
data.DecrementGroupCount()
data.AppendChar ')'
| '{' ->
if data.IsRangeOpen then
data.Break()
elif data.CharAtIndexOrDefault = '-' && data.CharAtOrDefault (data.Index + 1) = '}' then
data.AppendString "*?"
data.IncrementIndex 2
elif data.CharAtIndexOrDefault = '-' then
data.BeginRange false
data.IncrementIndex 1
else
data.BeginRange true
| '}' -> if data.IsRangeOpen then data.EndRange() else data.AppendChar '}'
| '|' -> data.AppendChar '|'
| '^' ->
if isStartOfPattern then
data.AppendChar '^'
elif isStartOfCollection then
data.AppendChar '^'
if not isAlternate then
data.AppendString EndOfLineCharacters
else
data.IncludesNewLine <- true
else
data.AppendEscapedChar '^'
| '$' ->
let isEndOfPattern =
if data.Index >= data.Pattern.Length then true
else
match data.MagicKind, data.CharAt data.Index, data.CharAt (data.Index + 1) with
| MagicKind.VeryMagic, Some '|', _ -> true
| _, Some '\\', Some '|' -> true
| _ -> false
if isEndOfPattern then data.AppendString DollarRegex
else data.AppendEscapedChar '$'
| '<' -> data.AppendString @"\b"
| '>' -> data.AppendString @"\b"
| '[' ->
if data.IsCollectionOpen then
ConvertCharAsNormal data '['
else
match data.CharAtIndex with
| Some ']' ->
data.AppendEscapedChar '['
data.AppendEscapedChar ']'
data.IncrementIndex 1
| Some '^' ->
data.BeginCollection()
data.IsAlternate <- isAlternate
| _ ->
data.BeginCollection()
if isAlternate then
data.AppendString EndOfLineCharacters
data.IncludesNewLine <- true
| ']' -> if data.IsCollectionOpen then data.EndCollection() else data.AppendEscapedChar(']')
| 'd' -> data.AppendString @"\d"
| 'D' -> data.AppendString @"\D"
| 's' -> data.AppendString BlankCharRegex
| 'S' -> data.AppendString @"\S"
| 'w' -> data.AppendString @"\w"
| 'W' -> data.AppendString @"\W"
| 'x' -> data.AppendString @"[0-9A-Fa-f]"
| 'X' -> data.AppendString @"[^0-9A-Fa-f]"
| 'o' -> data.AppendString @"[0-7]"
| 'O' -> data.AppendString @"[^0-7]"
| 'h' -> data.AppendString @"[A-Za-z_]"
| 'H' -> data.AppendString @"[^A-Za-z_]"
| 'a' -> data.AppendString @"[A-Za-z]"
| 'A' -> data.AppendString @"[^A-Za-z]"
| 'l' -> data.AppendString @"[a-z]"
| 'L' -> data.AppendString @"[^a-z]"
| 'u' -> data.AppendString @"[A-Z]"
| 'U' -> data.AppendString @"[^A-Z]"
| 'i' -> data.AppendString @"[0-9_a-zA-Zà áâãäåæçèéêë@]"
| 'I' -> data.AppendString @"[_a-zA-Zà áâãäåæçèéêë@]"
| 'k' -> data.AppendString @"[0-9_a-zA-Zà áâãäåæçèéêë@]"
| 'K' -> data.AppendString @"[_a-zA-Zà áâãäåæçèéêë@]"
| 'f' -> data.AppendString @"[0-9a-zA-Z@/\.-_+,#$%{}[\]:!~=]"
| 'F' -> data.AppendString @"[a-zA-Z@/\.-_+,#$%{}[\]:!~=]"
| 'p' -> data.AppendString PrintableGroupPattern
| 'P' -> data.AppendString PrintableGroupNoDigitsPattern
| 'n' ->
// vim expects \n to match any kind of newline, regardless of platform. Think about it,
// you can't see newlines, so why should you be expected to know the diff between them?
// Also, use ?: for non-capturing group, so we don't cause any weird behavior
data.AppendString NewLineRegex
data.IncludesNewLine <- true
| 't' -> data.AppendString @"\t"
| 'v' ->
data.MagicKind <- MagicKind.VeryMagic
data.IsStartOfPattern <- isStartOfPattern
| 'V' ->
data.MagicKind <- MagicKind.VeryNoMagic
data.IsStartOfPattern <- isStartOfPattern
| 'm' ->
data.MagicKind <- MagicKind.Magic
data.IsStartOfPattern <- isStartOfPattern
| 'M' ->
data.MagicKind <- MagicKind.NoMagic
data.IsStartOfPattern <- isStartOfPattern
| 'C' ->
data.MatchCase <- true
data.CaseSpecifier <- CaseSpecifier.OrdinalCase
| 'c' ->
data.MatchCase <- false
data.CaseSpecifier <- CaseSpecifier.IgnoreCase
| 'z' ->
match data.CharAtIndex with
| Some c ->
data.IncrementIndex 1
match c with
| 's' -> data.AppendString MatchStartRegex
| 'e' -> data.AppendString MatchEndRegex
| _ -> data.Break()
| None -> data.Break()
| _ ->
if CharUtil.IsDigit c then
// Convert the \1 escape into the BCL \1 for any single digit
let str = sprintf "\\%c"c
data.AppendString str
else data.AppendEscapedChar c
/// Convert the given escaped char in the magic and no magic settings. The
/// differences here are minimal so it's convenient to put them in one method
/// here
let ConvertEscapedCharAsMagicAndNoMagic (data: VimRegexBuilder) c =
let isMagic = data.MagicKind = MagicKind.Magic || data.MagicKind = MagicKind.VeryMagic
match c with
| '%' ->
match data.CharAtIndex with
| None -> data.Break()
| Some c ->
data.IncrementIndex 1
match c with
| 'V' -> data.MatchesVisualSelection <- true
| _ -> data.Break()
| '.' -> if isMagic then data.AppendEscapedChar c else ConvertCharAsSpecial data c
| '*' -> if isMagic then data.AppendEscapedChar c else ConvertCharAsSpecial data c
| '+' -> ConvertCharAsSpecial data c
| '?' -> ConvertCharAsSpecial data c
| '=' -> ConvertCharAsSpecial data c
| '<' -> ConvertCharAsSpecial data c
| '>' -> ConvertCharAsSpecial data c
| '(' -> ConvertCharAsSpecial data c
| ')' -> ConvertCharAsSpecial data c
| '{' -> ConvertCharAsSpecial data c
| '}' -> if data.IsRangeOpen then data.EndRange() else data.AppendEscapedChar c
| '|' -> ConvertCharAsSpecial data c
| '[' -> if isMagic then data.AppendEscapedChar c else ConvertCharAsSpecial data c
| ']' -> ConvertCharAsSpecial data c
| 'a' -> ConvertCharAsSpecial data c
| 'A' -> ConvertCharAsSpecial data c
| 'd' -> ConvertCharAsSpecial data c
| 'D' -> ConvertCharAsSpecial data c
| 'h' -> ConvertCharAsSpecial data c
diff --git a/Src/VimMac/VimMac.csproj b/Src/VimMac/VimMac.csproj
index 2ef7a7f..7f20944 100644
--- a/Src/VimMac/VimMac.csproj
+++ b/Src/VimMac/VimMac.csproj
@@ -1,29 +1,29 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<RootNamespace>Vim.Mac</RootNamespace>
<AssemblyName>Vim.Mac</AssemblyName>
- <TargetFramework>net6.0-macos</TargetFramework>
+ <TargetFramework>net7.0</TargetFramework>
<DefineConstants>$(DefineConstants);VS_SPECIFIC_MAC</DefineConstants>
<!-- Suppress warning CA1416 -->
<EnableNETAnalyzers>false</EnableNETAnalyzers>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\VimCore\VimCore.fsproj" />
<PackageReference Include="Microsoft.VisualStudioMac.Sdk" Version="17.0.0" />
<PackageReference Include="Microsoft.CodeAnalysis.Scripting" Version="4.3.0.0" />
</ItemGroup>
<ItemGroup>
<AddinReference Include="MonoDevelop.TextEditor" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\beep.wav" />
<EmbeddedResource Include="Resources\KeyBindingSchemeVim.xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\VimWpf\Implementation\Misc\ClipboardDevice.cs">
<Link>ClipboardDevice.cs</Link>
</Compile>
</ItemGroup>
</Project>
|
VsVim/VsVim
|
8e73f818aa32a94a8257e834544f0fc6a1df2c8e
|
Add arm64 installation target
|
diff --git a/Directory.Build.targets b/Directory.Build.targets
index f620c8d..62ac5e8 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,21 +1,21 @@
<Project>
<PropertyGroup>
<!-- Disable the preview warning when building -->
<_NETCoreSdkIsPreview>false</_NETCoreSdkIsPreview>
<LangVersion Condition="'$(Language)' == 'C#'">Latest</LangVersion>
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.0.5232" Condition="'$(VsVimProjectType)' == 'Vsix'" />
+ <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.4.2118" Condition="'$(VsVimProjectType)' == 'Vsix'" />
</ItemGroup>
<Import
Project="$(MSBuildThisFileDirectory)References\Vs2019\Vs2019.Build.targets"
Condition="'$(VsVimVisualStudioTargetVersion)' == '16.0' AND '$(VsVimProjectType)' != ''" />
<Import
Project="$(MSBuildThisFileDirectory)References\Vs2022\Vs2022.Build.targets"
Condition="'$(VsVimVisualStudioTargetVersion)' == '17.0' AND '$(VsVimProjectType)' != ''" />
</Project>
diff --git a/Src/VsVim2022/source.extension.vsixmanifest b/Src/VsVim2022/source.extension.vsixmanifest
index 94e6e23..eb3709e 100644
--- a/Src/VsVim2022/source.extension.vsixmanifest
+++ b/Src/VsVim2022/source.extension.vsixmanifest
@@ -1,37 +1,49 @@
<?xml version="1.0" encoding="utf-8"?>
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
<Metadata>
<!-- DEV17_TODO -->
<Identity Publisher="Jared Parsons" Version="2.10.0.5" Id="VsVim.Microsoft.e97cd707-324b-4e35-a669-eef8dae4b8cf" Language="en-US" />
<DisplayName>VsVim 2022</DisplayName>
<Description>VIM emulation layer for Visual Studio</Description>
<MoreInfo>https://github.com/VsVim/VsVim</MoreInfo>
<License>License.txt</License>
<Icon>VsVim_large.png</Icon>
<PreviewImage>VsVim_small.png</PreviewImage>
<Tags>vsvim</Tags>
</Metadata>
<Installation>
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0,18.0)">
<ProductArchitecture>amd64</ProductArchitecture>
</InstallationTarget>
<InstallationTarget Version="[17.0,18.0)" Id="Microsoft.VisualStudio.IntegratedShell">
<ProductArchitecture>amd64</ProductArchitecture>
</InstallationTarget>
<InstallationTarget Version="[17.0,18.0)" Id="Microsoft.VisualStudio.Pro">
<ProductArchitecture>amd64</ProductArchitecture>
</InstallationTarget>
<InstallationTarget Version="[17.0,18.0)" Id="Microsoft.VisualStudio.Enterprise">
<ProductArchitecture>amd64</ProductArchitecture>
</InstallationTarget>
+ <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0,18.0)">
+ <ProductArchitecture>arm64</ProductArchitecture>
+ </InstallationTarget>
+ <InstallationTarget Version="[17.0,18.0)" Id="Microsoft.VisualStudio.IntegratedShell">
+ <ProductArchitecture>arm64</ProductArchitecture>
+ </InstallationTarget>
+ <InstallationTarget Version="[17.0,18.0)" Id="Microsoft.VisualStudio.Pro">
+ <ProductArchitecture>arm64</ProductArchitecture>
+ </InstallationTarget>
+ <InstallationTarget Version="[17.0,18.0)" Id="Microsoft.VisualStudio.Enterprise">
+ <ProductArchitecture>arm64</ProductArchitecture>
+ </InstallationTarget>
</Installation>
<Assets>
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="VimCore" Path="|VimCore|" />
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="File" Path="Colors.pkgdef" />
</Assets>
<Prerequisites>
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[17.0,18.0)" DisplayName="Visual Studio core editor" />
</Prerequisites>
</PackageManifest>
|
VsVim/VsVim
|
5fd473938bea97bf0d50887ac7111ae39275edb0
|
Highlight current line number the same way as vanilla vsmac
|
diff --git a/Src/VimMac/RelativeLineNumbers/RelativeLineNumbersMargin.cs b/Src/VimMac/RelativeLineNumbers/RelativeLineNumbersMargin.cs
index 1e47595..6147158 100644
--- a/Src/VimMac/RelativeLineNumbers/RelativeLineNumbersMargin.cs
+++ b/Src/VimMac/RelativeLineNumbers/RelativeLineNumbersMargin.cs
@@ -1,399 +1,414 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using AppKit;
using CoreAnimation;
using CoreGraphics;
using CoreText;
using Foundation;
using Microsoft.VisualStudio.Text.Classification;
using Microsoft.VisualStudio.Text.Editor;
using Vim.UI.Wpf.Implementation.RelativeLineNumbers;
using Vim.UI.Wpf.Implementation.RelativeLineNumbers.Util;
namespace Vim.UI.Cocoa.Implementation.RelativeLineNumbers
{
internal sealed class RelativeLineNumbersMargin : NSView, ICocoaTextViewMargin
{
// Large enough that we shouldn't expect the view to reallocate the array.
private const int ExpectedNumberOfVisibleLines = 100;
#region Private Members
private readonly List<CocoaLineNumberMarginDrawingVisual> recyclableVisuals
= new List<CocoaLineNumberMarginDrawingVisual>(ExpectedNumberOfVisibleLines);
private readonly Queue<int> unusedChildIndicies = new Queue<int>(ExpectedNumberOfVisibleLines);
private ICocoaTextView _textView;
private ICocoaClassificationFormatMap _classificationFormatMap;
private IClassificationTypeRegistryService _classificationTypeRegistry;
internal NSStringAttributes _formatting;
+ private NSStringAttributes _currentLineFormatting;
private int _visibleDigits = 5;
internal bool _updateNeeded = false;
private bool _isDisposed = false;
private NSView _translatedCanvas;
private double _oldViewportTop;
private LineNumbersCalculator _lineNumbersCalculator;
private IVimLocalSettings _localSettings;
private int lastLineNumber;
#endregion // Private Members
/// <summary>
/// Creates a default Line Number Provider for a Text Editor
/// </summary>
/// <param name="textView">
/// The Text Editor with which this line number provider is associated
/// </param>
/// <param name="classificationFormatMap">Used for getting/setting the format of the line number classification</param>
/// <param name="classificationTypeRegistry">Used for retrieving the "line number" classification</param>
public RelativeLineNumbersMargin(
ICocoaTextView textView,
ICocoaClassificationFormatMap classificationFormatMap,
IClassificationTypeRegistryService classificationTypeRegistry,
IVimLocalSettings vimLocalSettings)
{
_textView = textView;
_classificationFormatMap = classificationFormatMap;
_classificationTypeRegistry = classificationTypeRegistry;
_translatedCanvas = this;
_oldViewportTop = 0.0;
_lineNumbersCalculator = new LineNumbersCalculator(textView, vimLocalSettings);
_localSettings = vimLocalSettings;
WantsLayer = true;
Hidden = false;
}
public override bool IsFlipped => true;
public override bool Hidden
{
get => base.Hidden;
set
{
base.Hidden = value;
if (!value)
{
// Sign up for layout changes on the Text Editor
_textView.LayoutChanged += OnEditorLayoutChanged;
// Sign up for classification format change events
_classificationFormatMap.ClassificationFormatMappingChanged += OnClassificationFormatChanged;
_textView.ZoomLevelChanged += _textView_ZoomLevelChanged;
_textView.Caret.PositionChanged += Caret_PositionChanged;
//Fonts might have changed while we were hidden.
this.SetFontFromClassification();
}
else
{
// Unregister from layout changes on the Text Editor
_textView.LayoutChanged -= OnEditorLayoutChanged;
_textView.ZoomLevelChanged -= _textView_ZoomLevelChanged;
_textView.Caret.PositionChanged -= Caret_PositionChanged;
// Unregister from classification format change events
_classificationFormatMap.ClassificationFormatMappingChanged -= OnClassificationFormatChanged;
}
}
}
private void Caret_PositionChanged(object sender, CaretPositionChangedEventArgs e)
{
var lineNumber = e.TextView.Caret.ContainingTextViewLine.GetLineNumber();
if (lineNumber != lastLineNumber)
{
lastLineNumber = lineNumber;
_updateNeeded = true;
UpdateLineNumbers();
}
}
private void _textView_ZoomLevelChanged(object sender, ZoomLevelChangedEventArgs e)
{
_updateNeeded = true;
UpdateLineNumbers();
}
#region Private Helpers
private void ThrowIfDisposed()
{
if (_isDisposed)
throw new ObjectDisposedException(PredefinedMarginNames.LineNumber);
}
private void SetFontFromClassification()
{
IClassificationType lineNumberClassificaiton = _classificationTypeRegistry.GetClassificationType("line number");
var font = _classificationFormatMap.GetTextProperties(lineNumberClassificaiton);
+ IClassificationType currentLineNumberClassification = _classificationTypeRegistry.GetClassificationType("Selected Line Number");
+
+ var currentLineNumberFont = _classificationFormatMap.GetTextProperties(currentLineNumberClassification);
+
_formatting = font;
+ _currentLineFormatting = currentLineNumberFont;
this.DetermineMarginWidth();
Layer.BackgroundColor = (font.BackgroundColor ?? NSColor.Clear).CGColor;
// Reformat all the lines
ClearLineNumbers();
this.UpdateLineNumbers();
}
private void ClearLineNumbers(bool disposing = false)
{
recyclableVisuals.Clear();
if (!disposing)
{
foreach (var sublayer in _translatedCanvas.Layer.Sublayers ?? Array.Empty<CALayer>())
sublayer.RemoveFromSuperLayer();
}
}
/// <summary>
/// Determine the width of the margin, using the number of visible digits (e.g. 5) to construct
/// a model string (e.g. "88888")
/// </summary>
private void DetermineMarginWidth()
{
// Our width should follow the following rules:
// 1) No smaller than wide enough to fit 5 digits
// 2) Increase in size whenever larger numbers are encountered
// 3) _Never_ decrease in size (e.g. if resized to fit 7 digits,
// will not shrink when scrolled up to 3 digit numbers)
using (var textLine = new CTLine(new NSAttributedString(new string('8', _visibleDigits), _formatting)))
{
intrinsicContentSize = new CGSize(textLine.GetBounds(0).Width, NoIntrinsicMetric);
InvalidateIntrinsicContentSize();
}
}
private CGSize intrinsicContentSize;
private NSTrackingArea _trackingArea;
public override CGSize IntrinsicContentSize => intrinsicContentSize;
/// <summary>
/// Resize the width of the margin if the number of digits in the last (largest) visible number
/// is larger than we can currently handle.
/// </summary>
/// <param name="lastVisibleLineNumber">The last (largest) visible number in the view</param>
private void ResizeIfNecessary(int lastVisibleLineNumber)
{
// We are looking at lines base 1, not base 0
lastVisibleLineNumber++;
if (lastVisibleLineNumber <= 0)
lastVisibleLineNumber = 1;
int numDigits = (int)Math.Log10(lastVisibleLineNumber) + 1;
if (numDigits > _visibleDigits)
{
_visibleDigits = numDigits;
this.DetermineMarginWidth();
// Clear existing children so they are all regenerated in
// UpdateLineNumbers
ClearLineNumbers();
}
}
private void UpdateLineNumbers()
{
_updateNeeded = false;
+ int currentLineNumber = _textView.Caret.Position.BufferPosition.GetContainingLine().LineNumber + 1;
if (!Enabled)
{
if (recyclableVisuals.Count > 0)
{
intrinsicContentSize = new CGSize(0, NoIntrinsicMetric);
InvalidateIntrinsicContentSize();
ClearLineNumbers();
}
return;
}
else
{
if (intrinsicContentSize.Width == 0)
{
DetermineMarginWidth();
}
}
if (_textView.IsClosed)
{
return;
}
// If the text view is in the middle of performing a layout, don't proceed. Otherwise an exception will be thrown when trying to access TextViewLines.
// If we are in layout, then a LayoutChangedEvent is expected to be raised which will in turn cause this method to be invoked.
if (_textView.InLayout)
{
return;
}
var (lines, maxLineNumber) = _lineNumbersCalculator.CalculateLineNumbers();
// If there are no line numbers to display, quit
if (lines == null || lines.Count == 0)
{
return;
}
// Check to see if we need to resize the margin width
this.ResizeIfNecessary(maxLineNumber);
var layer = _translatedCanvas.Layer;
unusedChildIndicies.Clear();
// Update the existing visuals.
for (int iChild = 0, nChildren = recyclableVisuals.Count; iChild < nChildren; iChild++)
{
var child = recyclableVisuals[iChild];
var lineNumber = child.LineNumber;
if (lines.TryGetValue(lineNumber, out var line))
{
lines.Remove(lineNumber);
UpdateVisual(child, line);
}
else
{
child.InUse = false;
unusedChildIndicies.Enqueue(iChild);
}
}
// For any leftover lines, repurpose any existing visuals or create new ones.
foreach (var line in lines.Values)
{
CocoaLineNumberMarginDrawingVisual visual;
if (unusedChildIndicies.Count > 0)
{
var childIndex = unusedChildIndicies.Dequeue();
visual = recyclableVisuals[childIndex];
Debug.Assert(!visual.InUse);
}
else
{
visual = new CocoaLineNumberMarginDrawingVisual();
recyclableVisuals.Add(visual);
layer.AddSublayer(visual);
visual.ContentsScale = layer.ContentsScale;
}
UpdateVisual(visual, line);
}
if (_oldViewportTop != _textView.ViewportTop)
{
_translatedCanvas.Bounds = new CGRect(_translatedCanvas.Bounds.X, _textView.ViewportTop, _translatedCanvas.Bounds.Width, _translatedCanvas.Bounds.Height);
_oldViewportTop = _textView.ViewportTop;
}
void UpdateVisual(CocoaLineNumberMarginDrawingVisual visual, Line line)
{
visual.InUse = true;
+
+ var formatting = _formatting;
+
+ if (line.LineNumber == currentLineNumber)
+ {
+ formatting = _currentLineFormatting;
+ }
+
visual.Update(
- _formatting,
+ formatting,
line,
intrinsicContentSize.Width);
}
}
#endregion
#region Event Handlers
internal void OnEditorLayoutChanged(object sender, EventArgs e)
{
if (!_updateNeeded)
{
_updateNeeded = true;
UpdateLineNumbers();
}
}
private void OnClassificationFormatChanged(object sender, EventArgs e)
{
this.SetFontFromClassification();
}
#endregion // Event Handlers
#region ICocoaTextViewMargin Members
public NSView VisualElement
{
get
{
ThrowIfDisposed();
return this;
}
}
#endregion
#region ITextViewMargin Members
public double MarginSize
{
get
{
ThrowIfDisposed();
return 10;
}
}
public bool Enabled
{
get
{
ThrowIfDisposed();
return _localSettings.Number || _localSettings.RelativeNumber;
}
}
#endregion
public override void UpdateTrackingAreas()
{
if (_trackingArea != null)
{
RemoveTrackingArea(_trackingArea);
_trackingArea.Dispose();
}
_trackingArea = new NSTrackingArea(Bounds,
NSTrackingAreaOptions.MouseMoved |
NSTrackingAreaOptions.ActiveInKeyWindow |
NSTrackingAreaOptions.MouseEnteredAndExited, this, null);
this.AddTrackingArea(_trackingArea);
}
public ITextViewMargin GetTextViewMargin(string marginName)
{
return string.Compare(marginName, RelativeLineNumbersMarginFactory.LineNumbersMarginName, StringComparison.OrdinalIgnoreCase) == 0 ? this : (ITextViewMargin)null;
}
protected override void Dispose(bool disposing)
{
if (!_isDisposed && disposing)
{
RemoveFromSuperview();
ClearLineNumbers(true);
}
_isDisposed = true;
base.Dispose(disposing);
}
}
}
|
VsVim/VsVim
|
2af829e7e0ddcb10f5c0bf13657782456ecba3b4
|
Separate out DeadCharHandler and InvisibleTextView
|
diff --git a/Src/VimMac/DeadCharHandler.cs b/Src/VimMac/DeadCharHandler.cs
new file mode 100644
index 0000000..a8293d7
--- /dev/null
+++ b/Src/VimMac/DeadCharHandler.cs
@@ -0,0 +1,57 @@
+using AppKit;
+using Microsoft.VisualStudio.Text.Editor;
+
+namespace Vim.UI.Cocoa
+{
+ internal sealed class DeadCharHandler
+ {
+ private bool _lastEventWasDeadChar;
+ private bool _processingDeadChar;
+ private string _convertedDeadCharacters;
+ private readonly ITextView _textView;
+ private InvisibleTextView _invisibleTextView;
+
+ public DeadCharHandler(ITextView textView)
+ {
+ _textView = textView;
+ }
+
+ public string ConvertedDeadCharacters => _convertedDeadCharacters;
+
+ internal void SetConvertedDeadCharacters(string value)
+ {
+ _convertedDeadCharacters = value;
+ }
+
+ public bool LastEventWasDeadChar => _lastEventWasDeadChar;
+ public bool ProcessingDeadChar => _processingDeadChar;
+
+ public void InterpretEvent(NSEvent keyPress)
+ {
+ if (_convertedDeadCharacters != null)
+ {
+ // reset state
+ _convertedDeadCharacters = null;
+ _processingDeadChar = false;
+ }
+
+ _lastEventWasDeadChar = _processingDeadChar;
+
+ _processingDeadChar = KeyEventIsDeadChar(keyPress);
+
+ if (!_processingDeadChar && !_lastEventWasDeadChar)
+ {
+ return;
+ }
+
+ _invisibleTextView ??= new InvisibleTextView(this, _textView);
+ // Send the cloned key press to the invisible NSTextView
+ _invisibleTextView.InterpretEvent(keyPress);
+ }
+
+ private bool KeyEventIsDeadChar(NSEvent e)
+ {
+ return string.IsNullOrEmpty(e.Characters);
+ }
+ }
+}
diff --git a/Src/VimMac/InvisibleTextView.cs b/Src/VimMac/InvisibleTextView.cs
index d5c3081..80d16d4 100644
--- a/Src/VimMac/InvisibleTextView.cs
+++ b/Src/VimMac/InvisibleTextView.cs
@@ -1,106 +1,72 @@
using AppKit;
using Foundation;
using Microsoft.VisualStudio.Text;
using Microsoft.VisualStudio.Text.Editor;
namespace Vim.UI.Cocoa
{
/// <summary>
/// An invisible NSTextView used so we can leverage macOS to handle
/// the conversion of keycodes and dead key presses into characters for
/// any keyboard layout.
/// </summary>
internal sealed class InvisibleTextView : NSTextView
{
- private bool _lastEventWasDeadChar;
- private bool _processingDeadChar;
- private string _convertedDeadCharacters;
+ private readonly DeadCharHandler _deadCharHandler;
private readonly ITextBuffer _textBuffer;
- public InvisibleTextView(ITextView textView)
+ public InvisibleTextView(DeadCharHandler deadCharHandler, ITextView textView)
{
+ _deadCharHandler = deadCharHandler;
_textBuffer = textView.TextBuffer;
textView.TextBuffer.Changing += TextBuffer_Changing;
textView.Closed += TextView_Closed;
}
- public string ConvertedDeadCharacters => _convertedDeadCharacters;
+ public void InterpretEvent(NSEvent keypress)
+ {
+ InterpretKeyEvents(new[] { CloneEvent(keypress) });
+ }
- public void InterpretEvent(NSEvent keyPress)
+ public override void InsertText(NSObject text, NSRange replacementRange)
{
- if (_convertedDeadCharacters != null)
+ if (_deadCharHandler.LastEventWasDeadChar && !_deadCharHandler.ProcessingDeadChar)
{
- // reset state
- _convertedDeadCharacters = null;
- _processingDeadChar = false;
+ // This is where we find out how the combination of keypresses
+ // has been interpreted.
+ _deadCharHandler.SetConvertedDeadCharacters((text as NSString)?.ToString());
}
+ }
- _lastEventWasDeadChar = _processingDeadChar;
-
- _processingDeadChar = KeyEventIsDeadChar(keyPress);
-
- if (!_processingDeadChar && !_lastEventWasDeadChar)
+ private void TextBuffer_Changing(object sender, TextContentChangingEventArgs e)
+ {
+ if (_deadCharHandler.LastEventWasDeadChar || _deadCharHandler.ProcessingDeadChar)
{
- return;
+ // We need the dead key press event to register in the editor so
+ // that we get the correct subsequent keypress events, but we
+ // don't want to modify the textbuffer contents.
+ e.Cancel();
}
-
- // Send the cloned key press to this NSTextView
- InterpretKeyEvents(new[] { CloneEvent(keyPress) });
}
- public override void InsertText(NSObject text, NSRange replacementRange)
+ private void TextView_Closed(object sender, System.EventArgs e)
{
- if (_lastEventWasDeadChar && !_processingDeadChar)
- {
- // This is where we find out how the combination of keypresses
- // has been interpreted.
- _convertedDeadCharacters = (text as NSString)?.ToString();
- }
+ _textBuffer.Changing -= TextBuffer_Changing;
}
private NSEvent CloneEvent(NSEvent keyPress)
{
return NSEvent.KeyEvent(
keyPress.Type,
keyPress.LocationInWindow,
keyPress.ModifierFlags,
keyPress.Timestamp,
keyPress.WindowNumber,
keyPress.Context,
keyPress.Characters,
keyPress.CharactersIgnoringModifiers,
keyPress.IsARepeat,
keyPress.KeyCode);
}
-
- private bool ShouldProcess(NSEvent keyPress)
- {
- return _lastEventWasDeadChar || KeyEventIsDeadChar(keyPress);
- }
-
- private bool KeyEventIsDeadChar(NSEvent e)
- {
- return string.IsNullOrEmpty(e.Characters);
- }
-
- private void TextBuffer_Changing(object sender, TextContentChangingEventArgs e)
- {
- if(_lastEventWasDeadChar || _processingDeadChar)
- {
- // We need the dead key press event to register in the editor so
- // that we get the correct subsequent keypress events, but we
- // don't want to modify the textbuffer contents.
- e.Cancel();
- }
- else
- {
- System.Console.WriteLine("wtd");
- }
- }
-
- private void TextView_Closed(object sender, System.EventArgs e)
- {
- _textBuffer.Changing -= TextBuffer_Changing;
- }
}
}
diff --git a/Src/VimMac/VimKeyProcessor.cs b/Src/VimMac/VimKeyProcessor.cs
index f381b60..c6bb1c5 100644
--- a/Src/VimMac/VimKeyProcessor.cs
+++ b/Src/VimMac/VimKeyProcessor.cs
@@ -1,159 +1,158 @@
using AppKit;
using Microsoft.VisualStudio.Language.Intellisense;
using Microsoft.VisualStudio.Text.Editor;
using MonoDevelop.Ide;
using Vim.UI.Cocoa.Implementation.InlineRename;
namespace Vim.UI.Cocoa
{
-
/// <summary>
/// The morale of the history surrounding this type is translating key input is
/// **hard**. Anytime it's done manually and expected to be 100% correct it
/// likely to have a bug. If you doubt this then I encourage you to read the
/// following 10 part blog series
///
/// http://blogs.msdn.com/b/michkap/archive/2006/04/13/575500.aspx
///
/// Or simply read the keyboard feed on the same blog page. It will humble you
/// </summary>
internal sealed class VimKeyProcessor : KeyProcessor
{
private readonly IVimBuffer _vimBuffer;
private readonly ITextView _textView;
private readonly IKeyUtil _keyUtil;
private readonly ICompletionBroker _completionBroker;
private readonly ISignatureHelpBroker _signatureHelpBroker;
private readonly InlineRenameListenerFactory _inlineRenameListenerFactory;
- private readonly InvisibleTextView _invisibleTextView;
+ private readonly DeadCharHandler _deadCharHandler;
public VimKeyProcessor(
IVimBuffer vimBuffer,
IKeyUtil keyUtil,
ICompletionBroker completionBroker,
ISignatureHelpBroker signatureHelpBroker,
InlineRenameListenerFactory inlineRenameListenerFactory)
{
_vimBuffer = vimBuffer;
_textView = vimBuffer.TextView;
_keyUtil = keyUtil;
_completionBroker = completionBroker;
_signatureHelpBroker = signatureHelpBroker;
_inlineRenameListenerFactory = inlineRenameListenerFactory;
- _invisibleTextView = new InvisibleTextView(_textView);
+ _deadCharHandler = new DeadCharHandler(_textView);
}
public override bool IsInterestedInHandledEvents => true;
/// <summary>
/// This handler is necessary to intercept keyboard input which maps to Vim
/// commands but doesn't map to text input. Any combination which can be
/// translated into actual text input will be done so much more accurately by
/// WPF and will end up in the TextInput event.
///
/// An example of why this handler is needed is for key combinations like
/// Shift+Escape. This combination won't translate to an actual character in most
/// (possibly all) keyboard layouts. This means it won't ever make it to the
/// TextInput event. But it can translate to a Vim command or mapped keyboard
/// combination that we do want to handle. Hence we override here specifically
/// to capture those circumstances
/// </summary>
public override void KeyDown(KeyEventArgs e)
{
VimTrace.TraceInfo("VimKeyProcessor::KeyDown {0} {1}", e.Characters, e.CharactersIgnoringModifiers);
bool handled = false;
- _invisibleTextView.InterpretEvent(e.Event);
+ _deadCharHandler.InterpretEvent(e.Event);
if (KeyEventIsDeadChar(e))
{
// Although there is nothing technically left to do, we still
// need to make sure that the event is processed by the
// underlying NSView so that InterpretKeyEvents is called
handled = false;
}
else
{
- if (_invisibleTextView.ConvertedDeadCharacters != null)
+ if (_deadCharHandler.ConvertedDeadCharacters != null)
{
- foreach (var c in _invisibleTextView.ConvertedDeadCharacters)
+ foreach (var c in _deadCharHandler.ConvertedDeadCharacters)
{
var key = KeyInputUtil.CharToKeyInput(c);
handled &= TryProcess(null, key);
}
}
else
{
// Attempt to map the key information into a KeyInput value which can be processed
// by Vim. If this works and the key is processed then the input is considered
// to be handled
bool canConvert = _keyUtil.TryConvertSpecialToKeyInput(e.Event, out KeyInput keyInput);
if (canConvert)
{
handled = TryProcess(e, keyInput);
}
}
}
VimTrace.TraceInfo("VimKeyProcessor::KeyDown Handled = {0}", handled);
var status = Mac.StatusBar.GetStatus(_vimBuffer);
var text = status.Text;
if (_vimBuffer.ModeKind == ModeKind.Command)
{
// Add a fake 'caret'
text = text.Insert(status.CaretPosition, "|");
}
IdeApp.Workbench.StatusBar.ShowMessage(text);
e.Handled = handled;
}
private bool KeyEventIsDeadChar(KeyEventArgs e)
{
return string.IsNullOrEmpty(e.Characters);
}
private bool IsEscapeKey(KeyEventArgs e)
{
return (NSKey)e.Event.KeyCode == NSKey.Escape;
}
private bool TryProcess(KeyEventArgs e, KeyInput keyInput)
{
if (e != null && KeyEventIsDeadChar(e))
// When a dead key combination is pressed we will get the key down events in
// sequence after the combination is complete. The dead keys will come first
// and be followed the final key which produces the char. That final key
// is marked as DeadCharProcessed.
//
// All of these should be ignored. They will produce a TextInput value which
// we can process in the TextInput event
return false;
if ((_vimBuffer.ModeKind.IsAnyInsert() || _vimBuffer.ModeKind.IsAnySelect()) &&
!_vimBuffer.CanProcessAsCommand(keyInput) &&
keyInput.Char > 0x1f &&
_vimBuffer.BufferedKeyInputs.IsEmpty &&
!_vimBuffer.Vim.MacroRecorder.IsRecording)
return false;
if (_completionBroker.IsCompletionActive(_textView) && !IsEscapeKey(e))
return false;
if (_signatureHelpBroker.IsSignatureHelpActive(_textView) && !IsEscapeKey(e))
return false;
if (_inlineRenameListenerFactory.InRename)
return false;
if (_vimBuffer.ModeKind.IsAnyInsert() && e?.Characters == "\t")
// Allow tab key to work for snippet completion
//
// TODO: We should only really do this when the characters
// to the left of the caret form a valid snippet
return false;
return _vimBuffer.CanProcess(keyInput) && _vimBuffer.Process(keyInput).IsAnyHandled;
}
}
}
|
VsVim/VsVim
|
89fd7cce1d6f6e5108ec45b5d80de9d8af19a0eb
|
Only process 'interesting' characters
|
diff --git a/Src/VimMac/InvisibleTextView.cs b/Src/VimMac/InvisibleTextView.cs
index 2a65f5f..d5c3081 100644
--- a/Src/VimMac/InvisibleTextView.cs
+++ b/Src/VimMac/InvisibleTextView.cs
@@ -1,65 +1,106 @@
using AppKit;
using Foundation;
using Microsoft.VisualStudio.Text;
using Microsoft.VisualStudio.Text.Editor;
namespace Vim.UI.Cocoa
{
/// <summary>
/// An invisible NSTextView used so we can leverage macOS to handle
/// the conversion of keycodes and dead key presses into characters for
/// any keyboard layout.
/// </summary>
internal sealed class InvisibleTextView : NSTextView
{
private bool _lastEventWasDeadChar;
private bool _processingDeadChar;
private string _convertedDeadCharacters;
- private ITextBuffer _textBuffer;
+ private readonly ITextBuffer _textBuffer;
public InvisibleTextView(ITextView textView)
{
_textBuffer = textView.TextBuffer;
textView.TextBuffer.Changing += TextBuffer_Changing;
textView.Closed += TextView_Closed;
}
public string ConvertedDeadCharacters => _convertedDeadCharacters;
public void InterpretEvent(NSEvent keyPress)
{
- _convertedDeadCharacters = null;
+ if (_convertedDeadCharacters != null)
+ {
+ // reset state
+ _convertedDeadCharacters = null;
+ _processingDeadChar = false;
+ }
+
_lastEventWasDeadChar = _processingDeadChar;
- _processingDeadChar = string.IsNullOrEmpty(keyPress.Characters);
- var keypressCloned = NSEvent.KeyEvent(keyPress.Type, keyPress.LocationInWindow, keyPress.ModifierFlags, keyPress.Timestamp, keyPress.WindowNumber, keyPress.Context, keyPress.Characters, keyPress.CharactersIgnoringModifiers, keyPress.IsARepeat, keyPress.KeyCode);
+ _processingDeadChar = KeyEventIsDeadChar(keyPress);
+
+ if (!_processingDeadChar && !_lastEventWasDeadChar)
+ {
+ return;
+ }
+
// Send the cloned key press to this NSTextView
- InterpretKeyEvents(new[] { keypressCloned });
+ InterpretKeyEvents(new[] { CloneEvent(keyPress) });
}
public override void InsertText(NSObject text, NSRange replacementRange)
{
if (_lastEventWasDeadChar && !_processingDeadChar)
{
// This is where we find out how the combination of keypresses
// has been interpreted.
- _convertedDeadCharacters = text.ToString();
+ _convertedDeadCharacters = (text as NSString)?.ToString();
}
}
+ private NSEvent CloneEvent(NSEvent keyPress)
+ {
+ return NSEvent.KeyEvent(
+ keyPress.Type,
+ keyPress.LocationInWindow,
+ keyPress.ModifierFlags,
+ keyPress.Timestamp,
+ keyPress.WindowNumber,
+ keyPress.Context,
+ keyPress.Characters,
+ keyPress.CharactersIgnoringModifiers,
+ keyPress.IsARepeat,
+ keyPress.KeyCode);
+ }
+
+ private bool ShouldProcess(NSEvent keyPress)
+ {
+ return _lastEventWasDeadChar || KeyEventIsDeadChar(keyPress);
+ }
+
+ private bool KeyEventIsDeadChar(NSEvent e)
+ {
+ return string.IsNullOrEmpty(e.Characters);
+ }
+
private void TextBuffer_Changing(object sender, TextContentChangingEventArgs e)
{
if(_lastEventWasDeadChar || _processingDeadChar)
{
- // We need the dead key press event to register so that we get the correct
- // subsequent keypress events, but we don't want to modify the textbuffer contents.
+ // We need the dead key press event to register in the editor so
+ // that we get the correct subsequent keypress events, but we
+ // don't want to modify the textbuffer contents.
e.Cancel();
}
+ else
+ {
+ System.Console.WriteLine("wtd");
+ }
}
private void TextView_Closed(object sender, System.EventArgs e)
{
_textBuffer.Changing -= TextBuffer_Changing;
}
}
}
|
VsVim/VsVim
|
58e4274a3bf050198bf796a12e6a2fb284ff6c9a
|
Use CharToKeyInput method
|
diff --git a/Src/VimMac/VimKeyProcessor.cs b/Src/VimMac/VimKeyProcessor.cs
index f161359..f381b60 100644
--- a/Src/VimMac/VimKeyProcessor.cs
+++ b/Src/VimMac/VimKeyProcessor.cs
@@ -1,159 +1,159 @@
using AppKit;
using Microsoft.VisualStudio.Language.Intellisense;
using Microsoft.VisualStudio.Text.Editor;
using MonoDevelop.Ide;
using Vim.UI.Cocoa.Implementation.InlineRename;
namespace Vim.UI.Cocoa
{
/// <summary>
/// The morale of the history surrounding this type is translating key input is
/// **hard**. Anytime it's done manually and expected to be 100% correct it
/// likely to have a bug. If you doubt this then I encourage you to read the
/// following 10 part blog series
///
/// http://blogs.msdn.com/b/michkap/archive/2006/04/13/575500.aspx
///
/// Or simply read the keyboard feed on the same blog page. It will humble you
/// </summary>
internal sealed class VimKeyProcessor : KeyProcessor
{
private readonly IVimBuffer _vimBuffer;
private readonly ITextView _textView;
private readonly IKeyUtil _keyUtil;
private readonly ICompletionBroker _completionBroker;
private readonly ISignatureHelpBroker _signatureHelpBroker;
private readonly InlineRenameListenerFactory _inlineRenameListenerFactory;
private readonly InvisibleTextView _invisibleTextView;
public VimKeyProcessor(
IVimBuffer vimBuffer,
IKeyUtil keyUtil,
ICompletionBroker completionBroker,
ISignatureHelpBroker signatureHelpBroker,
InlineRenameListenerFactory inlineRenameListenerFactory)
{
_vimBuffer = vimBuffer;
_textView = vimBuffer.TextView;
_keyUtil = keyUtil;
_completionBroker = completionBroker;
_signatureHelpBroker = signatureHelpBroker;
_inlineRenameListenerFactory = inlineRenameListenerFactory;
_invisibleTextView = new InvisibleTextView(_textView);
}
public override bool IsInterestedInHandledEvents => true;
/// <summary>
/// This handler is necessary to intercept keyboard input which maps to Vim
/// commands but doesn't map to text input. Any combination which can be
/// translated into actual text input will be done so much more accurately by
/// WPF and will end up in the TextInput event.
///
/// An example of why this handler is needed is for key combinations like
/// Shift+Escape. This combination won't translate to an actual character in most
/// (possibly all) keyboard layouts. This means it won't ever make it to the
/// TextInput event. But it can translate to a Vim command or mapped keyboard
/// combination that we do want to handle. Hence we override here specifically
/// to capture those circumstances
/// </summary>
public override void KeyDown(KeyEventArgs e)
{
VimTrace.TraceInfo("VimKeyProcessor::KeyDown {0} {1}", e.Characters, e.CharactersIgnoringModifiers);
bool handled = false;
_invisibleTextView.InterpretEvent(e.Event);
if (KeyEventIsDeadChar(e))
{
// Although there is nothing technically left to do, we still
// need to make sure that the event is processed by the
// underlying NSView so that InterpretKeyEvents is called
handled = false;
}
else
{
if (_invisibleTextView.ConvertedDeadCharacters != null)
{
foreach (var c in _invisibleTextView.ConvertedDeadCharacters)
{
- var key = KeyInputUtil.ApplyKeyModifiersToChar(c, VimKeyModifiers.None);
+ var key = KeyInputUtil.CharToKeyInput(c);
handled &= TryProcess(null, key);
}
}
else
{
// Attempt to map the key information into a KeyInput value which can be processed
// by Vim. If this works and the key is processed then the input is considered
// to be handled
bool canConvert = _keyUtil.TryConvertSpecialToKeyInput(e.Event, out KeyInput keyInput);
if (canConvert)
{
handled = TryProcess(e, keyInput);
}
}
}
VimTrace.TraceInfo("VimKeyProcessor::KeyDown Handled = {0}", handled);
var status = Mac.StatusBar.GetStatus(_vimBuffer);
var text = status.Text;
if (_vimBuffer.ModeKind == ModeKind.Command)
{
// Add a fake 'caret'
text = text.Insert(status.CaretPosition, "|");
}
IdeApp.Workbench.StatusBar.ShowMessage(text);
e.Handled = handled;
}
private bool KeyEventIsDeadChar(KeyEventArgs e)
{
return string.IsNullOrEmpty(e.Characters);
}
private bool IsEscapeKey(KeyEventArgs e)
{
return (NSKey)e.Event.KeyCode == NSKey.Escape;
}
private bool TryProcess(KeyEventArgs e, KeyInput keyInput)
{
if (e != null && KeyEventIsDeadChar(e))
// When a dead key combination is pressed we will get the key down events in
// sequence after the combination is complete. The dead keys will come first
// and be followed the final key which produces the char. That final key
// is marked as DeadCharProcessed.
//
// All of these should be ignored. They will produce a TextInput value which
// we can process in the TextInput event
return false;
if ((_vimBuffer.ModeKind.IsAnyInsert() || _vimBuffer.ModeKind.IsAnySelect()) &&
!_vimBuffer.CanProcessAsCommand(keyInput) &&
keyInput.Char > 0x1f &&
_vimBuffer.BufferedKeyInputs.IsEmpty &&
!_vimBuffer.Vim.MacroRecorder.IsRecording)
return false;
if (_completionBroker.IsCompletionActive(_textView) && !IsEscapeKey(e))
return false;
if (_signatureHelpBroker.IsSignatureHelpActive(_textView) && !IsEscapeKey(e))
return false;
if (_inlineRenameListenerFactory.InRename)
return false;
if (_vimBuffer.ModeKind.IsAnyInsert() && e?.Characters == "\t")
// Allow tab key to work for snippet completion
//
// TODO: We should only really do this when the characters
// to the left of the caret form a valid snippet
return false;
return _vimBuffer.CanProcess(keyInput) && _vimBuffer.Process(keyInput).IsAnyHandled;
}
}
}
|
VsVim/VsVim
|
a5eb3445fcf14e2a165a9328c3d5bdc48364a379
|
Reorder methods
|
diff --git a/Src/VimMac/InvisibleTextView.cs b/Src/VimMac/InvisibleTextView.cs
index 02e2f6a..2a65f5f 100644
--- a/Src/VimMac/InvisibleTextView.cs
+++ b/Src/VimMac/InvisibleTextView.cs
@@ -1,65 +1,65 @@
using AppKit;
using Foundation;
using Microsoft.VisualStudio.Text;
using Microsoft.VisualStudio.Text.Editor;
namespace Vim.UI.Cocoa
{
/// <summary>
/// An invisible NSTextView used so we can leverage macOS to handle
/// the conversion of keycodes and dead key presses into characters for
/// any keyboard layout.
/// </summary>
internal sealed class InvisibleTextView : NSTextView
{
private bool _lastEventWasDeadChar;
private bool _processingDeadChar;
private string _convertedDeadCharacters;
private ITextBuffer _textBuffer;
public InvisibleTextView(ITextView textView)
{
_textBuffer = textView.TextBuffer;
textView.TextBuffer.Changing += TextBuffer_Changing;
textView.Closed += TextView_Closed;
}
- private void TextBuffer_Changing(object sender, TextContentChangingEventArgs e)
- {
- if(_lastEventWasDeadChar || _processingDeadChar)
- {
- // We need the dead key press event to register so that we get the correct
- // subsequent keypress vents, but we don't want to modify the textbuffer contents.
- e.Cancel();
- }
- }
-
public string ConvertedDeadCharacters => _convertedDeadCharacters;
public void InterpretEvent(NSEvent keyPress)
{
_convertedDeadCharacters = null;
_lastEventWasDeadChar = _processingDeadChar;
_processingDeadChar = string.IsNullOrEmpty(keyPress.Characters);
var keypressCloned = NSEvent.KeyEvent(keyPress.Type, keyPress.LocationInWindow, keyPress.ModifierFlags, keyPress.Timestamp, keyPress.WindowNumber, keyPress.Context, keyPress.Characters, keyPress.CharactersIgnoringModifiers, keyPress.IsARepeat, keyPress.KeyCode);
// Send the cloned key press to this NSTextView
InterpretKeyEvents(new[] { keypressCloned });
}
public override void InsertText(NSObject text, NSRange replacementRange)
{
if (_lastEventWasDeadChar && !_processingDeadChar)
{
// This is where we find out how the combination of keypresses
// has been interpreted.
_convertedDeadCharacters = text.ToString();
}
}
+ private void TextBuffer_Changing(object sender, TextContentChangingEventArgs e)
+ {
+ if(_lastEventWasDeadChar || _processingDeadChar)
+ {
+ // We need the dead key press event to register so that we get the correct
+ // subsequent keypress events, but we don't want to modify the textbuffer contents.
+ e.Cancel();
+ }
+ }
+
private void TextView_Closed(object sender, System.EventArgs e)
{
_textBuffer.Changing -= TextBuffer_Changing;
}
}
}
|
VsVim/VsVim
|
fdb2ea309f466b5a391810f5505d483f23289b90
|
Check if the last keypress was a deadchar when deciding to cancel buffer change
|
diff --git a/Src/VimMac/InvisibleTextView.cs b/Src/VimMac/InvisibleTextView.cs
index 19533e5..02e2f6a 100644
--- a/Src/VimMac/InvisibleTextView.cs
+++ b/Src/VimMac/InvisibleTextView.cs
@@ -1,65 +1,65 @@
using AppKit;
using Foundation;
using Microsoft.VisualStudio.Text;
using Microsoft.VisualStudio.Text.Editor;
namespace Vim.UI.Cocoa
{
/// <summary>
/// An invisible NSTextView used so we can leverage macOS to handle
/// the conversion of keycodes and dead key presses into characters for
/// any keyboard layout.
/// </summary>
internal sealed class InvisibleTextView : NSTextView
{
private bool _lastEventWasDeadChar;
private bool _processingDeadChar;
private string _convertedDeadCharacters;
private ITextBuffer _textBuffer;
public InvisibleTextView(ITextView textView)
{
_textBuffer = textView.TextBuffer;
textView.TextBuffer.Changing += TextBuffer_Changing;
textView.Closed += TextView_Closed;
}
private void TextBuffer_Changing(object sender, TextContentChangingEventArgs e)
{
- if(_processingDeadChar)
+ if(_lastEventWasDeadChar || _processingDeadChar)
{
// We need the dead key press event to register so that we get the correct
// subsequent keypress vents, but we don't want to modify the textbuffer contents.
e.Cancel();
}
}
public string ConvertedDeadCharacters => _convertedDeadCharacters;
public void InterpretEvent(NSEvent keyPress)
{
_convertedDeadCharacters = null;
_lastEventWasDeadChar = _processingDeadChar;
_processingDeadChar = string.IsNullOrEmpty(keyPress.Characters);
var keypressCloned = NSEvent.KeyEvent(keyPress.Type, keyPress.LocationInWindow, keyPress.ModifierFlags, keyPress.Timestamp, keyPress.WindowNumber, keyPress.Context, keyPress.Characters, keyPress.CharactersIgnoringModifiers, keyPress.IsARepeat, keyPress.KeyCode);
// Send the cloned key press to this NSTextView
InterpretKeyEvents(new[] { keypressCloned });
}
public override void InsertText(NSObject text, NSRange replacementRange)
{
if (_lastEventWasDeadChar && !_processingDeadChar)
{
// This is where we find out how the combination of keypresses
// has been interpreted.
_convertedDeadCharacters = text.ToString();
}
}
private void TextView_Closed(object sender, System.EventArgs e)
{
_textBuffer.Changing -= TextBuffer_Changing;
}
}
}
|
VsVim/VsVim
|
e933b21c70bf96c64f6460894b11de4bbcc39c42
|
Add dead key handling code
|
diff --git a/Src/VimMac/InvisibleTextView.cs b/Src/VimMac/InvisibleTextView.cs
new file mode 100644
index 0000000..19533e5
--- /dev/null
+++ b/Src/VimMac/InvisibleTextView.cs
@@ -0,0 +1,65 @@
+using AppKit;
+using Foundation;
+using Microsoft.VisualStudio.Text;
+using Microsoft.VisualStudio.Text.Editor;
+
+namespace Vim.UI.Cocoa
+{
+ /// <summary>
+ /// An invisible NSTextView used so we can leverage macOS to handle
+ /// the conversion of keycodes and dead key presses into characters for
+ /// any keyboard layout.
+ /// </summary>
+ internal sealed class InvisibleTextView : NSTextView
+ {
+ private bool _lastEventWasDeadChar;
+ private bool _processingDeadChar;
+ private string _convertedDeadCharacters;
+ private ITextBuffer _textBuffer;
+
+ public InvisibleTextView(ITextView textView)
+ {
+ _textBuffer = textView.TextBuffer;
+ textView.TextBuffer.Changing += TextBuffer_Changing;
+ textView.Closed += TextView_Closed;
+ }
+
+ private void TextBuffer_Changing(object sender, TextContentChangingEventArgs e)
+ {
+ if(_processingDeadChar)
+ {
+ // We need the dead key press event to register so that we get the correct
+ // subsequent keypress vents, but we don't want to modify the textbuffer contents.
+ e.Cancel();
+ }
+ }
+
+ public string ConvertedDeadCharacters => _convertedDeadCharacters;
+
+ public void InterpretEvent(NSEvent keyPress)
+ {
+ _convertedDeadCharacters = null;
+ _lastEventWasDeadChar = _processingDeadChar;
+ _processingDeadChar = string.IsNullOrEmpty(keyPress.Characters);
+
+ var keypressCloned = NSEvent.KeyEvent(keyPress.Type, keyPress.LocationInWindow, keyPress.ModifierFlags, keyPress.Timestamp, keyPress.WindowNumber, keyPress.Context, keyPress.Characters, keyPress.CharactersIgnoringModifiers, keyPress.IsARepeat, keyPress.KeyCode);
+ // Send the cloned key press to this NSTextView
+ InterpretKeyEvents(new[] { keypressCloned });
+ }
+
+ public override void InsertText(NSObject text, NSRange replacementRange)
+ {
+ if (_lastEventWasDeadChar && !_processingDeadChar)
+ {
+ // This is where we find out how the combination of keypresses
+ // has been interpreted.
+ _convertedDeadCharacters = text.ToString();
+ }
+ }
+
+ private void TextView_Closed(object sender, System.EventArgs e)
+ {
+ _textBuffer.Changing -= TextBuffer_Changing;
+ }
+ }
+}
diff --git a/Src/VimMac/VimKeyProcessor.cs b/Src/VimMac/VimKeyProcessor.cs
index 1c5e72d..f161359 100644
--- a/Src/VimMac/VimKeyProcessor.cs
+++ b/Src/VimMac/VimKeyProcessor.cs
@@ -1,135 +1,159 @@
using AppKit;
using Microsoft.VisualStudio.Language.Intellisense;
using Microsoft.VisualStudio.Text.Editor;
using MonoDevelop.Ide;
using Vim.UI.Cocoa.Implementation.InlineRename;
namespace Vim.UI.Cocoa
{
+
/// <summary>
/// The morale of the history surrounding this type is translating key input is
/// **hard**. Anytime it's done manually and expected to be 100% correct it
/// likely to have a bug. If you doubt this then I encourage you to read the
/// following 10 part blog series
///
/// http://blogs.msdn.com/b/michkap/archive/2006/04/13/575500.aspx
///
/// Or simply read the keyboard feed on the same blog page. It will humble you
/// </summary>
internal sealed class VimKeyProcessor : KeyProcessor
{
private readonly IVimBuffer _vimBuffer;
private readonly ITextView _textView;
private readonly IKeyUtil _keyUtil;
private readonly ICompletionBroker _completionBroker;
private readonly ISignatureHelpBroker _signatureHelpBroker;
private readonly InlineRenameListenerFactory _inlineRenameListenerFactory;
+ private readonly InvisibleTextView _invisibleTextView;
public VimKeyProcessor(
IVimBuffer vimBuffer,
IKeyUtil keyUtil,
ICompletionBroker completionBroker,
ISignatureHelpBroker signatureHelpBroker,
InlineRenameListenerFactory inlineRenameListenerFactory)
{
_vimBuffer = vimBuffer;
_textView = vimBuffer.TextView;
_keyUtil = keyUtil;
_completionBroker = completionBroker;
_signatureHelpBroker = signatureHelpBroker;
_inlineRenameListenerFactory = inlineRenameListenerFactory;
+ _invisibleTextView = new InvisibleTextView(_textView);
}
public override bool IsInterestedInHandledEvents => true;
/// <summary>
/// This handler is necessary to intercept keyboard input which maps to Vim
/// commands but doesn't map to text input. Any combination which can be
/// translated into actual text input will be done so much more accurately by
/// WPF and will end up in the TextInput event.
///
/// An example of why this handler is needed is for key combinations like
/// Shift+Escape. This combination won't translate to an actual character in most
/// (possibly all) keyboard layouts. This means it won't ever make it to the
/// TextInput event. But it can translate to a Vim command or mapped keyboard
/// combination that we do want to handle. Hence we override here specifically
/// to capture those circumstances
/// </summary>
public override void KeyDown(KeyEventArgs e)
{
VimTrace.TraceInfo("VimKeyProcessor::KeyDown {0} {1}", e.Characters, e.CharactersIgnoringModifiers);
bool handled = false;
- // Attempt to map the key information into a KeyInput value which can be processed
- // by Vim. If this works and the key is processed then the input is considered
- // to be handled
- bool canConvert = _keyUtil.TryConvertSpecialToKeyInput(e.Event, out KeyInput keyInput);
- if (canConvert)
+ _invisibleTextView.InterpretEvent(e.Event);
+ if (KeyEventIsDeadChar(e))
{
- handled = TryProcess(e, keyInput);
+ // Although there is nothing technically left to do, we still
+ // need to make sure that the event is processed by the
+ // underlying NSView so that InterpretKeyEvents is called
+ handled = false;
+ }
+ else
+ {
+ if (_invisibleTextView.ConvertedDeadCharacters != null)
+ {
+ foreach (var c in _invisibleTextView.ConvertedDeadCharacters)
+ {
+ var key = KeyInputUtil.ApplyKeyModifiersToChar(c, VimKeyModifiers.None);
+ handled &= TryProcess(null, key);
+ }
+ }
+ else
+ {
+ // Attempt to map the key information into a KeyInput value which can be processed
+ // by Vim. If this works and the key is processed then the input is considered
+ // to be handled
+ bool canConvert = _keyUtil.TryConvertSpecialToKeyInput(e.Event, out KeyInput keyInput);
+ if (canConvert)
+ {
+ handled = TryProcess(e, keyInput);
+ }
+ }
}
-
VimTrace.TraceInfo("VimKeyProcessor::KeyDown Handled = {0}", handled);
var status = Mac.StatusBar.GetStatus(_vimBuffer);
var text = status.Text;
if (_vimBuffer.ModeKind == ModeKind.Command)
{
// Add a fake 'caret'
text = text.Insert(status.CaretPosition, "|");
}
IdeApp.Workbench.StatusBar.ShowMessage(text);
e.Handled = handled;
}
private bool KeyEventIsDeadChar(KeyEventArgs e)
{
return string.IsNullOrEmpty(e.Characters);
}
private bool IsEscapeKey(KeyEventArgs e)
{
return (NSKey)e.Event.KeyCode == NSKey.Escape;
}
private bool TryProcess(KeyEventArgs e, KeyInput keyInput)
{
- if (KeyEventIsDeadChar(e))
+ if (e != null && KeyEventIsDeadChar(e))
// When a dead key combination is pressed we will get the key down events in
// sequence after the combination is complete. The dead keys will come first
// and be followed the final key which produces the char. That final key
// is marked as DeadCharProcessed.
//
// All of these should be ignored. They will produce a TextInput value which
// we can process in the TextInput event
return false;
if ((_vimBuffer.ModeKind.IsAnyInsert() || _vimBuffer.ModeKind.IsAnySelect()) &&
!_vimBuffer.CanProcessAsCommand(keyInput) &&
keyInput.Char > 0x1f &&
_vimBuffer.BufferedKeyInputs.IsEmpty &&
!_vimBuffer.Vim.MacroRecorder.IsRecording)
return false;
if (_completionBroker.IsCompletionActive(_textView) && !IsEscapeKey(e))
return false;
if (_signatureHelpBroker.IsSignatureHelpActive(_textView) && !IsEscapeKey(e))
return false;
if (_inlineRenameListenerFactory.InRename)
return false;
- if (_vimBuffer.ModeKind.IsAnyInsert() && e.Characters == "\t")
+ if (_vimBuffer.ModeKind.IsAnyInsert() && e?.Characters == "\t")
// Allow tab key to work for snippet completion
//
// TODO: We should only really do this when the characters
// to the left of the caret form a valid snippet
return false;
return _vimBuffer.CanProcess(keyInput) && _vimBuffer.Process(keyInput).IsAnyHandled;
}
}
}
|
VsVim/VsVim
|
9a18a2740c60c1cbad028cd7f76a709ad11f03c2
|
Handle alternative keyboard layouts a little better.
|
diff --git a/Src/VimMac/AlternateKeyUtil.cs b/Src/VimMac/AlternateKeyUtil.cs
index c26cef8..053694f 100644
--- a/Src/VimMac/AlternateKeyUtil.cs
+++ b/Src/VimMac/AlternateKeyUtil.cs
@@ -1,251 +1,259 @@
using System.Collections.Generic;
using System.ComponentModel.Composition;
using AppKit;
namespace Vim.UI.Cocoa.Implementation.Misc
{
[Export(typeof(IKeyUtil))]
internal sealed class AlternateKeyUtil : IKeyUtil
{
private static readonly Dictionary<NSKey, KeyInput> s_CocoaKeyToKeyInputMap;
private static readonly Dictionary<NSKey, KeyInput> s_CocoaControlKeyToKeyInputMap;
private static readonly Dictionary<VimKey, NSKey> s_vimKeyToCocoaKeyMap;
private static readonly Dictionary<KeyInput, NSKey> s_keyInputToCocoaKeyMap;
private readonly byte[] _keyboardState = new byte[256];
static AlternateKeyUtil()
{
s_vimKeyToCocoaKeyMap = BuildVimKeyToCocoaKeyMap();
s_keyInputToCocoaKeyMap = BuildKeyInputToCocoaKeyMap(s_vimKeyToCocoaKeyMap);
s_CocoaKeyToKeyInputMap = new Dictionary<NSKey, KeyInput>();
foreach (var pair in s_keyInputToCocoaKeyMap)
{
s_CocoaKeyToKeyInputMap[pair.Value] = pair.Key;
}
s_CocoaControlKeyToKeyInputMap = BuildCocoaControlKeyToKeyInputMap();
}
private static Dictionary<NSKey, KeyInput> BuildCocoaControlKeyToKeyInputMap()
{
var map = new Dictionary<NSKey, KeyInput>
{
[NSKey.D2] = KeyInputUtil.VimKeyToKeyInput(VimKey.Null), // <C-@>
[NSKey.D6] = KeyInputUtil.CharToKeyInput((char)0x1E), // <C-^>
[NSKey.Minus] = KeyInputUtil.CharToKeyInput((char)0x1F), // <C-_>
//[NSKey.Question] = KeyInputUtil.CharToKeyInput((char)0x7F), // <C-?>
};
return map;
}
internal static Dictionary<VimKey, NSKey> BuildVimKeyToCocoaKeyMap()
{
var map = new Dictionary<VimKey, NSKey>
{
[VimKey.Enter] = NSKey.Return,
[VimKey.Escape] = NSKey.Escape,
[VimKey.Back] = NSKey.Delete,
//[VimKey.Delete] = NSKey.Delete,
[VimKey.Left] = NSKey.LeftArrow,
[VimKey.Up] = NSKey.UpArrow,
[VimKey.Right] = NSKey.RightArrow,
[VimKey.Down] = NSKey.DownArrow,
[VimKey.Help] = NSKey.Help,
//[VimKey.Insert] = NSKey.Insert,
[VimKey.Home] = NSKey.Home,
[VimKey.End] = NSKey.End,
[VimKey.PageUp] = NSKey.PageUp,
[VimKey.PageDown] = NSKey.PageDown,
[VimKey.Tab] = NSKey.Tab,
[VimKey.F1] = NSKey.F1,
[VimKey.F2] = NSKey.F2,
[VimKey.F3] = NSKey.F3,
[VimKey.F4] = NSKey.F4,
[VimKey.F5] = NSKey.F5,
[VimKey.F6] = NSKey.F6,
[VimKey.F7] = NSKey.F7,
[VimKey.F8] = NSKey.F8,
[VimKey.F9] = NSKey.F9,
[VimKey.F10] = NSKey.F10,
[VimKey.F11] = NSKey.F11,
[VimKey.F12] = NSKey.F12,
[VimKey.KeypadMultiply] = NSKey.KeypadMultiply,
[VimKey.KeypadPlus] = NSKey.KeypadPlus,
[VimKey.KeypadMinus] = NSKey.KeypadMinus,
[VimKey.KeypadDecimal] = NSKey.KeypadDecimal,
[VimKey.KeypadDivide] = NSKey.KeypadDivide,
[VimKey.KeypadEnter] = NSKey.KeypadEnter,
[VimKey.Keypad0] = NSKey.Keypad0,
[VimKey.Keypad1] = NSKey.Keypad1,
[VimKey.Keypad2] = NSKey.Keypad2,
[VimKey.Keypad3] = NSKey.Keypad3,
[VimKey.Keypad4] = NSKey.Keypad4,
[VimKey.Keypad5] = NSKey.Keypad5,
[VimKey.Keypad6] = NSKey.Keypad6,
[VimKey.Keypad7] = NSKey.Keypad7,
[VimKey.Keypad8] = NSKey.Keypad8,
[VimKey.Keypad9] = NSKey.Keypad9
};
return map;
}
internal static Dictionary<KeyInput, NSKey> BuildKeyInputToCocoaKeyMap(Dictionary<VimKey, NSKey> vimKeyToCocoaKeyMap)
{
var map = new Dictionary<KeyInput, NSKey>();
foreach (var pair in vimKeyToCocoaKeyMap)
{
var keyInput = KeyInputUtil.VimKeyToKeyInput(pair.Key);
map[keyInput] = pair.Value;
}
map[KeyInputUtil.CharToKeyInput(' ')] = NSKey.Space;
map[KeyInputUtil.CharToKeyInput('\t')] = NSKey.Tab;
return map;
}
internal static bool TrySpecialVimKeyToKey(VimKey vimKey, out NSKey key)
{
return s_vimKeyToCocoaKeyMap.TryGetValue(vimKey, out key);
}
internal static VimKeyModifiers ConvertToKeyModifiers(NSEventModifierMask keys)
{
var res = VimKeyModifiers.None;
if (keys.HasFlag(NSEventModifierMask.ShiftKeyMask))
{
res |= VimKeyModifiers.Shift;
}
if (keys.HasFlag(NSEventModifierMask.AlternateKeyMask))
{
res |= VimKeyModifiers.Alt;
}
if (keys.HasFlag(NSEventModifierMask.ControlKeyMask))
{
res |= VimKeyModifiers.Control;
}
if (keys.HasFlag(NSEventModifierMask.CommandKeyMask))
{
res |= VimKeyModifiers.Command;
}
return res;
}
internal static NSEventModifierMask ConvertToModifierKeys(VimKeyModifiers keys)
{
NSEventModifierMask res = 0;
if (keys.HasFlag(VimKeyModifiers.Shift))
{
res |= NSEventModifierMask.ShiftKeyMask;
}
if (keys.HasFlag(VimKeyModifiers.Alt))
{
res |= NSEventModifierMask.AlternateKeyMask;
}
if (keys.HasFlag(VimKeyModifiers.Control))
{
res |= NSEventModifierMask.ControlKeyMask;
}
if (keys.HasFlag(VimKeyModifiers.Command))
{
res |= NSEventModifierMask.CommandKeyMask;
}
return res;
}
internal static bool IsAltGr(NSEventModifierMask modifierKeys)
{
var altGr = NSEventModifierMask.ControlKeyMask | NSEventModifierMask.AlternateKeyMask;
return (modifierKeys & altGr) == altGr;
}
#region IKeyUtil
bool IKeyUtil.IsAltGr(NSEventModifierMask modifierKeys)
{
return IsAltGr(modifierKeys);
}
VimKeyModifiers IKeyUtil.GetKeyModifiers(NSEventModifierMask modifierKeys)
{
return ConvertToKeyModifiers(modifierKeys);
}
bool IKeyUtil.TryConvertSpecialToKeyInput(NSEvent theEvent, out KeyInput keyInput)
{
var key = (NSKey)theEvent.KeyCode;
NSEventModifierMask modifierKeys = theEvent.ModifierFlags;
if (s_CocoaKeyToKeyInputMap.TryGetValue(key, out keyInput))
{
var keyModifiers = ConvertToKeyModifiers(modifierKeys);
keyInput = KeyInputUtil.ApplyKeyModifiers(keyInput, keyModifiers);
return true;
}
// Vim allows certain "lazy" control keys, such as <C-6> for <C-^>.
if ((modifierKeys == NSEventModifierMask.ControlKeyMask ||
modifierKeys == (NSEventModifierMask.ControlKeyMask | NSEventModifierMask.ShiftKeyMask)) &&
s_CocoaControlKeyToKeyInputMap.TryGetValue(key, out keyInput))
{
return true;
}
// If the key doesn't correspond to an ASCII control key (like <C-^>), we need to convert it here.
// This is needed because key combinations like <C-;> won't be passed to
// TextInput, because they can't be represented as system or control text.
// We just have to be careful not to shadow any keys that produce text when
// combined with the AltGr key.
switch (key)
{
case NSKey.Option:
case NSKey.RightOption:
case NSKey.Control:
case NSKey.RightControl:
case NSKey.Shift:
case NSKey.RightShift:
case NSKey.Command:
// Avoid work for common cases.
break;
default:
VimTrace.TraceInfo("AlternateKeyUtil::TryConvertSpecialKeyToKeyInput {0} {1}",
key, modifierKeys);
if (GetKeyInputFromKey(theEvent, modifierKeys, out keyInput))
{
// Only produce a key input here if the key input we
// found is *not* an ASCII control character.
// Control characters will be handled by TextInput
// as control text.
// Commented out because we are not using TextInput
//if (!System.Char.IsControl(keyInput.Char))
{
return true;
}
}
break;
}
keyInput = null;
return false;
}
private bool GetKeyInputFromKey(NSEvent theEvent, NSEventModifierMask modifierKeys, out KeyInput keyInput)
{
- if(!string.IsNullOrEmpty(theEvent.CharactersIgnoringModifiers))
+ if(!string.IsNullOrEmpty(theEvent.Characters))
{
- var keyModifiers = ConvertToKeyModifiers(modifierKeys);
- keyInput = KeyInputUtil.ApplyKeyModifiersToChar(theEvent.CharactersIgnoringModifiers[0], keyModifiers);
+ VimKeyModifiers keyModifiers = VimKeyModifiers.None;
+ // With some keyboard layouts, Option + 4 produces the '$' symbol
+ // We don't want to convert this to Alt+$ as the modifier has already been applied here.
+ // In this case, CharactersIgnoringModifiers = "4" and Characters = "$"
+ if (theEvent.CharactersIgnoringModifiers == theEvent.Characters)
+ {
+ keyModifiers = ConvertToKeyModifiers(modifierKeys);
+ }
+
+ keyInput = KeyInputUtil.ApplyKeyModifiersToChar(theEvent.Characters[0], keyModifiers);
return true;
}
keyInput = null;
return false;
}
#endregion
}
}
diff --git a/Src/VimMac/Properties/AddinInfo.cs b/Src/VimMac/Properties/AddinInfo.cs
index 85931f1..87b8db3 100644
--- a/Src/VimMac/Properties/AddinInfo.cs
+++ b/Src/VimMac/Properties/AddinInfo.cs
@@ -1,15 +1,15 @@
using System;
using Mono.Addins;
using Mono.Addins.Description;
[assembly: Addin(
"VsVim",
Namespace = "Vim.Mac",
- Version = "2.8.0.18"
+ Version = "2.8.0.19"
)]
[assembly: AddinName("VsVim")]
[assembly: AddinCategory("IDE extensions")]
[assembly: AddinUrl("https://github.com/VsVim/VsVim")]
[assembly: AddinDescription("VIM emulation layer for Visual Studio")]
[assembly: AddinAuthor("Jared Parsons")]
|
VsVim/VsVim
|
ec9fa269c918ea0f46a3a3ce52c22d3b30fd2392
|
Fixup MEF
|
diff --git a/Src/VimApp/VimApp.csproj b/Src/VimApp/VimApp.csproj
index 628374a..054ccbe 100644
--- a/Src/VimApp/VimApp.csproj
+++ b/Src/VimApp/VimApp.csproj
@@ -1,46 +1,46 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>VimApp</RootNamespace>
<AssemblyName>VimApp</AssemblyName>
<TargetFramework>net472</TargetFramework>
<DefineConstants>$(DefineConstants);VS_SPECIFIC_VIM_APP</DefineConstants>
<VsVimVisualStudioTargetVersion>17.0</VsVimVisualStudioTargetVersion>
<VsVimProjectType>EditorHost</VsVimProjectType>
- <!--
+ <!--
Disabling the VS threading analyzers here. This is a run of the mill WPF project and
doesn't benefit from these analyzers.
- -->
+ -->
<NoWarn>$(NoWarn);VSTHRD110;VSTHRD001</NoWarn>
</PropertyGroup>
<ItemGroup>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Core" />
<Reference Include="System.Xaml" />
<Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup>
<ApplicationDefinition Include="App.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</ApplicationDefinition>
<Page Include="MainWindow.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\VimCore\VimCore.fsproj" />
<ProjectReference Include="..\VimTestUtils\VimTestUtils.csproj" />
<Reference Include="Microsoft.VisualStudio.Setup.Configuration.Interop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
</ItemGroup>
<Import Project="..\VimWpf\VimWpf.projitems" Label="Shared" />
<Import Project="..\VimEditorHost\VimEditorHost.projitems" Label="Shared" />
</Project>
diff --git a/Src/VimApp/VimAppJoinableTaskFactoryProvider.cs b/Src/VimApp/VimAppJoinableTaskFactoryProvider.cs
deleted file mode 100644
index 35a9acf..0000000
--- a/Src/VimApp/VimAppJoinableTaskFactoryProvider.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using Microsoft.VisualStudio.Shell;
-using Microsoft.VisualStudio.Threading;
-using System.ComponentModel.Composition;
-using System.Threading;
-using Vim.UI.Wpf;
-
-namespace VimApp
-{
- [Export(typeof(IJoinableTaskFactoryProvider))]
- internal sealed class VimAppJoinableTaskFactoryProvider : IJoinableTaskFactoryProvider
- {
- private static readonly object s_lock = new object();
- private static JoinableTaskContext s_joinableTaskContext;
-
- private readonly JoinableTaskFactory _joinableTaskFactory;
-
- [ImportingConstructor]
- internal VimAppJoinableTaskFactoryProvider()
- {
- // See:
- // https://github.com/microsoft/vs-threading/blob/master/doc/library_with_jtf.md
- // https://github.com/microsoft/vs-threading/blob/master/doc/testing_vs.md
- lock (s_lock)
- {
- if (s_joinableTaskContext == null)
- {
- s_joinableTaskContext = new JoinableTaskContext(Thread.CurrentThread, SynchronizationContext.Current);
- }
- }
- _joinableTaskFactory = s_joinableTaskContext.Factory;
- }
-
- public JoinableTaskFactory JoinableTaskFactory => _joinableTaskFactory;
-
- JoinableTaskFactory IJoinableTaskFactoryProvider.JoinableTaskFactory => JoinableTaskFactory;
- }
-}
diff --git a/Src/VimWpf/IJoinableTaskFactoryProvider.cs b/Src/VimWpf/IJoinableTaskFactoryProvider.cs
deleted file mode 100644
index 6e79e3f..0000000
--- a/Src/VimWpf/IJoinableTaskFactoryProvider.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Microsoft.VisualStudio.Threading;
-
-namespace Vim.UI.Wpf
-{
- public interface IJoinableTaskFactoryProvider
- {
- JoinableTaskFactory JoinableTaskFactory { get; }
- }
-}
diff --git a/Src/VimWpf/Implementation/Misc/DisplayWindowBroker.cs b/Src/VimWpf/Implementation/Misc/DisplayWindowBroker.cs
index 6e3bde4..c194675 100644
--- a/Src/VimWpf/Implementation/Misc/DisplayWindowBroker.cs
+++ b/Src/VimWpf/Implementation/Misc/DisplayWindowBroker.cs
@@ -1,116 +1,116 @@
using System.ComponentModel.Composition;
using Microsoft.VisualStudio.Language.Intellisense;
using Microsoft.VisualStudio.Text.Editor;
using Microsoft.VisualStudio.Threading;
namespace Vim.UI.Wpf.Implementation.Misc
{
/// <summary>
/// Standard implementation of the IDisplayWindowBroker interface. This acts as a single
/// interface for the various completion window possibilities
/// </summary>
internal sealed class DisplayWindowBroker : IDisplayWindowBroker
{
private readonly ITextView _textView;
private readonly ICompletionBroker _completionBroker;
private readonly ISignatureHelpBroker _signatureHelpBroker;
private readonly IAsyncQuickInfoBroker _quickInfoBroker;
private readonly JoinableTaskFactory _joinableTaskFactory;
internal DisplayWindowBroker(
ITextView textView,
ICompletionBroker completionBroker,
ISignatureHelpBroker signatureHelpBroker,
IAsyncQuickInfoBroker quickInfoBroker,
- IJoinableTaskFactoryProvider joinableTaskFactoryProvider)
+ JoinableTaskFactory joinableTaskFactory)
{
_textView = textView;
_completionBroker = completionBroker;
_signatureHelpBroker = signatureHelpBroker;
_quickInfoBroker = quickInfoBroker;
- _joinableTaskFactory = joinableTaskFactoryProvider.JoinableTaskFactory;
+ _joinableTaskFactory = joinableTaskFactory;
}
#region IDisplayWindowBroker
bool IDisplayWindowBroker.IsCompletionActive
{
get { return _completionBroker.IsCompletionActive(_textView); }
}
bool IDisplayWindowBroker.IsQuickInfoActive
{
get { return _quickInfoBroker.IsQuickInfoActive(_textView); }
}
bool IDisplayWindowBroker.IsSignatureHelpActive
{
get { return _signatureHelpBroker.IsSignatureHelpActive(_textView); }
}
ITextView IDisplayWindowBroker.TextView
{
get { return _textView; }
}
void IDisplayWindowBroker.DismissDisplayWindows()
{
if (_completionBroker.IsCompletionActive(_textView))
{
_completionBroker.DismissAllSessions(_textView);
}
if (_signatureHelpBroker.IsSignatureHelpActive(_textView))
{
_signatureHelpBroker.DismissAllSessions(_textView);
}
if (_quickInfoBroker.IsQuickInfoActive(_textView))
{
var session = _quickInfoBroker.GetSession(_textView);
if (session is object)
{
_joinableTaskFactory.Run(() => session.DismissAsync());
}
}
}
#endregion
}
[Export(typeof(IDisplayWindowBrokerFactoryService))]
internal sealed class DisplayWindowBrokerFactoryService : IDisplayWindowBrokerFactoryService
{
private static readonly object s_key = new object();
private readonly ICompletionBroker _completionBroker;
private readonly ISignatureHelpBroker _signatureHelpBroker;
private readonly IAsyncQuickInfoBroker _quickInfoBroker;
- private readonly IJoinableTaskFactoryProvider _joinableTaskFactoryProvider;
+ private readonly JoinableTaskContext _joinableTaskContext;
[ImportingConstructor]
internal DisplayWindowBrokerFactoryService(
ICompletionBroker completionBroker,
ISignatureHelpBroker signatureHelpBroker,
IAsyncQuickInfoBroker quickInfoBroker,
- IJoinableTaskFactoryProvider joinableTaskFactoryProvider)
+ JoinableTaskContext joinableTaskContext)
{
_completionBroker = completionBroker;
_signatureHelpBroker = signatureHelpBroker;
_quickInfoBroker = quickInfoBroker;
- _joinableTaskFactoryProvider = joinableTaskFactoryProvider;
+ _joinableTaskContext = joinableTaskContext;
}
IDisplayWindowBroker IDisplayWindowBrokerFactoryService.GetDisplayWindowBroker(ITextView textView)
{
return textView.Properties.GetOrCreateSingletonProperty(
s_key,
() => new DisplayWindowBroker(
textView,
_completionBroker,
_signatureHelpBroker,
_quickInfoBroker,
- _joinableTaskFactoryProvider));
+ _joinableTaskContext.Factory));
}
}
}
diff --git a/Src/VimWpf/VimWpf.projitems b/Src/VimWpf/VimWpf.projitems
index b7e017c..e0e77fc 100644
--- a/Src/VimWpf/VimWpf.projitems
+++ b/Src/VimWpf/VimWpf.projitems
@@ -1,105 +1,104 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<MSBuildAllProjects Condition="'$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' < '16.0'">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
<HasSharedItems>true</HasSharedItems>
<SharedGUID>648972d9-1a17-46d8-80c6-6810c5b8b4ae</SharedGUID>
</PropertyGroup>
<PropertyGroup Label="Configuration">
<Import_RootNamespace>VimWpf</Import_RootNamespace>
</PropertyGroup>
<ItemGroup>
<Compile Include="$(MSBuildThisFileDirectory)Constants.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Extensions.cs" />
<Compile Include="$(MSBuildThisFileDirectory)IBlockCaret.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ICommandMarginUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)IControlCharUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)IDirectoryUtil.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)IJoinableTaskFactoryProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)IKeyUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)IMarkDisplayUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\BlockCaret\BlockCaret.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\BlockCaret\BlockCaretController.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\BlockCaret\BlockCaretFactoryService.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\BlockCaret\BlockCaretFormatDefinition.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\BlockCaret\PrimaryCaretFormatDefinition.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\BlockCaret\SecondaryCaretFormatDefinition.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\CharDisplay\CharDisplayTaggerSource.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\CharDisplay\CharDisplayTaggerSourceFactory.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\CharDisplay\ControlCharFormatDefinition.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\CharDisplay\ControlCharUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\CommandMargin\CommandMargin.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\CommandMargin\CommandMarginControl.xaml.cs">
<DependentUpon>CommandMarginControl.xaml</DependentUpon>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)Implementation\CommandMargin\CommandMarginController.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\CommandMargin\CommandMarginFormatDefinition.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\CommandMargin\CommandMarginProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\CommandMargin\CommandMarginResources.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\CommandMargin\CommandMarginUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Directory\DirectoryContentType.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Directory\DirectoryFormatDefinition.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Directory\DirectoryKeyProcessor.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Directory\DirectoryKeyProcessorProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Directory\DirectoryTaggerSource.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Directory\DirectoryTaggerSourceFactory.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Directory\DirectoryUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\ImeCoordinator\ImeCoordinator.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\MarkGlyph\MarkDisplayUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\MarkGlyph\MarkGlyphFactory.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\MarkGlyph\MarkGlyphFactoryProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\MarkGlyph\MarkGlyphTag.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\MarkGlyph\MarkGlyphTaggerSource.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\MarkGlyph\MarkGlyphTaggerSourceFactory.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\AlternateKeyUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\ClipboardDevice.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\DebugUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\DisplayWindowBroker.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\EditorFormatDefinitions.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\KeyboardDeviceImpl.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\KeyMappingTimeoutHandler.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\MouseDeviceImpl.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Mouse\VimMouseProcessor.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Mouse\VimMouseProcessorProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\MultiSelection\MultiSelectionUtilFactory.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Paste\PasteAdornment.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Paste\PasteController.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Paste\PasteFactoryService.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\RelativeLineNumbers\ILineFormatTracker.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\RelativeLineNumbers\Line.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\RelativeLineNumbers\LineNumberDrawer.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\RelativeLineNumbers\LineNumberFormatTracker.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\RelativeLineNumbers\LineNumbersCalculator.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\RelativeLineNumbers\LineNumbersTracker.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\RelativeLineNumbers\LineNumberTextSource.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\RelativeLineNumbers\LineNumberVisual.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\RelativeLineNumbers\LineNumberVisualStore.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\RelativeLineNumbers\RelativeLineNumbersMargin.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\RelativeLineNumbers\RelativeLineNumbersMarginFactory.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\RelativeLineNumbers\Util\TextViewExtensions.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\RelativeLineNumbers\Util\TextViewLineExtensions.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\RelativeLineNumbers\VerticalCanvasMargin.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\WordCompletion\Async\WordAsyncCompletionSession.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\WordCompletion\Async\WordAsyncCompletionSessionFactory.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\WordCompletion\Async\WordAsyncCompletionSource.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\WordCompletion\Async\WordAsyncCompletionSourceProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\WordCompletion\Extensions.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\WordCompletion\Legacy\WordLegacyCompletionPresenterProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\WordCompletion\Legacy\WordLegacyCompletionSession.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\WordCompletion\Legacy\WordLegacyCompletionSessionFactory.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\WordCompletion\Legacy\WordLegacyCompletionSet.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\WordCompletion\Legacy\WordLegacyCompletionSource.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\WordCompletion\Legacy\WordLegacyCompletionSourceProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\WordCompletion\VimWordCompletionData.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\WordCompletion\VimWordCompletionUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)NativeMethods.cs" />
<Compile Include="$(MSBuildThisFileDirectory)VimHost.cs" />
<Compile Include="$(MSBuildThisFileDirectory)VimKeyProcessor.cs" />
</ItemGroup>
<ItemGroup>
<Page Include="$(MSBuildThisFileDirectory)Implementation\CommandMargin\CommandMarginControl.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/Src/VsVimShared/VsVimJoinableTaskFactoryProvider.cs b/Src/VsVimShared/VsVimJoinableTaskFactoryProvider.cs
deleted file mode 100644
index acc4867..0000000
--- a/Src/VsVimShared/VsVimJoinableTaskFactoryProvider.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using Microsoft.VisualStudio.Shell;
-using Microsoft.VisualStudio.Threading;
-using System.ComponentModel.Composition;
-using Vim.UI.Wpf;
-
-namespace Vim.VisualStudio
-{
- [Export(typeof(IJoinableTaskFactoryProvider))]
- internal sealed class VsVimJoinableTaskFactoryProvider : IJoinableTaskFactoryProvider
- {
- private readonly JoinableTaskFactory _joinableTaskFactory;
-
- [ImportingConstructor]
- internal VsVimJoinableTaskFactoryProvider()
- {
- // See:
- // https://github.com/microsoft/vs-threading/blob/master/doc/library_with_jtf.md
- // https://github.com/microsoft/vs-threading/blob/master/doc/testing_vs.md
- _joinableTaskFactory = ThreadHelper.JoinableTaskFactory;
- }
-
- public JoinableTaskFactory JoinableTaskFactory => _joinableTaskFactory;
-
- JoinableTaskFactory IJoinableTaskFactoryProvider.JoinableTaskFactory => JoinableTaskFactory;
- }
-}
diff --git a/Src/VsVimShared/VsVimShared.projitems b/Src/VsVimShared/VsVimShared.projitems
index 6c1045c..4cc8f34 100644
--- a/Src/VsVimShared/VsVimShared.projitems
+++ b/Src/VsVimShared/VsVimShared.projitems
@@ -1,165 +1,164 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<MSBuildAllProjects Condition="'$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' < '16.0'">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
<HasSharedItems>true</HasSharedItems>
<SharedGUID>6dbed15c-fc2c-46e9-914d-685518573f0d</SharedGUID>
</PropertyGroup>
<PropertyGroup Label="Configuration">
<Import_RootNamespace>VsVimShared</Import_RootNamespace>
</PropertyGroup>
<ItemGroup>
<Compile Include="$(MSBuildThisFileDirectory)CommandKeyBinding.cs" />
<Compile Include="$(MSBuildThisFileDirectory)CommandKeyBindingSnapshot.cs" />
<Compile Include="$(MSBuildThisFileDirectory)CommandListSnapshot.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Constants.cs" />
<Compile Include="$(MSBuildThisFileDirectory)EditCommand.cs" />
<Compile Include="$(MSBuildThisFileDirectory)EditCommandKind.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Extensions.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Guids.cs" />
<Compile Include="$(MSBuildThisFileDirectory)HostFactory.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ICommandDispatcher.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ICommandTarget.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ICSharpScriptExecutor.cs" />
<Compile Include="$(MSBuildThisFileDirectory)IExtensionAdapter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)IExternalEditAdapter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)IKeyBindingService.cs" />
<Compile Include="$(MSBuildThisFileDirectory)IKeyboardOptionsProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\ConflictingKey\ConflictingKeyBindingMargin.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\ConflictingKey\ConflictingKeyBindingMarginControl.xaml.cs">
<DependentUpon>ConflictingKeyBindingMarginControl.xaml</DependentUpon>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)Implementation\ConflictingKey\ConflictingKeyBindingMarginProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\CSharpScript\CSharpScriptExecutor.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\CSharpScript\CSharpScriptGlobals.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\EditorFormatDefinitions.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\ExternalEdit\ExternalEditMonitor.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\ExternalEdit\ExternalEditorManager.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\ExternalEdit\SnippetExternalEditAdapter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\InlineRename\IInlineRenameUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\InlineRename\InlineRenameListenerFactory.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\InlineRename\InlineRenameUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\IntelliCode\IntelliCodeCommandTarget.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\CSharpAdapter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\ExtensionAdapterBroker.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\FallbackKeyProcessor.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\FallbackKeyProcessorProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\KeyBindingService.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\MindScape.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\PowerToolsUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\ReportDesignerUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\ScopeData.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\StandardCommandTarget.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\StatusBarAdapter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\TextManager.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\UnwantedSelectionHandler.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\VimBufferCoordinator.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\VisualStudioCommandDispatcher.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\VsAdapter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\VsVimKeyProcessor.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\VsVimKeyProcessorProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\NavigateTo\IThreadCommunicator.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\NavigateTo\NavigateToItemProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\NavigateTo\NavigateToItemProviderFactory.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\OptionPages\ComboBoxTemplateSelector.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\OptionPages\DefaultOptionPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\OptionPages\KeyBindingData.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\OptionPages\KeyBindingHandledByOption.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\OptionPages\KeyboardOptionPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\OptionPages\KeyboardOptionsProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\OptionPages\KeyboardSettingsControl.xaml.cs">
<DependentUpon>KeyboardSettingsControl.xaml</DependentUpon>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)Implementation\PowerShellTools\IPowerShellToolsUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\PowerShellTools\PowerShellToolsExtensionAdapter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\PowerShellTools\PowerShellToolsUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\ReSharper\IResharperUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\ReSharper\ReSharperExtensionAdapter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\ReSharper\ReSharperExternalEditAdapter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\ReSharper\ReSharperKeyUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\ReSharper\ReSharperTagDetector.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\ReSharper\ReSharperUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\ReSharper\ReSharperVersion.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\ReSharper\ResharperVersionutility.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Settings\SettingSerializer.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Settings\VimApplicationSettings.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Settings\VimCollectionSettingsStore.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\ToastNotification\ToastControl.xaml.cs">
<DependentUpon>ToastControl.xaml</DependentUpon>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)Implementation\ToastNotification\ToastNotificationService.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\ToastNotification\ToastNotificationServiceProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\UpgradeNotification\ErrorBanner.xaml.cs">
<DependentUpon>ErrorBanner.xaml</DependentUpon>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)Implementation\UpgradeNotification\LinkBanner.xaml.cs">
<DependentUpon>LinkBanner.xaml</DependentUpon>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)Implementation\UpgradeNotification\VimRcLoadNotificationMarginProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\VisualAssist\IVisualAssistUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\VisualAssist\VisualAssistExtensionAdapter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\VisualAssist\VisualAssistKeyProcessor.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\VisualAssist\VisualAssistMargin.xaml.cs">
<DependentUpon>VisualAssistMargin.xaml</DependentUpon>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)Implementation\VisualAssist\VisualAssistSelectionAdapter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\VisualAssist\VisualAssistUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)IReportDesignerUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)WindowFrameState.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ITextManager.cs" />
<Compile Include="$(MSBuildThisFileDirectory)IToastNotifaction.cs" />
<Compile Include="$(MSBuildThisFileDirectory)IVimApplicationSettings.cs" />
<Compile Include="$(MSBuildThisFileDirectory)IVimBufferCoordinator.cs" />
<Compile Include="$(MSBuildThisFileDirectory)IVsAdapter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)KeyBinding.cs" />
<Compile Include="$(MSBuildThisFileDirectory)KeyStroke.cs" />
<Compile Include="$(MSBuildThisFileDirectory)NativeMethods.cs" />
<Compile Include="$(MSBuildThisFileDirectory)OleCommandData.cs" />
<Compile Include="$(MSBuildThisFileDirectory)OleCommandUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)PkgCmdID.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Resources.Designer.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Result.cs" />
<Compile Include="$(MSBuildThisFileDirectory)VimExtensionAdapter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)VisualStudioVersion.cs" />
<Compile Include="$(MSBuildThisFileDirectory)VsCommandTarget.cs" />
<Compile Include="$(MSBuildThisFileDirectory)VsFilterKeysAdapter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)VsVimHost.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)VsVimJoinableTaskFactoryProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)VsVimPackage.cs" />
</ItemGroup>
<ItemGroup>
<Page Include="$(MSBuildThisFileDirectory)Implementation\ConflictingKey\ConflictingKeyBindingMarginControl.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="$(MSBuildThisFileDirectory)Implementation\OptionPages\KeyboardSettingsControl.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="$(MSBuildThisFileDirectory)Implementation\ToastNotification\ToastControl.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="$(MSBuildThisFileDirectory)Implementation\UpgradeNotification\ErrorBanner.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="$(MSBuildThisFileDirectory)Implementation\UpgradeNotification\LinkBanner.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="$(MSBuildThisFileDirectory)Implementation\VisualAssist\VisualAssistMargin.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="$(MSBuildThisFileDirectory)VSPackage.resx">
<MergeWithCTO>true</MergeWithCTO>
<ManifestResourceName>VSPackage</ManifestResourceName>
</EmbeddedResource>
</ItemGroup>
</Project>
\ No newline at end of file
|
VsVim/VsVim
|
a580fab84eb0f0e274968ae29589c0ba921d9379
|
Fix NullReferenceException when dealing with Razor
|
diff --git a/Src/VimMac/VimHost.cs b/Src/VimMac/VimHost.cs
index b18e40d..e66be6b 100644
--- a/Src/VimMac/VimHost.cs
+++ b/Src/VimMac/VimHost.cs
@@ -1,598 +1,615 @@
using System;
using System.ComponentModel.Composition;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using AppKit;
using Foundation;
using Microsoft.FSharp.Core;
using Microsoft.VisualStudio.Text;
using Microsoft.VisualStudio.Text.Editor;
using Microsoft.VisualStudio.Text.Formatting;
using Microsoft.VisualStudio.Utilities;
using MonoDevelop.Components.Commands;
using MonoDevelop.Core;
using MonoDevelop.Ide;
using MonoDevelop.Ide.CodeFormatting;
using MonoDevelop.Ide.Commands;
using MonoDevelop.Ide.FindInFiles;
using MonoDevelop.Ide.Gui;
using MonoDevelop.Projects;
using Vim.Extensions;
using Vim.Interpreter;
using Vim.VisualStudio;
using Export = System.ComponentModel.Composition.ExportAttribute ;
namespace Vim.Mac
{
[Export(typeof(IVimHost))]
[Export(typeof(VimCocoaHost))]
[ContentType(VimConstants.ContentType)]
[TextViewRole(PredefinedTextViewRoles.Editable)]
internal sealed class VimCocoaHost : IVimHost
{
private readonly ITextBufferFactoryService _textBufferFactoryService;
private readonly ICocoaTextEditorFactoryService _textEditorFactoryService;
private readonly ISmartIndentationService _smartIndentationService;
private readonly IExtensionAdapterBroker _extensionAdapterBroker;
private IVim _vim;
internal const string CommandNameGoToDefinition = "MonoDevelop.Refactoring.RefactoryCommands.GotoDeclaration";
[ImportingConstructor]
public VimCocoaHost(
ITextBufferFactoryService textBufferFactoryService,
ICocoaTextEditorFactoryService textEditorFactoryService,
ISmartIndentationService smartIndentationService,
IExtensionAdapterBroker extensionAdapterBroker)
{
VimTrace.TraceSwitch.Level = System.Diagnostics.TraceLevel.Verbose;
Console.WriteLine("Loaded");
_textBufferFactoryService = textBufferFactoryService;
_textEditorFactoryService = textEditorFactoryService;
_smartIndentationService = smartIndentationService;
_extensionAdapterBroker = extensionAdapterBroker;
}
public bool AutoSynchronizeSettings => false;
public DefaultSettings DefaultSettings => DefaultSettings.GVim74;
public bool IsAutoCommandEnabled => false;
public bool IsUndoRedoExpected => _extensionAdapterBroker.IsUndoRedoExpected ?? false;
public int TabCount => IdeApp.Workbench.Documents.Count;
public bool UseDefaultCaret => true;
public event EventHandler<TextViewEventArgs> IsVisibleChanged;
public event EventHandler<TextViewChangedEventArgs> ActiveTextViewChanged;
public event EventHandler<BeforeSaveEventArgs> BeforeSave;
private ITextView TextViewFromDocument(Document document)
{
return document?.GetContent<ITextView>();
}
private Document DocumentFromTextView(ITextView textView)
{
return IdeApp.Workbench.Documents.FirstOrDefault(doc => TextViewFromDocument(doc) == textView);
}
private Document DocumentFromTextBuffer(ITextBuffer textBuffer)
{
- return IdeApp.Workbench.Documents.FirstOrDefault(doc => doc.TextBuffer == textBuffer);
+ // If this is an IProjectionBuffer then we need to dig into the actual ITextBuffer values
+ // which make it up.
+ foreach (var sourceTextBuffer in TextBufferUtil.GetSourceBuffersRecursive(textBuffer))
+ {
+ // The inert buffer doesn't need to be considered. It's used as a fake buffer by web applications
+ // in order to render projected content
+ if (sourceTextBuffer.ContentType == _textBufferFactoryService.InertContentType)
+ {
+ continue;
+ }
+
+ var doc = IdeApp.Workbench.Documents.FirstOrDefault(doc => doc.TextBuffer == sourceTextBuffer);
+ if(doc != null)
+ {
+ return doc;
+ }
+ }
+ return null;
}
private static NSSound GetBeepSound()
{
using (var stream = typeof(VimCocoaHost).Assembly.GetManifestResourceStream("Vim.Mac.Resources.beep.wav"))
using (NSData data = NSData.FromStream(stream))
{
return new NSSound(data);
}
}
readonly Lazy<NSSound> beep = new Lazy<NSSound>(() => GetBeepSound());
public void Beep()
{
beep.Value.Play();
}
public void BeginBulkOperation()
{
}
public void Close(ITextView textView)
{
Dispatch(FileCommands.CloseFile);
}
public void CloseAllOtherTabs(ITextView textView)
{
Dispatch(FileTabCommands.CloseAllButThis);
}
public void CloseAllOtherWindows(ITextView textView)
{
Dispatch(FileTabCommands.CloseAllButThis);
}
/// <summary>
/// Create a hidden ITextView. It will have no roles in order to keep it out of
/// most plugins
/// </summary>
public ITextView CreateHiddenTextView()
{
return _textEditorFactoryService.CreateTextView(
_textBufferFactoryService.CreateTextBuffer(),
_textEditorFactoryService.NoRoles);
}
public void DoActionWhenTextViewReady(FSharpFunc<Unit, Unit> action, ITextView textView)
{
// Perform action if the text view is still open.
if (!textView.IsClosed && !textView.InLayout)
{
action.Invoke(null);
}
}
public void EndBulkOperation()
{
}
public void EnsurePackageLoaded()
{
LoggingService.LogDebug("EnsurePackageLoaded");
}
// TODO: Same as WPF version
/// <summary>
/// Ensure the given SnapshotPoint is visible on the screen
/// </summary>
public void EnsureVisible(ITextView textView, SnapshotPoint point)
{
try
{
// Intentionally breaking up these tasks into different steps. The act of making the
// line visible can actually invalidate the ITextViewLine instance and cause it to
// throw when we access it for making the point visible. Breaking it into separate
// steps so each one has to requery the current and valid information
EnsureLineVisible(textView, point);
EnsureLinePointVisible(textView, point);
}
catch (Exception)
{
// The ITextViewLine implementation can throw if this code runs in the middle of
// a layout or if the line believes itself to be invalid. Hard to completely guard
// against this
}
}
/// <summary>
/// Do the vertical scrolling necessary to make sure the line is visible
/// </summary>
private void EnsureLineVisible(ITextView textView, SnapshotPoint point)
{
const double roundOff = 0.01;
var textViewLine = textView.GetTextViewLineContainingBufferPosition(point);
if (textViewLine == null)
{
return;
}
switch (textViewLine.VisibilityState)
{
case VisibilityState.FullyVisible:
// If the line is fully visible then no scrolling needs to occur
break;
case VisibilityState.Hidden:
case VisibilityState.PartiallyVisible:
{
ViewRelativePosition? pos = null;
if (textViewLine.Height <= textView.ViewportHeight + roundOff)
{
// The line fits into the view. Figure out if it needs to be at the top
// or the bottom
pos = textViewLine.Top < textView.ViewportTop
? ViewRelativePosition.Top
: ViewRelativePosition.Bottom;
}
else if (textViewLine.Bottom < textView.ViewportBottom)
{
// Line does not fit into view but we can use more space at the bottom
// of the view
pos = ViewRelativePosition.Bottom;
}
else if (textViewLine.Top > textView.ViewportTop)
{
pos = ViewRelativePosition.Top;
}
if (pos.HasValue)
{
textView.DisplayTextLineContainingBufferPosition(point, 0.0, pos.Value);
}
}
break;
case VisibilityState.Unattached:
{
var pos = textViewLine.Start < textView.TextViewLines.FormattedSpan.Start && textViewLine.Height <= textView.ViewportHeight + roundOff
? ViewRelativePosition.Top
: ViewRelativePosition.Bottom;
textView.DisplayTextLineContainingBufferPosition(point, 0.0, pos);
}
break;
}
}
/// <summary>
/// Do the horizontal scrolling necessary to make the column of the given point visible
/// </summary>
private void EnsureLinePointVisible(ITextView textView, SnapshotPoint point)
{
var textViewLine = textView.GetTextViewLineContainingBufferPosition(point);
if (textViewLine == null)
{
return;
}
const double horizontalPadding = 2.0;
const double scrollbarPadding = 200.0;
var scroll = Math.Max(
horizontalPadding,
Math.Min(scrollbarPadding, textView.ViewportWidth / 4));
var bounds = textViewLine.GetCharacterBounds(point);
if (bounds.Left - horizontalPadding < textView.ViewportLeft)
{
textView.ViewportLeft = bounds.Left - scroll;
}
else if (bounds.Right + horizontalPadding > textView.ViewportRight)
{
textView.ViewportLeft = (bounds.Right + scroll) - textView.ViewportWidth;
}
}
public void FindInFiles(string pattern, bool matchCase, string filesOfType, VimGrepFlags flags, FSharpFunc<Unit, Unit> action)
{
}
public void FormatLines(ITextView textView, SnapshotLineRange range)
{
var startedWithSelection = !textView.Selection.IsEmpty;
textView.Selection.Clear();
textView.Selection.Select(range.ExtentIncludingLineBreak, false);
// FormatBuffer command actually formats the selection
Dispatch(CodeFormattingCommands.FormatBuffer);
if (!startedWithSelection)
{
textView.Selection.Clear();
}
}
public FSharpOption<ITextView> GetFocusedTextView()
{
var doc = IdeServices.DocumentManager.ActiveDocument;
return FSharpOption.CreateForReference(TextViewFromDocument(doc));
}
public string GetName(ITextBuffer textBuffer)
{
if (textBuffer.Properties.TryGetProperty(typeof(ITextDocument), out ITextDocument textDocument) && textDocument.FilePath != null)
{
return textDocument.FilePath;
}
else
{
LoggingService.LogWarning("VsVim: Failed to get filename of textbuffer.");
return "";
}
}
//TODO: Copied from VsVimHost
public FSharpOption<int> GetNewLineIndent(ITextView textView, ITextSnapshotLine contextLine, ITextSnapshotLine newLine, IVimLocalSettings localSettings)
{
//if (_vimApplicationSettings.UseEditorIndent)
//{
var indent = _smartIndentationService.GetDesiredIndentation(textView, newLine);
if (indent.HasValue)
{
return FSharpOption.Create(indent.Value);
}
else
{
// If the user wanted editor indentation but the editor doesn't support indentation
// even though it proffers an indentation service then fall back to what auto
// indent would do if it were enabled (don't care if it actually is)
//
// Several editors like XAML offer the indentation service but don't actually
// provide information. User clearly wants indent there since the editor indent
// is enabled. Do a best effort and use Vim style indenting
return FSharpOption.Create(EditUtil.GetAutoIndent(contextLine, localSettings.TabStop));
}
//}
//return FSharpOption<int>.None;
}
public int GetTabIndex(ITextView textView)
{
var notebooks = WindowManagement.GetNotebooks();
foreach (var notebook in notebooks)
{
var index = notebook.FileNames.IndexOf(GetName(textView.TextBuffer));
if (index != -1)
{
return index;
}
}
return -1;
}
public WordWrapStyles GetWordWrapStyle(ITextView textView)
{
throw new NotImplementedException();
}
public bool GoToDefinition()
{
return Dispatch(CommandNameGoToDefinition);
}
public bool PeekDefinition()
{
throw new NotImplementedException();
}
public bool GoToGlobalDeclaration(ITextView textView, string identifier)
{
return Dispatch(CommandNameGoToDefinition);
}
public bool GoToLocalDeclaration(ITextView textView, string identifier)
{
return Dispatch(CommandNameGoToDefinition);
}
private void OpenTab(string fileName)
{
Project project = null;
IdeApp.Workbench.OpenDocument(fileName, project);
}
public void GoToTab(int index)
{
var activeNotebook = WindowManagement.GetNotebooks().First(n => n.IsActive);
var fileName = activeNotebook.FileNames[index];
OpenTab(fileName);
}
private void SwitchToNotebook(Notebook notebook)
{
OpenTab(notebook.FileNames[notebook.ActiveTab]);
}
public void GoToWindow(ITextView textView, WindowKind direction, int count)
{
// In VSMac, there are just 2 windows, left and right
var notebooks = WindowManagement.GetNotebooks();
if (notebooks.Length > 0 && notebooks[0].IsActive && (direction == WindowKind.Right || direction == WindowKind.Previous || direction == WindowKind.Next))
{
SwitchToNotebook(notebooks[1]);
}
if (notebooks.Length > 0 && notebooks[1].IsActive && (direction == WindowKind.Left || direction == WindowKind.Previous || direction == WindowKind.Next))
{
SwitchToNotebook(notebooks[0]);
}
}
public bool IsDirty(ITextBuffer textBuffer)
{
var doc = DocumentFromTextBuffer(textBuffer);
return doc.IsDirty;
}
public bool IsFocused(ITextView textView)
{
return TextViewFromDocument(IdeServices.DocumentManager.ActiveDocument) == textView;
}
public bool IsReadOnly(ITextBuffer textBuffer)
{
var doc = DocumentFromTextBuffer(textBuffer);
return doc.IsViewOnly;
}
public bool IsVisible(ITextView textView)
{
return IdeServices.DocumentManager.Documents.Select(TextViewFromDocument).Any(v => v == textView);
}
public bool LoadFileIntoExistingWindow(string filePath, ITextView textView)
{
// filePath can be a wildcard representing multiple files
// e.g. :e ~/src/**/*.cs
var files = ShellWildcardExpansion.ExpandWildcard(filePath, _vim.VimData.CurrentDirectory);
try
{
foreach (var file in files)
{
OpenTab(file);
}
return true;
}
catch
{
return false;
}
}
public FSharpOption<ITextView> LoadFileIntoNewWindow(string filePath, FSharpOption<int> line, FSharpOption<int> column)
{
if (File.Exists(filePath))
{
var document = IdeApp.Workbench.OpenDocument(filePath, null, line.SomeOrDefault(0), column.SomeOrDefault(0)).Result;
var textView = TextViewFromDocument(document);
return FSharpOption.CreateForReference(textView);
}
return FSharpOption<ITextView>.None;
}
public void Make(bool jumpToFirstError, string arguments)
{
Dispatch(ProjectCommands.Build);
}
public bool NavigateTo(VirtualSnapshotPoint point)
{
var tuple = SnapshotPointUtil.GetLineNumberAndOffset(point.Position);
var line = tuple.Item1;
var column = tuple.Item2;
var buffer = point.Position.Snapshot.TextBuffer;
var fileName = GetName(buffer);
try
{
IdeApp.Workbench.OpenDocument(fileName, null, line, column).Wait(System.Threading.CancellationToken.None);
return true;
}
catch
{
return false;
}
}
public FSharpOption<ListItem> NavigateToListItem(ListKind listKind, NavigationKind navigationKind, FSharpOption<int> argumentOption, bool hasBang)
{
if (listKind == ListKind.Error)
{
var errors = IdeServices.TaskService.Errors;
if (errors.Count > 0)
{
var argument = argumentOption.IsSome() ? new int?(argumentOption.Value) : null;
var currentIndex = errors.CurrentLocationTask == null ? -1 : errors.IndexOf(errors.CurrentLocationTask);
var index = GetListItemIndex(navigationKind, argument, currentIndex, errors.Count);
if (index.HasValue)
{
var errorItem = errors.ElementAt(index.Value);
errors.CurrentLocationTask = errorItem;
errorItem.SelectInPad();
errorItem.JumpToPosition();
// Item number is one-based.
var listItem = new ListItem(index.Value + 1, errors.Count, errorItem.Message);
return FSharpOption.CreateForReference(listItem);
}
}
}
return FSharpOption<ListItem>.None;
}
/// <summary>
/// Convert the specified navigation instructions into an index for the
/// new list item
/// </summary>
/// <param name="navigationKind">the kind of navigation</param>
/// <param name="argument">an optional argument for the navigation</param>
/// <param name="current">the zero-based index of the current list item</param>
/// <param name="length">the length of the list</param>
/// <returns>a zero-based index into the list</returns>
private static int? GetListItemIndex(NavigationKind navigationKind, int? argument, int? current, int length)
{
var argumentOffset = argument ?? 1;
var currentIndex = current ?? -1;
var newIndex = -1;
// The 'first' and 'last' navigation kinds are one-based.
switch (navigationKind)
{
case NavigationKind.First:
newIndex = argument.HasValue ? argument.Value - 1 : 0;
break;
case NavigationKind.Last:
newIndex = argument.HasValue ? argument.Value - 1 : length - 1;
break;
case NavigationKind.Next:
newIndex = currentIndex + argumentOffset;
break;
case NavigationKind.Previous:
newIndex = currentIndex - argumentOffset;
break;
default:
Contract.Assert(false);
break;
}
if (newIndex >= 0 && newIndex < length)
{
return newIndex;
}
return null;
}
public bool OpenLink(string link)
{
return NSWorkspace.SharedWorkspace.OpenUrl(new NSUrl(link));
}
public void OpenListWindow(ListKind listKind)
{
if (listKind == ListKind.Error)
{
GotoPad("MonoDevelop.Ide.Gui.Pads.ErrorListPad");
return;
}
if (listKind == ListKind.Location)
{
// This abstraction is not quite right as VSMac can have multiple search results pads open
GotoPad("SearchPad - Search Results - 0");
return;
}
}
private void GotoPad(string padId)
{
var pad = IdeApp.Workbench.Pads.FirstOrDefault(p => p.Id == padId);
pad?.BringToFront(true);
}
public void Quit()
{
IdeApp.Exit();
}
public bool Reload(ITextView textView)
{
var doc = DocumentFromTextView(textView);
doc.Reload();
return true;
}
/// <summary>
/// Run the specified command on the supplied input, capture it's output and
/// return it to the caller
/// </summary>
public RunCommandResults RunCommand(string workingDirectory, string command, string arguments, string input)
{
// Use a (generous) timeout since we have no way to interrupt it.
var timeout = 30 * 1000;
// Avoid redirection for the 'open' command.
var doRedirect = !arguments.StartsWith("/c open ", StringComparison.CurrentCulture);
//TODO: '/c is CMD.exe specific'
if(arguments.StartsWith("/c ", StringComparison.CurrentCulture))
|
VsVim/VsVim
|
fe2f86c16a66eaa9c3b1dc20dc97e451f76adac8
|
Adds C# scripting capability to VSMac
|
diff --git a/Src/VimMac/CSharpScript/CSharpScriptExecutor.cs b/Src/VimMac/CSharpScript/CSharpScriptExecutor.cs
new file mode 100644
index 0000000..4ffeb80
--- /dev/null
+++ b/Src/VimMac/CSharpScript/CSharpScriptExecutor.cs
@@ -0,0 +1,118 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.Composition;
+using System.IO;
+using System.Reflection;
+using System.Threading.Tasks;
+using Vim.Interpreter;
+
+namespace Vim.VisualStudio.Implementation.CSharpScript
+{
+ using Microsoft.CodeAnalysis.CSharp.Scripting;
+ using Microsoft.CodeAnalysis.Scripting;
+ using CSharpScript = Microsoft.CodeAnalysis.CSharp.Scripting.CSharpScript;
+
+ [Export(typeof(ICSharpScriptExecutor))]
+ internal sealed partial class CSharpScriptExecutor : ICSharpScriptExecutor
+ {
+ private const string ScriptFolder = "vsvimscripts";
+ private Dictionary<string, Script<object>> _scripts = new Dictionary<string, Script<object>>(StringComparer.OrdinalIgnoreCase);
+ private ScriptOptions _scriptOptions = null;
+
+ [ImportingConstructor]
+ public CSharpScriptExecutor()
+ {
+
+ }
+
+ private async Task ExecuteAsync(IVimBuffer vimBuffer, CallInfo callInfo, bool createEachTime)
+ {
+ try
+ {
+ Script<object> script;
+ if (!TryGetScript(vimBuffer, callInfo.Name, createEachTime, out script))
+ return;
+
+ var globals = new CSharpScriptGlobals(callInfo, vimBuffer);
+ var scriptState = await script.RunAsync(globals);
+ }
+ catch (CompilationErrorException ex)
+ {
+ if (_scripts.ContainsKey(callInfo.Name))
+ _scripts.Remove(callInfo.Name);
+
+ vimBuffer.VimBufferData.StatusUtil.OnError(string.Join(Environment.NewLine, ex.Diagnostics));
+ }
+ catch (Exception ex)
+ {
+ vimBuffer.VimBufferData.StatusUtil.OnError(ex.Message);
+ }
+ }
+
+ private static ScriptOptions GetScriptOptions(string scriptPath)
+ {
+ var ssr = ScriptSourceResolver.Default.WithBaseDirectory(scriptPath);
+ var baseDirectory = AppDomain.CurrentDomain.BaseDirectory;
+
+ var searchPaths = new string[]
+ {
+ baseDirectory,
+ Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)
+ };
+
+ var smr = ScriptMetadataResolver.Default
+ .WithBaseDirectory(scriptPath)
+ .WithSearchPaths(searchPaths);
+
+ var asm = new Assembly[]
+ {
+ typeof(MonoDevelop.Core.Runtime).Assembly,
+ typeof(Vim.IVim).Assembly, // VimCore.dll
+ typeof(Vim.Mac.VimCocoaHost).Assembly // Vim.VisualStudio.Shared.dll
+ };
+
+ var so = ScriptOptions.Default
+ .WithSourceResolver(ssr)
+ .WithMetadataResolver(smr)
+ .WithReferences(asm);
+
+ return so;
+ }
+
+ private bool TryGetScript(IVimBuffer vimBuffer, string scriptName, bool createEachTime, out Script<object> script)
+ {
+ if (!createEachTime && _scripts.TryGetValue(scriptName, out script))
+ return true;
+
+ string scriptPath = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
+ scriptPath = Path.Combine(scriptPath, ScriptFolder);
+
+ string scriptFilePath = Path.Combine(scriptPath, $"{scriptName}.csx");
+
+ if (!File.Exists(scriptFilePath))
+ {
+ vimBuffer.VimBufferData.StatusUtil.OnError("script file not found.");
+ script = null;
+ return false;
+ }
+
+ if (_scriptOptions == null)
+ _scriptOptions = GetScriptOptions(scriptPath);
+
+ script = CSharpScript.Create(File.ReadAllText(scriptFilePath), _scriptOptions, typeof(CSharpScriptGlobals));
+ _scripts[scriptName] = script;
+ return true;
+ }
+
+ #region ICSharpScriptExecutor
+
+ void ICSharpScriptExecutor.Execute(IVimBuffer vimBuffer, CallInfo callInfo, bool createEachTime)
+ {
+ var task = ExecuteAsync(vimBuffer, callInfo, createEachTime);
+ VimTrace.TraceInfo("CSharptScript:Execute {0}", callInfo.Name);
+ }
+
+ #endregion
+
+ }
+}
diff --git a/Src/VimMac/CSharpScript/CSharpScriptGlobals.cs b/Src/VimMac/CSharpScript/CSharpScriptGlobals.cs
new file mode 100644
index 0000000..b92375c
--- /dev/null
+++ b/Src/VimMac/CSharpScript/CSharpScriptGlobals.cs
@@ -0,0 +1,24 @@
+using Vim.Interpreter;
+
+namespace Vim.VisualStudio.Implementation.CSharpScript
+{
+ public class CSharpScriptGlobals
+ {
+ public string Name { get; } = string.Empty;
+ public string Arguments { get; } = string.Empty;
+ public LineRangeSpecifier LineRange { get; }
+ public bool IsScriptLocal { get; } = false;
+ public IVim Vim { get; } = null;
+ public IVimBuffer VimBuffer { get; } = null;
+
+ public CSharpScriptGlobals(CallInfo callInfo, IVimBuffer vimBuffer)
+ {
+ Name = callInfo.Name;
+ Arguments = callInfo.Arguments;
+ LineRange = callInfo.LineRange;
+ IsScriptLocal = callInfo.IsScriptLocal;
+ Vim = vimBuffer.Vim;
+ VimBuffer = vimBuffer;
+ }
+ }
+}
diff --git a/Src/VimMac/CSharpScript/ICSharpScriptExecutor.cs b/Src/VimMac/CSharpScript/ICSharpScriptExecutor.cs
new file mode 100644
index 0000000..9e1bb1e
--- /dev/null
+++ b/Src/VimMac/CSharpScript/ICSharpScriptExecutor.cs
@@ -0,0 +1,9 @@
+using Vim.Interpreter;
+
+namespace Vim.VisualStudio
+{
+ public interface ICSharpScriptExecutor
+ {
+ void Execute(IVimBuffer vimBuffer, CallInfo callInfo, bool createEachTime);
+ }
+}
diff --git a/Src/VimMac/Properties/AddinInfo.cs b/Src/VimMac/Properties/AddinInfo.cs
index 181e98a..85931f1 100644
--- a/Src/VimMac/Properties/AddinInfo.cs
+++ b/Src/VimMac/Properties/AddinInfo.cs
@@ -1,15 +1,15 @@
using System;
using Mono.Addins;
using Mono.Addins.Description;
[assembly: Addin(
"VsVim",
Namespace = "Vim.Mac",
- Version = "2.8.0.17"
+ Version = "2.8.0.18"
)]
[assembly: AddinName("VsVim")]
[assembly: AddinCategory("IDE extensions")]
[assembly: AddinUrl("https://github.com/VsVim/VsVim")]
[assembly: AddinDescription("VIM emulation layer for Visual Studio")]
[assembly: AddinAuthor("Jared Parsons")]
diff --git a/Src/VimMac/VimHost.cs b/Src/VimMac/VimHost.cs
index b18e40d..4c1d6a3 100644
--- a/Src/VimMac/VimHost.cs
+++ b/Src/VimMac/VimHost.cs
@@ -1,738 +1,739 @@
using System;
using System.ComponentModel.Composition;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using AppKit;
using Foundation;
using Microsoft.FSharp.Core;
using Microsoft.VisualStudio.Text;
using Microsoft.VisualStudio.Text.Editor;
using Microsoft.VisualStudio.Text.Formatting;
using Microsoft.VisualStudio.Utilities;
-using MonoDevelop.Components.Commands;
using MonoDevelop.Core;
using MonoDevelop.Ide;
using MonoDevelop.Ide.CodeFormatting;
using MonoDevelop.Ide.Commands;
-using MonoDevelop.Ide.FindInFiles;
using MonoDevelop.Ide.Gui;
using MonoDevelop.Projects;
using Vim.Extensions;
using Vim.Interpreter;
using Vim.VisualStudio;
using Export = System.ComponentModel.Composition.ExportAttribute ;
namespace Vim.Mac
{
[Export(typeof(IVimHost))]
[Export(typeof(VimCocoaHost))]
[ContentType(VimConstants.ContentType)]
[TextViewRole(PredefinedTextViewRoles.Editable)]
internal sealed class VimCocoaHost : IVimHost
{
private readonly ITextBufferFactoryService _textBufferFactoryService;
private readonly ICocoaTextEditorFactoryService _textEditorFactoryService;
private readonly ISmartIndentationService _smartIndentationService;
private readonly IExtensionAdapterBroker _extensionAdapterBroker;
+ private readonly ICSharpScriptExecutor _scriptExecutor;
private IVim _vim;
internal const string CommandNameGoToDefinition = "MonoDevelop.Refactoring.RefactoryCommands.GotoDeclaration";
[ImportingConstructor]
public VimCocoaHost(
ITextBufferFactoryService textBufferFactoryService,
ICocoaTextEditorFactoryService textEditorFactoryService,
ISmartIndentationService smartIndentationService,
- IExtensionAdapterBroker extensionAdapterBroker)
+ IExtensionAdapterBroker extensionAdapterBroker,
+ ICSharpScriptExecutor scriptExecutor)
{
VimTrace.TraceSwitch.Level = System.Diagnostics.TraceLevel.Verbose;
Console.WriteLine("Loaded");
_textBufferFactoryService = textBufferFactoryService;
_textEditorFactoryService = textEditorFactoryService;
_smartIndentationService = smartIndentationService;
_extensionAdapterBroker = extensionAdapterBroker;
+ _scriptExecutor = scriptExecutor;
}
public bool AutoSynchronizeSettings => false;
public DefaultSettings DefaultSettings => DefaultSettings.GVim74;
public bool IsAutoCommandEnabled => false;
public bool IsUndoRedoExpected => _extensionAdapterBroker.IsUndoRedoExpected ?? false;
public int TabCount => IdeApp.Workbench.Documents.Count;
public bool UseDefaultCaret => true;
public event EventHandler<TextViewEventArgs> IsVisibleChanged;
public event EventHandler<TextViewChangedEventArgs> ActiveTextViewChanged;
public event EventHandler<BeforeSaveEventArgs> BeforeSave;
private ITextView TextViewFromDocument(Document document)
{
return document?.GetContent<ITextView>();
}
private Document DocumentFromTextView(ITextView textView)
{
return IdeApp.Workbench.Documents.FirstOrDefault(doc => TextViewFromDocument(doc) == textView);
}
private Document DocumentFromTextBuffer(ITextBuffer textBuffer)
{
return IdeApp.Workbench.Documents.FirstOrDefault(doc => doc.TextBuffer == textBuffer);
}
private static NSSound GetBeepSound()
{
using (var stream = typeof(VimCocoaHost).Assembly.GetManifestResourceStream("Vim.Mac.Resources.beep.wav"))
using (NSData data = NSData.FromStream(stream))
{
return new NSSound(data);
}
}
readonly Lazy<NSSound> beep = new Lazy<NSSound>(() => GetBeepSound());
public void Beep()
{
beep.Value.Play();
}
public void BeginBulkOperation()
{
}
public void Close(ITextView textView)
{
Dispatch(FileCommands.CloseFile);
}
public void CloseAllOtherTabs(ITextView textView)
{
Dispatch(FileTabCommands.CloseAllButThis);
}
public void CloseAllOtherWindows(ITextView textView)
{
Dispatch(FileTabCommands.CloseAllButThis);
}
/// <summary>
/// Create a hidden ITextView. It will have no roles in order to keep it out of
/// most plugins
/// </summary>
public ITextView CreateHiddenTextView()
{
return _textEditorFactoryService.CreateTextView(
_textBufferFactoryService.CreateTextBuffer(),
_textEditorFactoryService.NoRoles);
}
public void DoActionWhenTextViewReady(FSharpFunc<Unit, Unit> action, ITextView textView)
{
// Perform action if the text view is still open.
if (!textView.IsClosed && !textView.InLayout)
{
action.Invoke(null);
}
}
public void EndBulkOperation()
{
}
public void EnsurePackageLoaded()
{
LoggingService.LogDebug("EnsurePackageLoaded");
}
// TODO: Same as WPF version
/// <summary>
/// Ensure the given SnapshotPoint is visible on the screen
/// </summary>
public void EnsureVisible(ITextView textView, SnapshotPoint point)
{
try
{
// Intentionally breaking up these tasks into different steps. The act of making the
// line visible can actually invalidate the ITextViewLine instance and cause it to
// throw when we access it for making the point visible. Breaking it into separate
// steps so each one has to requery the current and valid information
EnsureLineVisible(textView, point);
EnsureLinePointVisible(textView, point);
}
catch (Exception)
{
// The ITextViewLine implementation can throw if this code runs in the middle of
// a layout or if the line believes itself to be invalid. Hard to completely guard
// against this
}
}
/// <summary>
/// Do the vertical scrolling necessary to make sure the line is visible
/// </summary>
private void EnsureLineVisible(ITextView textView, SnapshotPoint point)
{
const double roundOff = 0.01;
var textViewLine = textView.GetTextViewLineContainingBufferPosition(point);
if (textViewLine == null)
{
return;
}
switch (textViewLine.VisibilityState)
{
case VisibilityState.FullyVisible:
// If the line is fully visible then no scrolling needs to occur
break;
case VisibilityState.Hidden:
case VisibilityState.PartiallyVisible:
{
ViewRelativePosition? pos = null;
if (textViewLine.Height <= textView.ViewportHeight + roundOff)
{
// The line fits into the view. Figure out if it needs to be at the top
// or the bottom
pos = textViewLine.Top < textView.ViewportTop
? ViewRelativePosition.Top
: ViewRelativePosition.Bottom;
}
else if (textViewLine.Bottom < textView.ViewportBottom)
{
// Line does not fit into view but we can use more space at the bottom
// of the view
pos = ViewRelativePosition.Bottom;
}
else if (textViewLine.Top > textView.ViewportTop)
{
pos = ViewRelativePosition.Top;
}
if (pos.HasValue)
{
textView.DisplayTextLineContainingBufferPosition(point, 0.0, pos.Value);
}
}
break;
case VisibilityState.Unattached:
{
var pos = textViewLine.Start < textView.TextViewLines.FormattedSpan.Start && textViewLine.Height <= textView.ViewportHeight + roundOff
? ViewRelativePosition.Top
: ViewRelativePosition.Bottom;
textView.DisplayTextLineContainingBufferPosition(point, 0.0, pos);
}
break;
}
}
/// <summary>
/// Do the horizontal scrolling necessary to make the column of the given point visible
/// </summary>
private void EnsureLinePointVisible(ITextView textView, SnapshotPoint point)
{
var textViewLine = textView.GetTextViewLineContainingBufferPosition(point);
if (textViewLine == null)
{
return;
}
const double horizontalPadding = 2.0;
const double scrollbarPadding = 200.0;
var scroll = Math.Max(
horizontalPadding,
Math.Min(scrollbarPadding, textView.ViewportWidth / 4));
var bounds = textViewLine.GetCharacterBounds(point);
if (bounds.Left - horizontalPadding < textView.ViewportLeft)
{
textView.ViewportLeft = bounds.Left - scroll;
}
else if (bounds.Right + horizontalPadding > textView.ViewportRight)
{
textView.ViewportLeft = (bounds.Right + scroll) - textView.ViewportWidth;
}
}
public void FindInFiles(string pattern, bool matchCase, string filesOfType, VimGrepFlags flags, FSharpFunc<Unit, Unit> action)
{
}
public void FormatLines(ITextView textView, SnapshotLineRange range)
{
var startedWithSelection = !textView.Selection.IsEmpty;
textView.Selection.Clear();
textView.Selection.Select(range.ExtentIncludingLineBreak, false);
// FormatBuffer command actually formats the selection
Dispatch(CodeFormattingCommands.FormatBuffer);
if (!startedWithSelection)
{
textView.Selection.Clear();
}
}
public FSharpOption<ITextView> GetFocusedTextView()
{
var doc = IdeServices.DocumentManager.ActiveDocument;
return FSharpOption.CreateForReference(TextViewFromDocument(doc));
}
public string GetName(ITextBuffer textBuffer)
{
if (textBuffer.Properties.TryGetProperty(typeof(ITextDocument), out ITextDocument textDocument) && textDocument.FilePath != null)
{
return textDocument.FilePath;
}
else
{
LoggingService.LogWarning("VsVim: Failed to get filename of textbuffer.");
return "";
}
}
//TODO: Copied from VsVimHost
public FSharpOption<int> GetNewLineIndent(ITextView textView, ITextSnapshotLine contextLine, ITextSnapshotLine newLine, IVimLocalSettings localSettings)
{
//if (_vimApplicationSettings.UseEditorIndent)
//{
var indent = _smartIndentationService.GetDesiredIndentation(textView, newLine);
if (indent.HasValue)
{
return FSharpOption.Create(indent.Value);
}
else
{
// If the user wanted editor indentation but the editor doesn't support indentation
// even though it proffers an indentation service then fall back to what auto
// indent would do if it were enabled (don't care if it actually is)
//
// Several editors like XAML offer the indentation service but don't actually
// provide information. User clearly wants indent there since the editor indent
// is enabled. Do a best effort and use Vim style indenting
return FSharpOption.Create(EditUtil.GetAutoIndent(contextLine, localSettings.TabStop));
}
//}
//return FSharpOption<int>.None;
}
public int GetTabIndex(ITextView textView)
{
var notebooks = WindowManagement.GetNotebooks();
foreach (var notebook in notebooks)
{
var index = notebook.FileNames.IndexOf(GetName(textView.TextBuffer));
if (index != -1)
{
return index;
}
}
return -1;
}
public WordWrapStyles GetWordWrapStyle(ITextView textView)
{
throw new NotImplementedException();
}
public bool GoToDefinition()
{
return Dispatch(CommandNameGoToDefinition);
}
public bool PeekDefinition()
{
throw new NotImplementedException();
}
public bool GoToGlobalDeclaration(ITextView textView, string identifier)
{
return Dispatch(CommandNameGoToDefinition);
}
public bool GoToLocalDeclaration(ITextView textView, string identifier)
{
return Dispatch(CommandNameGoToDefinition);
}
private void OpenTab(string fileName)
{
Project project = null;
IdeApp.Workbench.OpenDocument(fileName, project);
}
public void GoToTab(int index)
{
var activeNotebook = WindowManagement.GetNotebooks().First(n => n.IsActive);
var fileName = activeNotebook.FileNames[index];
OpenTab(fileName);
}
private void SwitchToNotebook(Notebook notebook)
{
OpenTab(notebook.FileNames[notebook.ActiveTab]);
}
public void GoToWindow(ITextView textView, WindowKind direction, int count)
{
// In VSMac, there are just 2 windows, left and right
var notebooks = WindowManagement.GetNotebooks();
if (notebooks.Length > 0 && notebooks[0].IsActive && (direction == WindowKind.Right || direction == WindowKind.Previous || direction == WindowKind.Next))
{
SwitchToNotebook(notebooks[1]);
}
if (notebooks.Length > 0 && notebooks[1].IsActive && (direction == WindowKind.Left || direction == WindowKind.Previous || direction == WindowKind.Next))
{
SwitchToNotebook(notebooks[0]);
}
}
public bool IsDirty(ITextBuffer textBuffer)
{
var doc = DocumentFromTextBuffer(textBuffer);
return doc.IsDirty;
}
public bool IsFocused(ITextView textView)
{
return TextViewFromDocument(IdeServices.DocumentManager.ActiveDocument) == textView;
}
public bool IsReadOnly(ITextBuffer textBuffer)
{
var doc = DocumentFromTextBuffer(textBuffer);
return doc.IsViewOnly;
}
public bool IsVisible(ITextView textView)
{
return IdeServices.DocumentManager.Documents.Select(TextViewFromDocument).Any(v => v == textView);
}
public bool LoadFileIntoExistingWindow(string filePath, ITextView textView)
{
// filePath can be a wildcard representing multiple files
// e.g. :e ~/src/**/*.cs
var files = ShellWildcardExpansion.ExpandWildcard(filePath, _vim.VimData.CurrentDirectory);
try
{
foreach (var file in files)
{
OpenTab(file);
}
return true;
}
catch
{
return false;
}
}
public FSharpOption<ITextView> LoadFileIntoNewWindow(string filePath, FSharpOption<int> line, FSharpOption<int> column)
{
if (File.Exists(filePath))
{
var document = IdeApp.Workbench.OpenDocument(filePath, null, line.SomeOrDefault(0), column.SomeOrDefault(0)).Result;
var textView = TextViewFromDocument(document);
return FSharpOption.CreateForReference(textView);
}
return FSharpOption<ITextView>.None;
}
public void Make(bool jumpToFirstError, string arguments)
{
Dispatch(ProjectCommands.Build);
}
public bool NavigateTo(VirtualSnapshotPoint point)
{
var tuple = SnapshotPointUtil.GetLineNumberAndOffset(point.Position);
var line = tuple.Item1;
var column = tuple.Item2;
var buffer = point.Position.Snapshot.TextBuffer;
var fileName = GetName(buffer);
try
{
IdeApp.Workbench.OpenDocument(fileName, null, line, column).Wait(System.Threading.CancellationToken.None);
return true;
}
catch
{
return false;
}
}
public FSharpOption<ListItem> NavigateToListItem(ListKind listKind, NavigationKind navigationKind, FSharpOption<int> argumentOption, bool hasBang)
{
if (listKind == ListKind.Error)
{
var errors = IdeServices.TaskService.Errors;
if (errors.Count > 0)
{
var argument = argumentOption.IsSome() ? new int?(argumentOption.Value) : null;
var currentIndex = errors.CurrentLocationTask == null ? -1 : errors.IndexOf(errors.CurrentLocationTask);
var index = GetListItemIndex(navigationKind, argument, currentIndex, errors.Count);
if (index.HasValue)
{
var errorItem = errors.ElementAt(index.Value);
errors.CurrentLocationTask = errorItem;
errorItem.SelectInPad();
errorItem.JumpToPosition();
// Item number is one-based.
var listItem = new ListItem(index.Value + 1, errors.Count, errorItem.Message);
return FSharpOption.CreateForReference(listItem);
}
}
}
return FSharpOption<ListItem>.None;
}
/// <summary>
/// Convert the specified navigation instructions into an index for the
/// new list item
/// </summary>
/// <param name="navigationKind">the kind of navigation</param>
/// <param name="argument">an optional argument for the navigation</param>
/// <param name="current">the zero-based index of the current list item</param>
/// <param name="length">the length of the list</param>
/// <returns>a zero-based index into the list</returns>
private static int? GetListItemIndex(NavigationKind navigationKind, int? argument, int? current, int length)
{
var argumentOffset = argument ?? 1;
var currentIndex = current ?? -1;
var newIndex = -1;
// The 'first' and 'last' navigation kinds are one-based.
switch (navigationKind)
{
case NavigationKind.First:
newIndex = argument.HasValue ? argument.Value - 1 : 0;
break;
case NavigationKind.Last:
newIndex = argument.HasValue ? argument.Value - 1 : length - 1;
break;
case NavigationKind.Next:
newIndex = currentIndex + argumentOffset;
break;
case NavigationKind.Previous:
newIndex = currentIndex - argumentOffset;
break;
default:
Contract.Assert(false);
break;
}
if (newIndex >= 0 && newIndex < length)
{
return newIndex;
}
return null;
}
public bool OpenLink(string link)
{
return NSWorkspace.SharedWorkspace.OpenUrl(new NSUrl(link));
}
public void OpenListWindow(ListKind listKind)
{
if (listKind == ListKind.Error)
{
GotoPad("MonoDevelop.Ide.Gui.Pads.ErrorListPad");
return;
}
if (listKind == ListKind.Location)
{
// This abstraction is not quite right as VSMac can have multiple search results pads open
GotoPad("SearchPad - Search Results - 0");
return;
}
}
private void GotoPad(string padId)
{
var pad = IdeApp.Workbench.Pads.FirstOrDefault(p => p.Id == padId);
pad?.BringToFront(true);
}
public void Quit()
{
IdeApp.Exit();
}
public bool Reload(ITextView textView)
{
var doc = DocumentFromTextView(textView);
doc.Reload();
return true;
}
/// <summary>
/// Run the specified command on the supplied input, capture it's output and
/// return it to the caller
/// </summary>
public RunCommandResults RunCommand(string workingDirectory, string command, string arguments, string input)
{
// Use a (generous) timeout since we have no way to interrupt it.
var timeout = 30 * 1000;
// Avoid redirection for the 'open' command.
var doRedirect = !arguments.StartsWith("/c open ", StringComparison.CurrentCulture);
//TODO: '/c is CMD.exe specific'
if(arguments.StartsWith("/c ", StringComparison.CurrentCulture))
{
arguments = "-c " + arguments.Substring(3);
}
// Populate the start info.
var startInfo = new ProcessStartInfo
{
WorkingDirectory = workingDirectory,
FileName = "zsh",
Arguments = arguments,
UseShellExecute = false,
RedirectStandardInput = doRedirect,
RedirectStandardOutput = doRedirect,
RedirectStandardError = doRedirect,
CreateNoWindow = true,
};
// Start the process and tasks to manage the I/O.
try
{
var process = Process.Start(startInfo);
if (doRedirect)
{
var stdin = process.StandardInput;
var stdout = process.StandardOutput;
var stderr = process.StandardError;
var stdinTask = Task.Run(() => { stdin.Write(input); stdin.Close(); });
var stdoutTask = Task.Run(stdout.ReadToEnd);
var stderrTask = Task.Run(stderr.ReadToEnd);
if (process.WaitForExit(timeout))
{
return new RunCommandResults(process.ExitCode, stdoutTask.Result, stderrTask.Result);
}
}
else
{
if (process.WaitForExit(timeout))
{
return new RunCommandResults(process.ExitCode, String.Empty, String.Empty);
}
}
throw new TimeoutException();
}
catch (Exception ex)
{
return new RunCommandResults(-1, "", ex.Message);
}
}
public void RunCSharpScript(IVimBuffer vimBuffer, CallInfo callInfo, bool createEachTime)
{
- throw new NotImplementedException();
+ _scriptExecutor.Execute(vimBuffer, callInfo, createEachTime);
}
public void RunHostCommand(ITextView textView, string commandName, string argument)
{
Dispatch(commandName, argument);
}
public bool Save(ITextBuffer textBuffer)
{
var doc = DocumentFromTextBuffer(textBuffer);
try
{
doc.Save();
return true;
}
catch (Exception)
{
return false;
}
}
public bool SaveTextAs(string text, string filePath)
{
try
{
File.WriteAllText(filePath, text);
return true;
}
catch (Exception)
{
return false;
}
}
public bool ShouldCreateVimBuffer(ITextView textView)
{
return textView.Roles.Contains(PredefinedTextViewRoles.PrimaryDocument);
}
public bool ShouldIncludeRcFile(VimRcPath vimRcPath)
{
return File.Exists(vimRcPath.FilePath);
}
public void SplitViewHorizontally(ITextView value)
{
Dispatch("MonoDevelop.Ide.Commands.ViewCommands.SideBySideMode");
}
public void SplitViewVertically(ITextView value)
{
Dispatch("MonoDevelop.Ide.Commands.ViewCommands.SideBySideMode");
}
public void StartShell(string workingDirectory, string file, string arguments)
{
IdeServices.DesktopService.OpenTerminal(workingDirectory);
}
public bool TryCustomProcess(ITextView textView, InsertCommand command)
{
//throw new NotImplementedException();
return false;
}
public void VimCreated(IVim vim)
{
_vim = vim;
}
public void VimRcLoaded(VimRcState vimRcState, IVimLocalSettings localSettings, IVimWindowSettings windowSettings)
{
//throw new NotImplementedException();
}
bool Dispatch(object command, string argument = null)
{
try
{
return IdeApp.CommandService.DispatchCommand(command, argument);
}
catch
{
return false;
}
}
}
}
diff --git a/Src/VimMac/VimMac.csproj b/Src/VimMac/VimMac.csproj
index adcc731..2ef7a7f 100644
--- a/Src/VimMac/VimMac.csproj
+++ b/Src/VimMac/VimMac.csproj
@@ -1,40 +1,29 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<RootNamespace>Vim.Mac</RootNamespace>
<AssemblyName>Vim.Mac</AssemblyName>
<TargetFramework>net6.0-macos</TargetFramework>
<DefineConstants>$(DefineConstants);VS_SPECIFIC_MAC</DefineConstants>
<!-- Suppress warning CA1416 -->
<EnableNETAnalyzers>false</EnableNETAnalyzers>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\VimCore\VimCore.fsproj" />
<PackageReference Include="Microsoft.VisualStudioMac.Sdk" Version="17.0.0" />
+ <PackageReference Include="Microsoft.CodeAnalysis.Scripting" Version="4.3.0.0" />
</ItemGroup>
<ItemGroup>
<AddinReference Include="MonoDevelop.TextEditor" />
</ItemGroup>
- <ItemGroup>
- <Folder Include="Properties\" />
- <Folder Include="Resources\" />
- <Folder Include="FPFExtensions\" />
- <Folder Include="InlineRename\" />
- <Folder Include="RelativeLineNumbers\" />
- <Folder Include="RelativeLineNumbers\Util\" />
- </ItemGroup>
- <ItemGroup>
- <None Remove="Resources\beep.wav" />
- <None Remove="Resources\KeyBindingSchemeVim.xml" />
- </ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\beep.wav" />
<EmbeddedResource Include="Resources\KeyBindingSchemeVim.xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\VimWpf\Implementation\Misc\ClipboardDevice.cs">
<Link>ClipboardDevice.cs</Link>
</Compile>
</ItemGroup>
</Project>
|
VsVim/VsVim
|
1b7b18c6148c733a7236931459e5d1fe34b04455
|
Window management
|
diff --git a/Src/VimMac/Properties/AddinInfo.cs b/Src/VimMac/Properties/AddinInfo.cs
index bcdc9a0..181e98a 100644
--- a/Src/VimMac/Properties/AddinInfo.cs
+++ b/Src/VimMac/Properties/AddinInfo.cs
@@ -1,15 +1,15 @@
using System;
using Mono.Addins;
using Mono.Addins.Description;
[assembly: Addin(
"VsVim",
Namespace = "Vim.Mac",
- Version = "2.8.0.16"
+ Version = "2.8.0.17"
)]
[assembly: AddinName("VsVim")]
[assembly: AddinCategory("IDE extensions")]
[assembly: AddinUrl("https://github.com/VsVim/VsVim")]
[assembly: AddinDescription("VIM emulation layer for Visual Studio")]
[assembly: AddinAuthor("Jared Parsons")]
diff --git a/Src/VimMac/WindowManagement.cs b/Src/VimMac/WindowManagement.cs
index f1332af..d5d70c4 100644
--- a/Src/VimMac/WindowManagement.cs
+++ b/Src/VimMac/WindowManagement.cs
@@ -1,100 +1,111 @@
using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Linq;
using System.Reflection;
using MonoDevelop.Ide;
namespace Vim.Mac
{
/// <summary>
/// Represents the left or right group of tabs
/// </summary>
internal class Notebook
{
public Notebook(bool isActive, int activeTab, ImmutableArray<string> fileNames)
{
IsActive = isActive;
ActiveTab = activeTab;
FileNames = fileNames;
}
public bool IsActive { get; }
public int ActiveTab { get; }
public ImmutableArray<string> FileNames { get; }
}
internal static class WindowManagement
{
- const BindingFlags instanceFlags = BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public;
+ private const BindingFlags instanceFlags = BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public;
+ private const BindingFlags staticFlags = BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.Public;
- static object[] emptyArray = Array.Empty<object>();
+ private static object[] emptyArray = Array.Empty<object>();
+ private static object shellNotebook;
+ private static PropertyInfo activeNotebookProperty;
+
+ static WindowManagement()
+ {
+ // CocoaWorkbenchController
+ var shell = GetPropertyValue(IdeApp.Workbench, "Shell");
+
+ // IShellNotebook IShell.TabControl
+ shellNotebook = GetPropertyValueFromInterface(shell, "IShell", "TabControl");
+
+ // SdiDragNotebook : DockNotebookController
+ var dockNotebookControllerType = shellNotebook.GetType().BaseType;
+
+ // public static IShellNotebook ActiveNotebook
+ activeNotebookProperty = dockNotebookControllerType.GetProperty("ActiveNotebook", staticFlags);
+ }
/// <summary>
/// Utility function to map tabs and windows into a format that we can use
/// from the Mac VimHost
/// </summary>
public static ImmutableArray<Notebook> GetNotebooks()
{
- var workbench = IdeApp.Workbench.RootWindow;
- var workbenchType = workbench.GetType();
- var tabControlProp = workbenchType.GetProperty("TabControl", instanceFlags);
- var tabControl = tabControlProp.GetValue(workbench);
- var container = tabControlProp.PropertyType.GetProperty("Container", instanceFlags);
- var cont = container.GetValue(tabControl, null);
- var notebooks = (IEnumerable<object>)container.PropertyType.GetMethod("GetNotebooks", instanceFlags).Invoke(cont, emptyArray);
- return notebooks.Select(ToNotebook).ToImmutableArray();
- }
+ var activeNotebook = activeNotebookProperty.GetValue(shellNotebook);
- private static string GetTabFileName(object tab)
- {
- var tabType = tab.GetType();
- var fileName = (string)tabType.GetProperty("Tooltip", instanceFlags).GetValue(tab);
- return fileName;
- }
-
- private static Notebook ToNotebook(object container)
- {
- var notebookType = container.GetType();
- bool isActiveNotebook = IsActiveNotebook(container, notebookType);
+ // DockNotebookContainer Container { get; set; }
+ var container = GetPropertyValue(shellNotebook, "Container");
- int currentTab = (int)notebookType.GetProperty("CurrentTabIndex", instanceFlags).GetValue(container);
+ // public IEnumerable<IShellNotebook> GetNotebooks()
+ var notebookController = GetPropertyValue(container, "NotebookController");
+ var getNotebooksMethod = container.GetType().GetMethod("GetNotebooks");
+ var notebooks = (IEnumerable<object>)getNotebooksMethod.Invoke(container, null);
- var tabs = (IEnumerable<object>)notebookType.GetProperty("Tabs", instanceFlags).GetValue(container);
-
- var files = tabs.Select(GetTabFileName).ToImmutableArray();
+ return notebooks.Select(ToNotebook).ToImmutableArray();
- return new Notebook(isActiveNotebook, currentTab, files);
- }
+ Notebook ToNotebook(object container)
+ {
+ var tabs = ((IEnumerable<object>)GetPropertyValue(container, "Tabs")).ToArray();
+ var files = tabs.Select(GetTabFileName).ToImmutableArray();
+ var activeTab = 0;
- private static bool IsActiveNotebook(object container, Type notebookType)
- {
- var tabStripControllerProperty = notebookType.GetProperty("TabStripController", instanceFlags);
+ for(int index = 0; index < tabs.Length; index++)
+ {
+ var isActive = (bool)GetPropertyValue(tabs[index], "Active");
+ if (isActive)
+ {
+ activeTab = index;
+ break;
+ }
+ }
- bool isActiveNotebook = false;
- Type tabStripType;
+ return new Notebook(container == activeNotebook, activeTab, files);
+ }
- if (tabStripControllerProperty != null)
+ string GetTabFileName(object tab)
{
- var tabStripController = tabStripControllerProperty.GetValue(container);
- // VSMac 8.10+
- tabStripType = tabStripControllerProperty.PropertyType;
- isActiveNotebook = (bool)tabStripType.GetProperty("IsActiveNotebook").GetValue(tabStripController);
+ return (string)GetPropertyValue(tab, "Tooltip");
}
- else
- {
- // VSMac 8.9 and earlier
- var childrenProperty = notebookType.GetProperty("Children", instanceFlags);
- var children = (object[])childrenProperty.GetValue(container);
+ }
- if (children.Length > 0)
- {
- var tabStrip = children[0];
- tabStripType = tabStrip.GetType();
- isActiveNotebook = (bool)tabStripType.GetProperty("IsActiveNotebook").GetValue(tabStrip);
- }
- }
- return isActiveNotebook;
+ private static object GetPropertyValue(object o, string propertyName)
+ {
+ var objType = o.GetType();
+ var prop = objType.GetProperty(propertyName, instanceFlags);
+ var value = prop.GetValue(o);
+ return value;
+ }
+
+ private static object GetPropertyValueFromInterface(object o, string interfaceName, string propertyName)
+ {
+ var objType = o.GetType();
+ var interfaceType = objType.GetInterface(interfaceName);
+ var prop = interfaceType.GetProperty(propertyName, instanceFlags);
+ var value = prop.GetValue(o);
+ return value;
}
}
}
|
VsVim/VsVim
|
012766caa6fdb602745d450c64d799d7afb45b00
|
Add MonoDevelop.TextEditor Addin reference
|
diff --git a/Src/VimMac/VimMac.csproj b/Src/VimMac/VimMac.csproj
index 2733845..adcc731 100644
--- a/Src/VimMac/VimMac.csproj
+++ b/Src/VimMac/VimMac.csproj
@@ -1,37 +1,40 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<RootNamespace>Vim.Mac</RootNamespace>
<AssemblyName>Vim.Mac</AssemblyName>
<TargetFramework>net6.0-macos</TargetFramework>
<DefineConstants>$(DefineConstants);VS_SPECIFIC_MAC</DefineConstants>
<!-- Suppress warning CA1416 -->
<EnableNETAnalyzers>false</EnableNETAnalyzers>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\VimCore\VimCore.fsproj" />
<PackageReference Include="Microsoft.VisualStudioMac.Sdk" Version="17.0.0" />
</ItemGroup>
+ <ItemGroup>
+ <AddinReference Include="MonoDevelop.TextEditor" />
+ </ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
<Folder Include="Resources\" />
<Folder Include="FPFExtensions\" />
<Folder Include="InlineRename\" />
<Folder Include="RelativeLineNumbers\" />
<Folder Include="RelativeLineNumbers\Util\" />
</ItemGroup>
<ItemGroup>
<None Remove="Resources\beep.wav" />
<None Remove="Resources\KeyBindingSchemeVim.xml" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\beep.wav" />
<EmbeddedResource Include="Resources\KeyBindingSchemeVim.xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\VimWpf\Implementation\Misc\ClipboardDevice.cs">
<Link>ClipboardDevice.cs</Link>
</Compile>
</ItemGroup>
</Project>
|
VsVim/VsVim
|
b9099e002d344b1fbaee0df9a76aa306e82e68ce
|
Bump macOS on CI to 11 as 10.15 is deprecated
|
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c1cc69d..8eae6fc 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,104 +1,104 @@
# This is a basic workflow to help you get started with Actions
name: VsVim CI
on:
push:
branches: [ "master", "main" ]
tags:
- '*'
pull_request:
branches: [ "master", "main", "dev/gha" ]
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
jobs:
windows-build:
name: Windows Build and Test
runs-on: windows-2022
steps:
- uses: actions/checkout@v3
- name: Build
shell: powershell
run: Scripts\Build.ps1 -ci -config Debug -build
- name: Test
shell: powershell
run: Scripts\Build.ps1 -ci -config Debug -test
- name: Test Extra
shell: powershell
run: Scripts\Build.ps1 -ci -config Debug -testExtra
- name: Upload Artifacts
uses: actions/upload-artifact@v3
with:
name: Logs
path: Binaries\Logs
# This job is meant for building a Release VSIX for consumption and
# publishing it to two locations:
# - An Azure DevOps artifact for easy download / use on PR or CI
# - The Open VSIX gallery during CI
windows-publish:
name: Publish VSIX
runs-on: windows-2022
steps:
- uses: actions/checkout@v3
- name: Build VSIX
shell: powershell
run: Scripts\Build.ps1 -ci -build -updateVsixVersion -config Release
- name: Upload VSIX Artifacts
uses: actions/upload-artifact@v3
with:
name: Vsix
path: Binaries\Deploy
- name: Publish VSIX to Open VSIX Gallery
shell: powershell
run: Scripts\Build.ps1 -ci -uploadVsix -config Release
if: ${{ success() && github.ref == 'refs/heads/master' }}
macos-build:
name: MacOS Build and Publish
- runs-on: macOS-10.15
+ runs-on: macOS-11
steps:
# Must use fetch-depth 0 because the workflow requires that tags be present
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Set VERSION_TAG
run: echo "VERSION_TAG=`git describe --tags`" >> $GITHUB_ENV
- name: Set EXTENSION_VERSION
run: echo "EXTENSION_VERSION=`grep Version Src/VimMac/Properties/AddinInfo.cs | cut -d '\"' -f2`" >> $GITHUB_ENV
- name: Build
run: Scripts/build.sh
- name: Publish mpack
uses: actions/upload-artifact@v3
with:
name: VSMacExtension
path: 'Binaries/Debug/VimMac/net6.0-macos/Vim.Mac.VsVim_${{ env.EXTENSION_VERSION }}.mpack'
- name: Create VS Mac extension release
uses: softprops/action-gh-release@v1
id: vsmac_release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ env.VERSION_TAG }}
name: 'Visual Studio for Mac ${{ env.VERSION_TAG }}'
draft: false
generate_release_notes: true
files: 'Binaries/Debug/VimMac/net6.0-macos/Vim.Mac.VsVim_${{ env.EXTENSION_VERSION }}.mpack'
if: ${{ success() && startsWith(github.ref, 'refs/tags') && contains(github.ref, 'vsm') }}
|
VsVim/VsVim
|
4d4f984c6a19f4c650bdbb0eb836860d229b2fdd
|
Build on tag push
|
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index eebb65c..c1cc69d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,102 +1,104 @@
# This is a basic workflow to help you get started with Actions
name: VsVim CI
on:
push:
branches: [ "master", "main" ]
+ tags:
+ - '*'
pull_request:
branches: [ "master", "main", "dev/gha" ]
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
jobs:
windows-build:
name: Windows Build and Test
runs-on: windows-2022
steps:
- uses: actions/checkout@v3
- name: Build
shell: powershell
run: Scripts\Build.ps1 -ci -config Debug -build
- name: Test
shell: powershell
run: Scripts\Build.ps1 -ci -config Debug -test
- name: Test Extra
shell: powershell
run: Scripts\Build.ps1 -ci -config Debug -testExtra
- name: Upload Artifacts
uses: actions/upload-artifact@v3
with:
name: Logs
path: Binaries\Logs
# This job is meant for building a Release VSIX for consumption and
# publishing it to two locations:
# - An Azure DevOps artifact for easy download / use on PR or CI
# - The Open VSIX gallery during CI
windows-publish:
name: Publish VSIX
runs-on: windows-2022
steps:
- uses: actions/checkout@v3
- name: Build VSIX
shell: powershell
run: Scripts\Build.ps1 -ci -build -updateVsixVersion -config Release
- name: Upload VSIX Artifacts
uses: actions/upload-artifact@v3
with:
name: Vsix
path: Binaries\Deploy
- name: Publish VSIX to Open VSIX Gallery
shell: powershell
run: Scripts\Build.ps1 -ci -uploadVsix -config Release
if: ${{ success() && github.ref == 'refs/heads/master' }}
macos-build:
name: MacOS Build and Publish
runs-on: macOS-10.15
steps:
# Must use fetch-depth 0 because the workflow requires that tags be present
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Set VERSION_TAG
run: echo "VERSION_TAG=`git describe --tags`" >> $GITHUB_ENV
- name: Set EXTENSION_VERSION
run: echo "EXTENSION_VERSION=`grep Version Src/VimMac/Properties/AddinInfo.cs | cut -d '\"' -f2`" >> $GITHUB_ENV
- name: Build
run: Scripts/build.sh
- name: Publish mpack
uses: actions/upload-artifact@v3
with:
name: VSMacExtension
path: 'Binaries/Debug/VimMac/net6.0-macos/Vim.Mac.VsVim_${{ env.EXTENSION_VERSION }}.mpack'
- name: Create VS Mac extension release
uses: softprops/action-gh-release@v1
id: vsmac_release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ env.VERSION_TAG }}
name: 'Visual Studio for Mac ${{ env.VERSION_TAG }}'
draft: false
generate_release_notes: true
files: 'Binaries/Debug/VimMac/net6.0-macos/Vim.Mac.VsVim_${{ env.EXTENSION_VERSION }}.mpack'
if: ${{ success() && startsWith(github.ref, 'refs/tags') && contains(github.ref, 'vsm') }}
|
VsVim/VsVim
|
adb185cda23e21ce89ff4e05b2471b8b3f00fa90
|
Make the build work on vsmac 17.3
|
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a9de9dc..eebb65c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,102 +1,102 @@
# This is a basic workflow to help you get started with Actions
name: VsVim CI
on:
push:
branches: [ "master", "main" ]
pull_request:
branches: [ "master", "main", "dev/gha" ]
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
jobs:
windows-build:
name: Windows Build and Test
runs-on: windows-2022
steps:
- uses: actions/checkout@v3
- name: Build
shell: powershell
run: Scripts\Build.ps1 -ci -config Debug -build
- name: Test
shell: powershell
run: Scripts\Build.ps1 -ci -config Debug -test
- name: Test Extra
shell: powershell
run: Scripts\Build.ps1 -ci -config Debug -testExtra
- name: Upload Artifacts
uses: actions/upload-artifact@v3
with:
name: Logs
path: Binaries\Logs
# This job is meant for building a Release VSIX for consumption and
# publishing it to two locations:
# - An Azure DevOps artifact for easy download / use on PR or CI
# - The Open VSIX gallery during CI
windows-publish:
name: Publish VSIX
runs-on: windows-2022
steps:
- uses: actions/checkout@v3
- name: Build VSIX
shell: powershell
run: Scripts\Build.ps1 -ci -build -updateVsixVersion -config Release
- name: Upload VSIX Artifacts
uses: actions/upload-artifact@v3
with:
name: Vsix
path: Binaries\Deploy
- name: Publish VSIX to Open VSIX Gallery
shell: powershell
run: Scripts\Build.ps1 -ci -uploadVsix -config Release
if: ${{ success() && github.ref == 'refs/heads/master' }}
macos-build:
name: MacOS Build and Publish
runs-on: macOS-10.15
steps:
# Must use fetch-depth 0 because the workflow requires that tags be present
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Set VERSION_TAG
run: echo "VERSION_TAG=`git describe --tags`" >> $GITHUB_ENV
- name: Set EXTENSION_VERSION
run: echo "EXTENSION_VERSION=`grep Version Src/VimMac/Properties/AddinInfo.cs | cut -d '\"' -f2`" >> $GITHUB_ENV
- name: Build
run: Scripts/build.sh
- name: Publish mpack
uses: actions/upload-artifact@v3
with:
name: VSMacExtension
- path: 'Binaries/Debug/VimMac/net6.0/Vim.Mac.VsVim_${{ env.EXTENSION_VERSION }}.mpack'
+ path: 'Binaries/Debug/VimMac/net6.0-macos/Vim.Mac.VsVim_${{ env.EXTENSION_VERSION }}.mpack'
- name: Create VS Mac extension release
uses: softprops/action-gh-release@v1
id: vsmac_release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ env.VERSION_TAG }}
name: 'Visual Studio for Mac ${{ env.VERSION_TAG }}'
- draft: true
+ draft: false
generate_release_notes: true
- files: 'Binaries/Debug/VimMac/net6.0/Vim.Mac.VsVim_${{ env.EXTENSION_VERSION }}.mpack'
+ files: 'Binaries/Debug/VimMac/net6.0-macos/Vim.Mac.VsVim_${{ env.EXTENSION_VERSION }}.mpack'
if: ${{ success() && startsWith(github.ref, 'refs/tags') && contains(github.ref, 'vsm') }}
diff --git a/Scripts/build.sh b/Scripts/build.sh
index e36771d..b829719 100755
--- a/Scripts/build.sh
+++ b/Scripts/build.sh
@@ -1,28 +1,23 @@
echo "Downloading VSMac"
-wget --quiet https://download.visualstudio.microsoft.com/download/pr/a643750b-8690-4e7b-a088-9dfc3b2865ba/f315ac486e00a8c3954df7127c0bf526/visualstudioformac-preview-17.0.0.8001-pre.7-x64.dmg
+url="https://download.visualstudio.microsoft.com/download/pr/e81e04d3-768a-4310-9c9b-f32e8ba00eaa/889c20580d7989524e9b42726510452e/visualstudioformac-17.3.0.2102-x64.dmg"
+wget --quiet $url
-sudo hdiutil attach visualstudioformac-preview-17.0.0.8001-pre.7-x64.dmg
+hdiutil attach `basename $url`
-rm -rf ~/Library/Preferences/VisualStudio
-rm -rf ~/Library/Preferences/Visual\ Studio
-rm -rf ~/Library/Logs/VisualStudio
-rm -rf ~/Library/VisualStudio
-rm -rf ~/Library/Preferences/Xamarin/
-rm -rf ~/Library/Developer/Xamarin
-rm -rf ~/Library/Application\ Support/VisualStudio
+echo "Installing VSMac 17.3"
+ditto -rsrc "/Volumes/Visual Studio/" /Applications/
+ls -la /Applications/
-echo "Installing VSMac 17.0 Preview"
-ditto -rsrc "/Volumes/Visual Studio (Preview)/" /Applications/
-
-echo "Installing dotnet 6.0.1xx"
+echo "installing dotnet 6.0.3xx"
wget https://dot.net/v1/dotnet-install.sh
-bash dotnet-install.sh --channel 6.0.1xx
+bash dotnet-install.sh --channel 6.0.3xx
+sudo ~/.dotnet/dotnet workload install macos
echo "Building the extension"
-dotnet msbuild /p:Configuration=ReleaseMac /p:Platform="Any CPU" /t:Restore
+~/.dotnet/dotnet msbuild /p:Configuration=ReleaseMac /p:Platform="Any CPU" /t:Restore
cd Src/VimMac
-dotnet msbuild /p:Configuration=ReleaseMac /p:Platform="Any CPU" /t:Build
+~/.dotnet/dotnet msbuild /p:Configuration=ReleaseMac /p:Platform="Any CPU" /t:Build
echo "Creating and installing Extension"
# Generate mpack extension artifact
-dotnet msbuild VimMac.csproj /t:InstallAddin
+~/.dotnet/dotnet msbuild VimMac.csproj /t:InstallAddin
diff --git a/Src/VimMac/Properties/AddinInfo.cs b/Src/VimMac/Properties/AddinInfo.cs
index aa81ae3..bcdc9a0 100644
--- a/Src/VimMac/Properties/AddinInfo.cs
+++ b/Src/VimMac/Properties/AddinInfo.cs
@@ -1,15 +1,15 @@
using System;
using Mono.Addins;
using Mono.Addins.Description;
[assembly: Addin(
"VsVim",
Namespace = "Vim.Mac",
- Version = "0.8.0.15"
+ Version = "2.8.0.16"
)]
[assembly: AddinName("VsVim")]
[assembly: AddinCategory("IDE extensions")]
[assembly: AddinUrl("https://github.com/VsVim/VsVim")]
[assembly: AddinDescription("VIM emulation layer for Visual Studio")]
[assembly: AddinAuthor("Jared Parsons")]
diff --git a/Src/VimMac/VimMac.csproj b/Src/VimMac/VimMac.csproj
index bd0e8a3..2733845 100644
--- a/Src/VimMac/VimMac.csproj
+++ b/Src/VimMac/VimMac.csproj
@@ -1,40 +1,37 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<RootNamespace>Vim.Mac</RootNamespace>
<AssemblyName>Vim.Mac</AssemblyName>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net6.0-macos</TargetFramework>
<DefineConstants>$(DefineConstants);VS_SPECIFIC_MAC</DefineConstants>
<!-- Suppress warning CA1416 -->
<EnableNETAnalyzers>false</EnableNETAnalyzers>
</PropertyGroup>
- <ItemGroup>
- <AddinReference Include="MonoDevelop.TextEditor.Cocoa" />
- </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\VimCore\VimCore.fsproj" />
- <PackageReference Include="Microsoft.VisualStudioMac.Sdk" Version="17.0.0-preview.7955" />
+ <PackageReference Include="Microsoft.VisualStudioMac.Sdk" Version="17.0.0" />
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
<Folder Include="Resources\" />
<Folder Include="FPFExtensions\" />
<Folder Include="InlineRename\" />
<Folder Include="RelativeLineNumbers\" />
<Folder Include="RelativeLineNumbers\Util\" />
</ItemGroup>
<ItemGroup>
<None Remove="Resources\beep.wav" />
<None Remove="Resources\KeyBindingSchemeVim.xml" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\beep.wav" />
<EmbeddedResource Include="Resources\KeyBindingSchemeVim.xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\VimWpf\Implementation\Misc\ClipboardDevice.cs">
<Link>ClipboardDevice.cs</Link>
</Compile>
</ItemGroup>
</Project>
|
VsVim/VsVim
|
78f8d2085daddd94591c2b049c20f4ca399edfb1
|
Fix MemoryLeak tests
|
diff --git a/Test/VsVimSharedTest/MemoryLeakTest.cs b/Test/VsVimSharedTest/MemoryLeakTest.cs
index 4b50b92..82f0dbb 100644
--- a/Test/VsVimSharedTest/MemoryLeakTest.cs
+++ b/Test/VsVimSharedTest/MemoryLeakTest.cs
@@ -1,306 +1,322 @@
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.ComponentModel.Composition;
using System.ComponentModel.Composition.Hosting;
using System.Windows.Threading;
using Vim.EditorHost;
using Microsoft.VisualStudio;
using Microsoft.VisualStudio.Editor;
using Microsoft.VisualStudio.Shell;
using Microsoft.VisualStudio.Shell.Interop;
using Microsoft.VisualStudio.Text;
using Microsoft.VisualStudio.Text.Editor;
using Microsoft.VisualStudio.TextManager.Interop;
using Moq;
using Vim;
using Vim.Extensions;
using Vim.UI.Wpf;
using Vim.UnitTest;
using Vim.VisualStudio.UnitTest.Mock;
using Xunit;
using System.Threading;
using EnvDTE;
using Thread = System.Threading.Thread;
namespace Vim.VisualStudio.UnitTest
{
/// <summary>
/// At least a cursory attempt at getting memory leak detection into a unit test. By
/// no means a thorough example because I can't accurately simulate Visual Studio
/// integration without starting Visual Studio. But this should at least help me catch
/// a portion of them.
/// </summary>
public sealed class MemoryLeakTest : VsVimTestBase
{
#region Exports
#endregion
private readonly TestableSynchronizationContext _synchronizationContext;
public MemoryLeakTest()
{
_synchronizationContext = new TestableSynchronizationContext();
}
public override void Dispose()
{
try
{
_synchronizationContext.RunAll();
}
finally
{
_synchronizationContext.Dispose();
}
base.Dispose();
}
private void RunGarbageCollector()
{
for (var i = 0; i < 15; i++)
{
Dispatcher.CurrentDispatcher.DoEvents();
_synchronizationContext.RunAll();
GC.Collect(2, GCCollectionMode.Forced);
GC.WaitForPendingFinalizers();
GC.Collect(2, GCCollectionMode.Forced);
GC.Collect();
}
}
+ private void RunScenario(Func<WeakReference> func)
+ {
+ var weakReference = func();
+ RunGarbageCollector();
+ Assert.Null(weakReference.Target);
+ }
+
+ private void RunScenario(Func<IEnumerable<WeakReference>> func)
+ {
+ var list = func();
+ RunGarbageCollector();
+ foreach (var weakReference in list)
+ {
+ Assert.Null(weakReference.Target);
+ }
+ }
+
private void ClearHistory(ITextBuffer textBuffer)
{
if (VimEditorHost.BasicUndoHistoryRegistry.TryGetBasicUndoHistory(textBuffer, out IBasicUndoHistory basicUndoHistory))
{
basicUndoHistory.Clear();
}
}
private new IVimBuffer CreateVimBuffer(string[] roles = null)
{
var factory = VimEditorHost.CompositionContainer.GetExport<ITextEditorFactoryService>().Value;
ITextView textView;
if (roles is null)
{
textView = factory.CreateTextView();
}
else
{
var bufferFactory = VimEditorHost.CompositionContainer.GetExport<ITextBufferFactoryService>().Value;
var textViewRoles = factory.CreateTextViewRoleSet(roles);
textView = factory.CreateTextView(bufferFactory.CreateTextBuffer(), textViewRoles);
}
// Verify we actually created the IVimBuffer instance
var vimBuffer = VimEditorHost.Vim.GetOrCreateVimBuffer(textView);
Assert.NotNull(vimBuffer);
// Do one round of DoEvents since several services queue up actions to
// take immediately after the IVimBuffer is created
for (var i = 0; i < 10; i++)
{
Dispatcher.CurrentDispatcher.DoEvents();
}
// Force the buffer into normal mode if the WPF 'Loaded' event
// hasn't fired.
if (vimBuffer.ModeKind == ModeKind.Uninitialized)
{
vimBuffer.SwitchMode(vimBuffer.VimBufferData.VimTextBuffer.ModeKind, ModeArgument.None);
}
return vimBuffer;
}
/// <summary>
/// Make sure that we respect the host policy on whether or not an IVimBuffer should be created for a given
/// ITextView
///
/// This test is here because it's one of the few places where we load every component in every assembly into
/// our MEF container. This gives us the best chance of catching a random new component which accidentally
/// introduces a new IVimBuffer against the host policy
/// </summary>
[WpfFact]
public void RespectHostCreationPolicy()
{
var container = VimEditorHost.CompositionContainer;
var vsVimHost = container.GetExportedValue<VsVimHost>();
vsVimHost.DisableVimBufferCreation = true;
try
{
var factory = container.GetExportedValue<ITextEditorFactoryService>();
var textView = factory.CreateTextView();
var vim = container.GetExportedValue<IVim>();
Assert.False(vim.TryGetVimBuffer(textView, out IVimBuffer vimBuffer));
}
finally
{
vsVimHost.DisableVimBufferCreation = false;
}
}
/// <summary>
/// Run a sanity check which just tests the ability for an ITextView to be created
/// and closed without leaking memory that doesn't involve the creation of an
/// IVimBuffer
///
/// TODO: This actually creates an IVimBuffer instance. Right now IVim will essentially
/// create an IVimBuffer for every ITextView created hence one is created here. Need
/// to fix this so we have a base case to judge the memory leak tests by
/// </summary>
[WpfFact]
public void TextViewOnly()
{
- var container = VimEditorHost.CompositionContainer;
- var factory = container.GetExport<ITextEditorFactoryService>().Value;
- var textView = factory.CreateTextView();
- var weakReference = new WeakReference(textView);
- textView.Close();
- textView = null;
-
- RunGarbageCollector();
- Assert.Null(weakReference.Target);
+ RunScenario(() =>
+ {
+ var container = VimEditorHost.CompositionContainer;
+ var factory = container.GetExport<ITextEditorFactoryService>().Value;
+ var textView = factory.CreateTextView();
+ var weakReference = new WeakReference(textView);
+ textView.Close();
+ return weakReference;
+ });
}
/// <summary>
/// Run a sanity check which just tests the ability for an ITextViewHost to be created
/// and closed without leaking memory that doesn't involve the creation of an
/// IVimBuffer
/// </summary>
[WpfFact]
public void TextViewHostOnly()
{
- var container = VimEditorHost.CompositionContainer;
- var factory = container.GetExport<ITextEditorFactoryService>().Value;
- var textView = factory.CreateTextView();
- var textViewHost = factory.CreateTextViewHost(textView, setFocus: true);
- var weakReference = new WeakReference(textViewHost);
- textViewHost.Close();
- textView = null;
- textViewHost = null;
-
- RunGarbageCollector();
- Assert.Null(weakReference.Target);
+ RunScenario(() =>
+ {
+ var container = VimEditorHost.CompositionContainer;
+ var factory = container.GetExport<ITextEditorFactoryService>().Value;
+ var textView = factory.CreateTextView();
+ var textViewHost = factory.CreateTextViewHost(textView, setFocus: true);
+ var weakReference = new WeakReference(textViewHost);
+ textViewHost.Close();
+ return weakReference;
+ });
}
[WpfFact]
public void VimWpfDoesntHoldBuffer()
{
- var container = VimEditorHost.CompositionContainer;
- var factory = container.GetExport<ITextEditorFactoryService>().Value;
- var textView = factory.CreateTextView();
+ RunScenario(() =>
+ {
+ var container = VimEditorHost.CompositionContainer;
+ var factory = container.GetExport<ITextEditorFactoryService>().Value;
+ var textView = factory.CreateTextView();
- // Verify we actually created the IVimBuffer instance
- var vim = container.GetExport<IVim>().Value;
- var vimBuffer = vim.GetOrCreateVimBuffer(textView);
- Assert.NotNull(vimBuffer);
+ // Verify we actually created the IVimBuffer instance
+ var vim = container.GetExport<IVim>().Value;
+ var vimBuffer = vim.GetOrCreateVimBuffer(textView);
+ Assert.NotNull(vimBuffer);
- var weakVimBuffer = new WeakReference(vimBuffer);
- var weakTextView = new WeakReference(textView);
+ var weakVimBuffer = new WeakReference(vimBuffer);
+ var weakTextView = new WeakReference(textView);
- // Clean up
- ClearHistory(textView.TextBuffer);
- textView.Close();
- textView = null;
- Assert.True(vimBuffer.IsClosed);
- vimBuffer = null;
+ // Clean up
+ ClearHistory(textView.TextBuffer);
+ textView.Close();
+ Assert.True(vimBuffer.IsClosed);
- RunGarbageCollector();
- Assert.Null(weakVimBuffer.Target);
- Assert.Null(weakTextView.Target);
+ return new[] { weakVimBuffer, weakTextView };
+ });
}
[WpfFact]
public void VsVimDoesntHoldBuffer()
{
- var vimBuffer = CreateVimBuffer();
- var weakVimBuffer = new WeakReference(vimBuffer);
- var weakTextView = new WeakReference(vimBuffer.TextView);
+ RunScenario(() =>
+ {
+ var vimBuffer = CreateVimBuffer();
+ var weakVimBuffer = new WeakReference(vimBuffer);
+ var weakTextView = new WeakReference(vimBuffer.TextView);
- // Clean up
- vimBuffer.TextView.Close();
- vimBuffer = null;
+ // Clean up
+ vimBuffer.TextView.Close();
- RunGarbageCollector();
- Assert.Null(weakVimBuffer.Target);
- Assert.Null(weakTextView.Target);
+ return new[] { weakVimBuffer, weakTextView };
+ });
}
[WpfFact]
public void SetGlobalMarkAndClose()
{
- var vimBuffer = CreateVimBuffer();
- vimBuffer.MarkMap.SetMark(Mark.OfChar('a').Value, vimBuffer.VimBufferData, 0, 0);
- vimBuffer.MarkMap.SetMark(Mark.OfChar('A').Value, vimBuffer.VimBufferData, 0, 0);
- var weakVimBuffer = new WeakReference(vimBuffer);
- var weakTextView = new WeakReference(vimBuffer.TextView);
+ RunScenario(() =>
+ {
+ var vimBuffer = CreateVimBuffer();
+ vimBuffer.MarkMap.SetMark(Mark.OfChar('a').Value, vimBuffer.VimBufferData, 0, 0);
+ vimBuffer.MarkMap.SetMark(Mark.OfChar('A').Value, vimBuffer.VimBufferData, 0, 0);
+ var weakVimBuffer = new WeakReference(vimBuffer);
+ var weakTextView = new WeakReference(vimBuffer.TextView);
- // Clean up
- vimBuffer.TextView.Close();
- vimBuffer = null;
+ // Clean up
+ vimBuffer.TextView.Close();
- RunGarbageCollector();
- Assert.Null(weakVimBuffer.Target);
- Assert.Null(weakTextView.Target);
+ return new[] { weakVimBuffer, weakTextView };
+ });
}
/// <summary>
/// Change tracking is currently IVimBuffer specific. Want to make sure it's
/// not indirectly holding onto an IVimBuffer reference
/// </summary>
[WpfFact]
public void ChangeTrackerDoesntHoldTheBuffer()
{
- var vimBuffer = CreateVimBuffer();
- vimBuffer.TextBuffer.SetText("hello world");
- vimBuffer.Process("dw");
- var weakVimBuffer = new WeakReference(vimBuffer);
- var weakTextView = new WeakReference(vimBuffer.TextView);
-
- // Clean up
- ClearHistory(vimBuffer.TextBuffer);
- vimBuffer.TextView.Close();
- vimBuffer = null;
-
- RunGarbageCollector();
- Assert.Null(weakVimBuffer.Target);
- Assert.Null(weakTextView.Target);
+ RunScenario(() =>
+ {
+ var vimBuffer = CreateVimBuffer();
+ vimBuffer.TextBuffer.SetText("hello world");
+ vimBuffer.Process("dw");
+ var weakVimBuffer = new WeakReference(vimBuffer);
+ var weakTextView = new WeakReference(vimBuffer.TextView);
+
+ // Clean up
+ ClearHistory(vimBuffer.TextBuffer);
+ vimBuffer.TextView.Close();
+
+ return new[] { weakVimBuffer, weakTextView };
+ });
}
/// <summary>
/// Make sure the caching which comes with searching doesn't hold onto the buffer
/// </summary>
[WpfFact]
public void SearchCacheDoesntHoldTheBuffer()
{
- var vimBuffer = CreateVimBuffer();
- vimBuffer.TextBuffer.SetText("hello world");
- vimBuffer.Process("/world", enter: true);
-
- // This will kick off five search items on the thread pool, each of which
- // has a strong reference. Need to wait until they have all completed.
- var count = 0;
- while (count < 5)
+ RunScenario(() =>
{
- while (_synchronizationContext.PostedCallbackCount > 0)
+ var vimBuffer = CreateVimBuffer();
+ vimBuffer.TextBuffer.SetText("hello world");
+ vimBuffer.Process("/world", enter: true);
+
+ // This will kick off five search items on the thread pool, each of which
+ // has a strong reference. Need to wait until they have all completed.
+ var count = 0;
+ while (count < 5)
{
- _synchronizationContext.RunOne();
- count++;
- }
+ while (_synchronizationContext.PostedCallbackCount > 0)
+ {
+ _synchronizationContext.RunOne();
+ count++;
+ }
- Thread.Yield();
- }
+ Thread.Yield();
+ }
- var weakTextBuffer = new WeakReference(vimBuffer.TextBuffer);
+ var weakTextBuffer = new WeakReference(vimBuffer.TextBuffer);
- // Clean up
- vimBuffer.TextView.Close();
- vimBuffer = null;
+ // Clean up
+ vimBuffer.TextView.Close();
- RunGarbageCollector();
- Assert.Null(weakTextBuffer.Target);
+ return weakTextBuffer;
+ });
}
}
}
|
VsVim/VsVim
|
a875191cc585fa501bf8aa481a8875cd9428cf47
|
fix a inappropriate translation
|
diff --git a/README.ch.md b/README.ch.md
index 941afd6..3e9e609 100644
--- a/README.ch.md
+++ b/README.ch.md
@@ -1,22 +1,22 @@
VsVim
===
-VsVim æ¯ä¸ä¸ªå¯ä»¥å¨ **Visual Studio 2012** å° **Visual Studio 2022** ä¸ä½¿ç¨çå
è´¹ Vim 模ææ件ã
+VsVim æ¯ä¸ä¸ªå¯ä»¥å¨ **Visual Studio 2012** å° **Visual Studio 2022** ä¸å
费使ç¨ç Vim 模ææ件ã
[](https://github.com/VsVim/VsVim/actions/workflows/main.yml?branch=master)
## åä¸å¼å
VsVim å¯ä»¥ä½¿ç¨ **Visual Studio 2017** æ **Visual Studio 2019** è¿è¡å¼åãå
³äºå¼åæµç¨çç»èï¼è¯·æ¥é
[åä¸å¼å](https://github.com/VsVim/VsVim/blob/master/Documentation/Developing.md)ã
å¼åæ¶è¯·éµå¾ª [ç¼ç æå](https://github.com/VsVim/VsVim/blob/master/Documentation/CodingGuidelines.md)ã
## å¼æºåè®®
æ¤é¡¹ç®ä¸çææ代ç é½å **Apache 2 许å¯è¯** ä¿æ¤ï¼å
¶å为 **License.txt** çå¯æ¬ä¸æ¬æ件ä½äºåä¸ç®å½ä¸ã
## ææ°æ建çæ¬
ææ°æºä»£ç çæ建å¯ä»¥ä» [Open Vsix Gallery](http://vsixgallery.com/extension/VsVim.Microsoft.e214908b-0458-4ae2-a583-4310f29687c3/)ä¸è½½ã
For [English Version](README.md)
|
VsVim/VsVim
|
d07a62820c26790541ff8393b4f88caa46c13ee4
|
Mac OS Publishing (#2979)
|
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3302592..a9de9dc 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,64 +1,102 @@
# This is a basic workflow to help you get started with Actions
-name: CI
+name: VsVim CI
on:
push:
branches: [ "master", "main" ]
pull_request:
branches: [ "master", "main", "dev/gha" ]
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
jobs:
windows-build:
name: Windows Build and Test
runs-on: windows-2022
steps:
- uses: actions/checkout@v3
- name: Build
shell: powershell
run: Scripts\Build.ps1 -ci -config Debug -build
- name: Test
shell: powershell
run: Scripts\Build.ps1 -ci -config Debug -test
- name: Test Extra
shell: powershell
run: Scripts\Build.ps1 -ci -config Debug -testExtra
- name: Upload Artifacts
uses: actions/upload-artifact@v3
with:
name: Logs
path: Binaries\Logs
# This job is meant for building a Release VSIX for consumption and
# publishing it to two locations:
# - An Azure DevOps artifact for easy download / use on PR or CI
# - The Open VSIX gallery during CI
windows-publish:
name: Publish VSIX
runs-on: windows-2022
steps:
- uses: actions/checkout@v3
- name: Build VSIX
shell: powershell
run: Scripts\Build.ps1 -ci -build -updateVsixVersion -config Release
- name: Upload VSIX Artifacts
uses: actions/upload-artifact@v3
with:
name: Vsix
path: Binaries\Deploy
- name: Publish VSIX to Open VSIX Gallery
shell: powershell
run: Scripts\Build.ps1 -ci -uploadVsix -config Release
if: ${{ success() && github.ref == 'refs/heads/master' }}
+
+ macos-build:
+ name: MacOS Build and Publish
+ runs-on: macOS-10.15
+
+ steps:
+ # Must use fetch-depth 0 because the workflow requires that tags be present
+ - uses: actions/checkout@v3
+ with:
+ fetch-depth: 0
+
+ - name: Set VERSION_TAG
+ run: echo "VERSION_TAG=`git describe --tags`" >> $GITHUB_ENV
+
+ - name: Set EXTENSION_VERSION
+ run: echo "EXTENSION_VERSION=`grep Version Src/VimMac/Properties/AddinInfo.cs | cut -d '\"' -f2`" >> $GITHUB_ENV
+
+ - name: Build
+ run: Scripts/build.sh
+
+ - name: Publish mpack
+ uses: actions/upload-artifact@v3
+ with:
+ name: VSMacExtension
+ path: 'Binaries/Debug/VimMac/net6.0/Vim.Mac.VsVim_${{ env.EXTENSION_VERSION }}.mpack'
+
+ - name: Create VS Mac extension release
+ uses: softprops/action-gh-release@v1
+ id: vsmac_release
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ with:
+ tag_name: ${{ env.VERSION_TAG }}
+ name: 'Visual Studio for Mac ${{ env.VERSION_TAG }}'
+ draft: true
+ generate_release_notes: true
+ files: 'Binaries/Debug/VimMac/net6.0/Vim.Mac.VsVim_${{ env.EXTENSION_VERSION }}.mpack'
+ if: ${{ success() && startsWith(github.ref, 'refs/tags') && contains(github.ref, 'vsm') }}
diff --git a/Src/VimMac/Properties/AddinInfo.cs b/Src/VimMac/Properties/AddinInfo.cs
index 2e9a028..aa81ae3 100644
--- a/Src/VimMac/Properties/AddinInfo.cs
+++ b/Src/VimMac/Properties/AddinInfo.cs
@@ -1,15 +1,15 @@
using System;
using Mono.Addins;
using Mono.Addins.Description;
[assembly: Addin(
"VsVim",
Namespace = "Vim.Mac",
- Version = "2.8.0.15"
+ Version = "0.8.0.15"
)]
[assembly: AddinName("VsVim")]
[assembly: AddinCategory("IDE extensions")]
[assembly: AddinUrl("https://github.com/VsVim/VsVim")]
[assembly: AddinDescription("VIM emulation layer for Visual Studio")]
[assembly: AddinAuthor("Jared Parsons")]
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
deleted file mode 100644
index 76b66dc..0000000
--- a/azure-pipelines.yml
+++ /dev/null
@@ -1,114 +0,0 @@
-trigger:
- branches:
- include:
- - master
- - refs/tags/*
-
-pr:
-- dev/jaredpar/*
-- master
-
-# Standard CI loop (build and test). This will run against VSMac 17.0
-jobs:
-- job: macOS
- pool:
- vmImage: 'macOS-10.15'
- steps:
- - script: VERSION_TAG=`git describe --tags` && echo "##vso[task.setvariable variable=VERSION_TAG]$VERSION_TAG"
- displayName: Set the tag name as an environment variable
- - script: EXTENSION_VERSION=`grep Version Src/VimMac/Properties/AddinInfo.cs | cut -d "\"" -f2` && echo "##vso[task.setvariable variable=EXTENSION_VERSION]$EXTENSION_VERSION"
- displayName: Set the version number of the extension as an environment variable
-
- - task: Bash@3
- displayName: Build
- inputs:
- filePath: Scripts/build.sh
-
- - task: PublishBuildArtifacts@1
- inputs:
- pathToPublish: Binaries/Debug/VimMac/net6.0/Vim.Mac.VsVim_$(EXTENSION_VERSION).mpack
- artifactName: VSMacExtension
-
- - task: GitHubRelease@0
- condition: and(startsWith(variables['build.sourceBranch'], 'refs/tags/'), contains(variables['build.sourceBranch'], 'vsm'))
- inputs:
- displayName: 'Release VS Mac extension'
- gitHubConnection: automationConnection
- repositoryName: '$(Build.Repository.Name)'
- action: 'create'
- target: '$(Build.SourceVersion)'
- tagSource: 'auto'
- title: 'Visual Studio for Mac $(VERSION_TAG)'
- assets: Binaries/Debug/VimMac/net6.0/Vim.Mac.VsVim_$(EXTENSION_VERSION).mpack
- assetUploadMode: 'replace'
- isDraft: false
-
-# Standard CI loop (build and test). This will run against VS2017 and VS2019
-- job: VsVim_Build_Test
- pool:
- vmImage: 'windows-2022'
-
- steps:
-
- - task: PowerShell@2
- displayName: Build
- inputs:
- filePath: Scripts\Build.ps1
- arguments: -ci -config Debug -build
-
- - task: PowerShell@2
- displayName: Test
- inputs:
- filePath: Scripts\Build.ps1
- arguments: -ci -config Debug -test
-
- - task: PowerShell@2
- displayName: Test Extra
- inputs:
- filePath: Scripts\Build.ps1
- arguments: -ci -config Debug -testExtra
-
- - task: PublishPipelineArtifact@0
- displayName: Publish Logs
- inputs:
- targetPath: '$(Build.SourcesDirectory)\Binaries\Logs'
- artifactName: 'Logs Windows'
- condition: always()
-
- - task: PublishTestResults@2
- displayName: Publish xUnit Test Results
- inputs:
- testRunner: XUnit
- testResultsFiles: '$(Build.SourcesDirectory)\Binaries\xUnitResults\*.xml'
- mergeTestResults: true
- testRunTitle: 'VsVim Test Results'
- condition: always()
-
-# This job is meant for building a Release VSIX for consumption and
-# publishing it to two locations:
-# - An Azure DevOps artifact for easy download / use on PR or CI
-# - The Open VSIX gallery during CI
-- job: Produce_Vsix
- pool:
- vmImage: 'windows-2022'
-
- steps:
- - task: PowerShell@2
- displayName: Build
- inputs:
- filePath: Scripts\Build.ps1
- arguments: -ci -build -updateVsixVersion -config Release
-
- - task: PublishPipelineArtifact@0
- displayName: Publish Vsix
- inputs:
- targetPath: '$(Build.SourcesDirectory)\Binaries\Deploy'
- artifactName: 'Vsix'
-
- - task: PowerShell@2
- displayName: Publish to Open VSIX Gallery
- inputs:
- filePath: Scripts\Build.ps1
- arguments: -ci -uploadVsix -config Release
- condition: and(succeeded(), eq(variables['Build.SourceBranchName'], 'master'))
-
|
VsVim/VsVim
|
2483ef2904395ca6b1fa6f75931d17386a0fb51b
|
Publish steps (#2978)
|
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index eb243dc..3302592 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,36 +1,64 @@
# This is a basic workflow to help you get started with Actions
name: CI
on:
push:
branches: [ "master", "main" ]
pull_request:
branches: [ "master", "main", "dev/gha" ]
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
jobs:
- build:
+ windows-build:
+ name: Windows Build and Test
runs-on: windows-2022
steps:
- uses: actions/checkout@v3
- name: Build
shell: powershell
run: Scripts\Build.ps1 -ci -config Debug -build
- name: Test
shell: powershell
run: Scripts\Build.ps1 -ci -config Debug -test
- name: Test Extra
shell: powershell
run: Scripts\Build.ps1 -ci -config Debug -testExtra
- - uses: actions/upload-artifact@v3
+ - name: Upload Artifacts
+ uses: actions/upload-artifact@v3
with:
- name: Upload Artifacts
+ name: Logs
path: Binaries\Logs
+
+ # This job is meant for building a Release VSIX for consumption and
+ # publishing it to two locations:
+ # - An Azure DevOps artifact for easy download / use on PR or CI
+ # - The Open VSIX gallery during CI
+ windows-publish:
+ name: Publish VSIX
+ runs-on: windows-2022
+
+ steps:
+ - uses: actions/checkout@v3
+
+ - name: Build VSIX
+ shell: powershell
+ run: Scripts\Build.ps1 -ci -build -updateVsixVersion -config Release
+
+ - name: Upload VSIX Artifacts
+ uses: actions/upload-artifact@v3
+ with:
+ name: Vsix
+ path: Binaries\Deploy
+
+ - name: Publish VSIX to Open VSIX Gallery
+ shell: powershell
+ run: Scripts\Build.ps1 -ci -uploadVsix -config Release
+ if: ${{ success() && github.ref == 'refs/heads/master' }}
diff --git a/Scripts/Build.ps1 b/Scripts/Build.ps1
index 2f74940..877d192 100644
--- a/Scripts/Build.ps1
+++ b/Scripts/Build.ps1
@@ -1,349 +1,349 @@
param (
# Actions
[switch]$build = $false,
[switch]$test = $false,
[switch]$testExtra = $false,
[switch]$updateVsixVersion = $false,
[switch]$uploadVsix = $false,
[switch]$help = $false,
# Settings
[switch]$ci = $false,
[string]$config = "Debug",
[parameter(ValueFromRemainingArguments=$true)][string[]]$properties)
Set-StrictMode -version 2.0
$ErrorActionPreference="Stop"
[string]$rootDir = Split-Path -parent $MyInvocation.MyCommand.Definition
[string]$rootDir = Resolve-Path (Join-Path $rootDir "..")
[string]$binariesDir = Join-Path $rootDir "Binaries"
[string]$configDir = Join-Path $binariesDir $config
[string]$deployDir = Join-Path (Join-Path $binariesDir "Deploy") $config
[string]$logsDir = Join-Path $binariesDir "Logs"
[string]$toolsDir = Join-Path $rootDir "Tools"
[string[]]$vsVersions = @("2017", "2019", "2022")
function Print-Usage() {
Write-Host "Actions:"
Write-Host " -build Build VsVim"
Write-Host " -test Run unit tests"
Write-Host " -testExtra Run extra verification"
Write-Host " -updateVsixVersion Update the VSIX manifest version"
Write-Host " -uploadVsix Upload the VSIX to the Open Gallery"
Write-Host ""
Write-Host "Settings:"
Write-Host " -ci True when running in CI"
Write-Host " -config <value> Build configuration: 'Debug' or 'Release'"
}
# Toggle between human readable messages and Azure Pipelines messages based on
# our current environment.
# https://docs.microsoft.com/en-us/azure/devops/pipelines/scripts/logging-commands?view=azure-devops&tabs=powershell
function Write-TaskError([string]$message) {
if ($ci) {
Write-Host "##vso[task.logissue type=error]$message"
}
else {
Write-Host $message
}
}
# Meant to mimic the OpenVsix Gallery script for changing the VSIX version based
# on the Azure DevOps build environment
function Update-VsixVersion() {
- if ($env:BUILD_BUILDID -eq $null) {
- throw "The environment variable %BUILD_BUILDID% is not set"
+ if ($env:GITHUB_RUN_NUMBER -eq $null) {
+ throw "The environment variable %GITHUB_RUN_NUMBER% is not set"
}
- Write-Host "Updating VSIX version to include $($env:BUILD_BUILDID)"
+ Write-Host "Updating VSIX version to include $($env:GITHUB_RUN_NUMBER)"
foreach ($vsVersion in $vsVersions) {
Write-Host "Updating $vsVersion"
$vsixManifest = Join-Path $rootDir "Src/VsVim$($vsVersion)/source.extension.vsixmanifest"
[xml]$vsixXml = Get-Content $vsixManifest
$ns = New-Object System.Xml.XmlNamespaceManager $vsixXml.NameTable
$ns.AddNamespace("ns", $vsixXml.DocumentElement.NamespaceURI) | Out-Null
$attrVersion = $vsixXml.SelectSingleNode("//ns:Identity", $ns).Attributes["Version"]
[Version]$version = $attrVersion.Value
- $version = New-Object Version ([int]$version.Major),([int]$version.Minor),$env:BUILD_BUILDID
+ $version = New-Object Version ([int]$version.Major),([int]$version.Minor),$env:GITHUB_RUN_NUMBER
$attrVersion.InnerText = $version
$vsixXml.Save($vsixManifest) | Out-Null
}
}
# Meant to mimic the OpenVsix Gallery script for uploading the VSIX
function Upload-Vsix() {
- if ($env:BUILD_BUILDID -eq $null) {
+ if ($env:GITHUB_RUN_NUMBER -eq $null) {
throw "This is only meant to run in Azure DevOps"
}
Write-Host "Uploading VSIX to the Open Gallery"
foreach ($vsVersion in $vsVersions) {
Write-Host "Uploading $vsVersion"
$vsixFile = Join-Path $deployDir $vsVersion
$vsixFile = Join-Path $vsixFile "VsVim.vsix"
$vsixUploadEndpoint = "http://vsixgallery.com/api/upload"
$repoUrl = "https://github.com/VsVim/VsVim/"
[Reflection.Assembly]::LoadWithPartialName("System.Web") | Out-Null
$repo = [System.Web.HttpUtility]::UrlEncode($repoUrl)
$issueTracker = [System.Web.HttpUtility]::UrlEncode(($repoUrl + "issues/"))
[string]$url = ($vsixUploadEndpoint + "?repo=" + $repo + "&issuetracker=" + $issueTracker)
[byte[]]$bytes = [System.IO.File]::ReadAllBytes($vsixFile)
try {
$response = Invoke-WebRequest $url -Method Post -Body $bytes -UseBasicParsing
'OK' | Write-Host -ForegroundColor Green
}
catch{
'FAIL' | Write-TaskError
$_.Exception.Response.Headers["x-error"] | Write-TaskError
}
}
}
function Get-PackagesDir() {
$d = $null
if ($env:NUGET_PACKAGES -ne $null) {
$d = $env:NUGET_PACKAGES
}
else {
$d = Join-Path $env:UserProfile ".nuget\packages\"
}
Create-Directory $d
return $d
}
function Get-MSBuildPath() {
$vsWhere = Join-Path $toolsDir "vswhere.exe"
$vsInfo = Exec-Command $vsWhere "-latest -format json -requires Microsoft.Component.MSBuild" | Out-String | ConvertFrom-Json
# use first matching instance
$vsInfo = $vsInfo[0]
$vsInstallDir = $vsInfo.installationPath
$vsMajorVersion = $vsInfo.installationVersion.Split('.')[0]
$msbuildVersionDir = if ([int]$vsMajorVersion -lt 16) { "$vsMajorVersion.0" } else { "Current" }
return Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin\msbuild.exe"
}
# Test the contents of the Vsix to make sure it has all of the appropriate
# files
function Test-VsixContents() {
Write-Host "Verifying the Vsix Contents"
foreach ($vsVersion in $vsVersions) {
Write-Host "`tVerifying $vsVersion"
$vsixPath = Join-Path $deployDir $vsVersion
$vsixPath = Join-Path $vsixPath "VsVim.vsix"
if (-not (Test-Path $vsixPath)) {
throw "Vsix doesn't exist"
}
$expectedFiles = @(
"Colors.pkgdef",
"extension.vsixmanifest",
"License.txt",
"Vim.Core.dll",
"VsVim.dll",
"VsVim.pkgdef",
"VsVim_large.png",
"VsVim_small.png",
"VsVim_full.pdf",
"catalog.json",
"manifest.json",
"[Content_Types].xml")
# Make a folder to hold the foundFiles
$target = Join-Path ([IO.Path]::GetTempPath()) ([IO.Path]::GetRandomFileName())
Create-Directory $target
$zipUtil = Join-Path $rootDir "Tools\7za920\7za.exe"
Exec-Command $zipUtil "x -o$target $vsixPath" | Out-Null
$foundFiles = Get-ChildItem $target | %{ $_.Name }
if ($foundFiles.Count -ne $expectedFiles.Count) {
Write-TaskError "Found $($foundFiles.Count) but expected $($expectedFiles.Count)"
Write-TaskError "Wrong number of foundFiles in VSIX."
Write-TaskError "Extra foundFiles"
foreach ($file in $foundFiles) {
if (-not $expectedFiles.Contains($file)) {
Write-TaskError "`t$file"
}
}
Write-Host "Missing foundFiles"
foreach ($file in $expectedFiles) {
if (-not $foundFiles.Contains($file)) {
Write-TaskError "`t$file"
}
}
Write-TaskError "Location: $target"
}
}
foreach ($item in $expectedFiles) {
# Look for dummy foundFiles that made it into the VSIX instead of the
# actual DLL
$itemPath = Join-Path $target $item
if ($item.EndsWith("dll") -and ((get-item $itemPath).Length -lt 5kb)) {
throw "Small file detected $item in the zip file ($target)"
}
}
}
# Make sure that the version number is the same in all locations.
function Test-Version() {
Write-Host "Testing Version Numbers"
$version = $null;
foreach ($line in Get-Content "Src\VimCore\Constants.fs") {
if ($line -match 'let VersionNumber = "([\d.]*)"') {
$version = $matches[1]
break
}
}
if ($version -eq $null) {
throw "Couldn't determine the version from Constants.fs"
}
$foundPackageVersion = $false
foreach ($line in Get-Content "Src\VsVimShared\VsVimPackage.cs") {
if ($line -match 'productId: VimConstants.VersionNumber') {
$foundPackageVersion = $true
break
}
}
if (-not $foundPackageVersion) {
throw "Could not verify the version of VsVimPackage.cs"
}
foreach ($vsVersion in $vsVersions) {
$data = [xml](Get-Content "Src\VsVim$($vsVersion)\source.extension.vsixmanifest")
$manifestVersion = $data.PackageManifest.Metadata.Identity.Version
if ($manifestVersion -ne $version) {
throw "The version $version doesn't match up with the manifest version of $manifestVersion"
}
}
}
function Test-UnitTests() {
Write-Host "Running unit tests"
foreach ($vsVersion in $vsVersions) {
Write-Host "Running $vsVersion"
$resultsDir = Join-Path $binariesDir "xunitResults"
Create-Directory $resultsDir
$all = @(
"VimCoreTest$($vsVersion)\net472\Vim.Core.$($vsVersion).UnitTest.dll",
"VsVimTest$($vsVersion)\net472\Vim.VisualStudio.Shared.$($vsVersion).UnitTest.dll")
$xunit = Join-Path (Get-PackagesDir) "xunit.runner.console\2.4.1\tools\net472\xunit.console.x86.exe"
$anyFailed = $false
foreach ($filePath in $all) {
$filePath = Join-Path $configDir $filePath
$fileName = [IO.Path]::GetFileNameWithoutExtension($filePath)
$logFilePath = Join-Path $resultsDir "$($fileName).xml"
$arg = "$filePath -xml $logFilePath"
try {
Exec-Console $xunit $arg
}
catch {
$anyFailed = $true
}
}
}
if ($anyFailed) {
throw "Unit tests failed"
}
}
function Build-Solution(){
$msbuild = Get-MSBuildPath
Write-Host "Using MSBuild from $msbuild"
Write-Host "Building VsVim"
$binlogFilePath = Join-Path $logsDir "msbuild.binlog"
$args = "/nologo /restore /v:m /m /bl:$binlogFilePath /p:Configuration=$config VsVim.sln"
if ($ci) {
$args += " /p:DeployExtension=false"
}
Exec-Console $msbuild $args
Write-Host "Cleaning Vsix"
Create-Directory $deployDir
Push-Location $deployDir
try {
Remove-Item -re -fo "$deployDir\*"
foreach ($vsVersion in $vsVersions) {
Write-Host "`tCleaning $vsVersion"
$vsVersionDir = Join-Path $deployDir $vsVersion
Create-Directory $vsVersionDir
Set-Location $vsVersionDir
$sourcePath = Join-Path $configDir "VsVim$($vsVersion)\net472\VsVim.vsix"
Copy-Item $sourcePath "VsVim.orig.vsix"
Copy-Item $sourcePath "VsVim.vsix"
# Due to the way we build the VSIX there are many files included that we don't actually
# want to deploy. Here we will clear out those files and rebuild the VSIX without
# them
$cleanUtil = Join-Path $configDir "CleanVsix\net472\CleanVsix.exe"
Exec-Console $cleanUtil (Join-Path $vsVersionDir "VsVim.vsix")
Copy-Item "VsVim.vsix" "VsVim.zip"
Set-Location ..
}
}
finally {
Pop-Location
}
}
Push-Location $rootDir
try {
. "Scripts\Common-Utils.ps1"
if ($help -or ($properties -ne $null)) {
Print-Usage
exit 0
}
if ($updateVsixVersion) {
Update-VsixVersion
}
if ($build) {
Build-Solution
}
if ($test) {
Test-UnitTests
}
if ($testExtra) {
Test-VsixContents
Test-Version
}
if ($uploadVsix) {
Upload-Vsix
}
}
catch {
Write-TaskError "Error: $($_.Exception.Message)"
Write-TaskError $_.ScriptStackTrace
exit 1
}
finally {
Pop-Location
}
|
VsVim/VsVim
|
07ee719eec72f850c3f61ff3714268bf828dc55f
|
Initial Actions work (#2977)
|
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 0000000..eb243dc
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,36 @@
+# This is a basic workflow to help you get started with Actions
+
+name: CI
+
+on:
+ push:
+ branches: [ "master", "main" ]
+ pull_request:
+ branches: [ "master", "main", "dev/gha" ]
+
+ # Allows you to run this workflow manually from the Actions tab
+ workflow_dispatch:
+
+jobs:
+ build:
+ runs-on: windows-2022
+
+ steps:
+ - uses: actions/checkout@v3
+
+ - name: Build
+ shell: powershell
+ run: Scripts\Build.ps1 -ci -config Debug -build
+
+ - name: Test
+ shell: powershell
+ run: Scripts\Build.ps1 -ci -config Debug -test
+
+ - name: Test Extra
+ shell: powershell
+ run: Scripts\Build.ps1 -ci -config Debug -testExtra
+
+ - uses: actions/upload-artifact@v3
+ with:
+ name: Upload Artifacts
+ path: Binaries\Logs
|
VsVim/VsVim
|
703480bef2721015879eacf1644b5c9614a768e3
|
Push MS.VS.Threading into VimCore (#2973)
|
diff --git a/Src/VimCore/CoreInterfaces.fs b/Src/VimCore/CoreInterfaces.fs
index 40971e7..b9eb98e 100644
--- a/Src/VimCore/CoreInterfaces.fs
+++ b/Src/VimCore/CoreInterfaces.fs
@@ -1,521 +1,522 @@
#light
namespace Vim
open Microsoft.VisualStudio.Text
open Microsoft.VisualStudio.Text.Editor
open Microsoft.VisualStudio.Text.Operations
open Microsoft.VisualStudio.Text.Outlining
open Microsoft.VisualStudio.Text.Classification
open Microsoft.VisualStudio.Text.Tagging
+open Microsoft.VisualStudio.Threading
open Microsoft.VisualStudio.Utilities
open System.Diagnostics
open System.IO
open System.Runtime.CompilerServices
open System.Runtime.InteropServices
open System.Threading.Tasks
open Vim.Interpreter
open System
[<RequireQualifiedAccess>]
[<NoComparison>]
type CaretMovement =
| Up
| Right
| Down
| Left
| Home
| End
| PageUp
| PageDown
| ControlUp
| ControlRight
| ControlDown
| ControlLeft
| ControlHome
| ControlEnd
with
static member OfDirection direction =
match direction with
| Direction.Up -> CaretMovement.Up
| Direction.Right -> CaretMovement.Right
| Direction.Down -> CaretMovement.Down
| Direction.Left -> CaretMovement.Left
| _ -> raise (Contract.GetInvalidEnumException direction)
type TextViewEventArgs(_textView: ITextView) =
inherit System.EventArgs()
member x.TextView = _textView
type VimRcKind =
| VimRc = 0
| VsVimRc = 1
type VimRcPath = {
/// Which type of file was loaded
VimRcKind: VimRcKind
/// Full path to the file which the contents were loaded from
FilePath: string
}
[<RequireQualifiedAccess>]
type VimRcState =
/// The VimRc file has not been processed at this point
| None
/// The load succeeded of the specified file. If there were any errors actually
/// processing the load they will be captured in the string[] parameter.
/// The load succeeded and the specified file was used
| LoadSucceeded of VimRcPath: VimRcPath * Errors: string[]
/// The load failed
| LoadFailed
[<RequireQualifiedAccess>]
[<NoComparison>]
type ChangeCharacterKind =
/// Switch the characters to upper case
| ToUpperCase
/// Switch the characters to lower case
| ToLowerCase
/// Toggle the case of the characters
| ToggleCase
/// Rot13 encode the letters
| Rot13
type IStatusUtil =
/// Raised when there is a special status message that needs to be reported
abstract OnStatus: string -> unit
/// Raised when there is a long status message that needs to be reported
abstract OnStatusLong: string seq -> unit
/// Raised when there is an error message that needs to be reported
abstract OnError: string -> unit
/// Raised when there is a warning message that needs to be reported
abstract OnWarning: string -> unit
/// Abstracts away VsVim's interaction with the file system to facilitate testing
type IFileSystem =
/// Create the specified directory, returns true if it was actually created
abstract CreateDirectory: path: string -> bool
/// Get the directories to probe for RC files
abstract GetVimRcDirectories: unit -> string[]
/// Get the possible paths for a vimrc file in the order they should be
/// considered
abstract GetVimRcFilePaths: unit -> VimRcPath[]
/// Attempt to read all of the lines from the given file
abstract ReadAllLines: filePath: string -> string[] option
/// Read the contents of the directory
abstract ReadDirectoryContents: directoryPath: string -> string[] option
abstract Read: filePath: string -> Stream option
abstract Write: filePath: string -> stream: Stream -> bool
/// Used for manipulating multiple selections
type ISelectionUtil =
/// Whether multi-selection is supported
abstract IsMultiSelectionSupported: bool
/// Get all the selected spans for the specified text view
abstract GetSelectedSpans: unit -> SelectionSpan seq
/// Set all the selected spans for the specified text view
abstract SetSelectedSpans: selectedSpans: SelectionSpan seq -> unit
/// Factory service for creating ISelectionUtil instances
type ISelectionUtilFactory =
/// Get the selection utility interface
abstract GetSelectionUtil: textView: ITextView -> ISelectionUtil
/// Service for creating ISelectionUtilFactory instances
type ISelectionUtilFactoryService =
/// Get the selection utility interface
abstract GetSelectionUtilFactory: unit -> ISelectionUtilFactory
/// Used to display a word completion list to the user
type IWordCompletionSession =
inherit IPropertyOwner
/// Is the session dismissed
abstract IsDismissed: bool
/// The associated ITextView instance
abstract TextView: ITextView
/// Select the next word in the session
abstract MoveNext: unit -> bool
/// Select the previous word in the session.
abstract MovePrevious: unit -> bool
/// Commit the current session
abstract Commit: unit -> unit
/// Dismiss the completion session
abstract Dismiss: unit -> unit
/// Raised when the session is dismissed
[<CLIEvent>]
abstract Dismissed: IDelegateEvent<System.EventHandler>
type WordCompletionSessionEventArgs(_wordCompletionSession: IWordCompletionSession) =
inherit System.EventArgs()
member x.WordCompletionSession = _wordCompletionSession
/// Factory for creating a IWordCompletionSession instance.
type IWordCompletionSessionFactory =
/// Create a session with the given set of words
abstract CreateWordCompletionSession: textView: ITextView -> wordSpan: SnapshotSpan -> words: string seq -> isForward: bool -> IWordCompletionSession option
/// Factory service for creating IWordCompletionSession instances. This type is available as
/// a MEF import
type IWordCompletionSessionFactoryService =
/// Create a session with the given set of words
abstract CreateWordCompletionSession: textView: ITextView -> wordSpan: SnapshotSpan -> words: string seq -> isForward: bool -> IWordCompletionSession option
/// Raised when the session is created
[<CLIEvent>]
abstract Created: IDelegateEvent<System.EventHandler<WordCompletionSessionEventArgs>>
/// Wraps an ITextUndoTransaction so we can avoid all of the null checks
type IUndoTransaction =
/// Call when it completes
abstract Complete: unit -> unit
/// Cancels the transaction
abstract Cancel: unit -> unit
inherit System.IDisposable
/// This is a IUndoTransaction that is specific to a given ITextView instance
type ITextViewUndoTransaction =
/// Adds an ITextUndoPrimitive which will reset the selection to the current
/// state when redoing this edit
abstract AddAfterTextBufferChangePrimitive: unit -> unit
/// Adds an ITextUndoPrimitive which will reset the selection to the current
/// state when undoing this change
abstract AddBeforeTextBufferChangePrimitive: unit -> unit
inherit IUndoTransaction
/// Flags controlling the linked undo transaction behavior
[<System.Flags>]
type LinkedUndoTransactionFlags =
| None = 0x0
| CanBeEmpty = 0x1
| EndsWithInsert = 0x2
/// Wraps a set of IUndoTransaction items such that they undo and redo as a single
/// entity.
type ILinkedUndoTransaction =
/// Complete the linked operation
abstract Complete: unit -> unit
inherit System.IDisposable
/// Wraps all of the undo and redo operations
type IUndoRedoOperations =
abstract TextUndoHistory: ITextUndoHistory option
/// Is there an open linked undo transaction
abstract InLinkedUndoTransaction: bool
/// StatusUtil instance that is used to report errors
abstract StatusUtil: IStatusUtil
/// Close the IUndoRedoOperations and remove any attached event handlers
abstract Close: unit -> unit
/// Creates an Undo Transaction
abstract CreateUndoTransaction: name: string -> IUndoTransaction
/// Creates an Undo Transaction specific to the given ITextView. Use when operations
/// like caret position need to be a part of the undo / redo stack
abstract CreateTextViewUndoTransaction: name: string -> textView: ITextView -> ITextViewUndoTransaction
/// Creates a linked undo transaction
abstract CreateLinkedUndoTransaction: name: string -> ILinkedUndoTransaction
/// Creates a linked undo transaction with flags
abstract CreateLinkedUndoTransactionWithFlags: name: string -> flags: LinkedUndoTransactionFlags -> ILinkedUndoTransaction
/// Wrap the passed in "action" inside an undo transaction. This is needed
/// when making edits such as paste so that the cursor will move properly
/// during an undo operation
abstract EditWithUndoTransaction: name: string -> textView: ITextView -> action: (unit -> 'T) -> 'T
/// Redo the last "count" operations
abstract Redo: count:int -> unit
/// Undo the last "count" operations
abstract Undo: count:int -> unit
/// Represents a set of changes to a contiguous region.
[<RequireQualifiedAccess>]
type TextChange =
| DeleteLeft of Count: int
| DeleteRight of Count: int
| Insert of Text: string
| Combination of Left: TextChange * Right: TextChange
with
/// Get the insert text resulting from the change if there is any
member x.InsertText =
let rec inner textChange (text: string) =
match textChange with
| Insert data -> text + data |> Some
| DeleteLeft count ->
if count > text.Length then
None
else
text.Substring(0, text.Length - count) |> Some
| DeleteRight _ -> None
| Combination (left, right) ->
match inner left text with
| None -> None
| Some text -> inner right text
inner x StringUtil.Empty
/// Get the last / most recent change in the TextChange tree
member x.LastChange =
match x with
| DeleteLeft _ -> x
| DeleteRight _ -> x
| Insert _ -> x
| Combination (_, right) -> right.LastChange
member x.IsEmpty =
match x with
| Insert text -> StringUtil.IsNullOrEmpty text
| DeleteLeft count -> count = 0
| DeleteRight count -> count = 0
| Combination (left, right) -> left.IsEmpty && right.IsEmpty
member x.Reduce =
match x with
| Combination (left, right) ->
match TextChange.ReduceCore left right with
| Some reduced -> reduced
| None -> x
| _ -> x
/// Merge two TextChange values together. The goal is to produce a the smallest TextChange
/// value possible. This will return Some if a reduction is made and None if there is
/// no possible reduction
static member private ReduceCore left right =
// This is called for combination merges. Some progress was made but it's possible further
// progress could be made by reducing the specified values. If further progress can be made
// keep it else keep at least the progress already made
let tryReduceAgain left right =
Some (TextChange.CreateReduced left right)
// Insert can only merge with a previous insert operation. It can't
// merge with any deletes that came before it
let reduceInsert before (text: string) =
match before with
| Insert otherText -> Some (Insert (otherText + text))
| _ -> None
// DeleteLeft can merge with deletes and previous insert operations.
let reduceDeleteLeft before count =
match before with
| Insert otherText ->
if count <= otherText.Length then
let text = otherText.Substring(0, otherText.Length - count)
Some (Insert text)
else
let count = count - otherText.Length
Some (DeleteLeft count)
| DeleteLeft beforeCount -> Some (DeleteLeft (count + beforeCount))
| _ -> None
// Delete right can merge only with other DeleteRight operations
let reduceDeleteRight before count =
match before with
| DeleteRight beforeCount -> Some (DeleteRight (beforeCount + count))
| _ -> None
// The item on the left isn't a Combination item. So do simple merge semantics
let simpleMerge () =
match right with
| Insert text -> reduceInsert left text
| DeleteLeft count -> reduceDeleteLeft left count
| DeleteRight count -> reduceDeleteRight left count
| Combination (rightSubLeft, rightSubRight) ->
// First just see if the combination itself can be reduced
match TextChange.ReduceCore rightSubLeft rightSubRight with
| Some reducedTextChange -> tryReduceAgain left reducedTextChange
| None ->
match TextChange.ReduceCore left rightSubLeft with
| None -> None
| Some reducedTextChange -> tryReduceAgain reducedTextChange rightSubRight
// The item on the left is a Combination item.
let complexMerge leftSubLeft leftSubRight =
// First check if the left can be merged against itself. This can easily happen
// for hand built trees
match TextChange.ReduceCore leftSubLeft leftSubRight with
| Some reducedTextChange -> tryReduceAgain reducedTextChange right
| None ->
// It can't be reduced. Still a change that the right can be reduced against
// the subRight value
match TextChange.ReduceCore leftSubRight right with
| None -> None
| Some reducedTextChange -> tryReduceAgain leftSubLeft reducedTextChange
if left.IsEmpty then
Some right
elif right.IsEmpty then
Some left
else
match left with
| Insert _ -> simpleMerge ()
| DeleteLeft _ -> simpleMerge ()
| DeleteRight _ -> simpleMerge ()
| Combination (leftSubLeft, leftSubRight) -> complexMerge leftSubLeft leftSubRight
static member Replace str =
let left = str |> StringUtil.Length |> TextChange.DeleteLeft
let right = TextChange.Insert str
TextChange.Combination (left, right)
static member CreateReduced left right =
match TextChange.ReduceCore left right with
| None -> Combination (left, right)
| Some textChange -> textChange
type TextChangeEventArgs(_textChange: TextChange) =
inherit System.EventArgs()
member x.TextChange = _textChange
[<System.Flags>]
type SearchOptions =
| None = 0x0
/// Consider the "ignorecase" option when doing the search
| ConsiderIgnoreCase = 0x1
/// Consider the "smartcase" option when doing the search
| ConsiderSmartCase = 0x2
/// Whether to include the start point when doing the search
| IncludeStartPoint = 0x4
/// ConsiderIgnoreCase ||| ConsiderSmartCase
| Default = 0x3
/// Information about a search of a pattern
type PatternData = {
/// The Pattern to search for
Pattern: string
/// The direction in which the pattern was searched for
Path: SearchPath
}
type PatternDataEventArgs(_patternData: PatternData) =
inherit System.EventArgs()
member x.PatternData = _patternData
/// An incremental search can be augmented with a offset of characters or a line
/// count. This is described in full in :help searh-offset'
[<RequireQualifiedAccess>]
[<StructuralEquality>]
[<NoComparison>]
[<DebuggerDisplay("{ToString(),nq}")>]
type SearchOffsetData =
| None
| Line of Line: int
| Start of Start: int
| End of End: int
| Search of PatternData: PatternData
with
static member private ParseCore (offset: string) =
Contract.Requires (offset.Length > 0)
let index = ref 0
let isForward = ref true
let movePastPlusOrMinus () =
if index.Value < offset.Length then
match offset.[index.Value] with
| '+' ->
isForward := true
index := index.Value + 1
true
| '-' ->
isForward := false
index := index.Value + 1
true
| _ -> false
else
false
let parseNumber () =
if movePastPlusOrMinus () && index.Value = offset.Length then
// a single + or - counts as a value if it's not followed by
// a number
if isForward.Value then 1
else -1
else
// parse out the digits after the value
let mutable num = 0
let mutable isBad = index.Value >= offset.Length
while index.Value < offset.Length do
num <- num * 10
match CharUtil.GetDigitValue (offset.[index.Value]) with
| Option.None ->
isBad <- true
index := offset.Length
| Option.Some d ->
num <- num + d
index := index.Value + 1
if isBad then
0
elif isForward.Value then
num
else
-num
let parseLine () =
let number = parseNumber ()
SearchOffsetData.Line number
@@ -5618,524 +5619,526 @@ and IVimTextBuffer =
abstract InSelectModeOneTimeCommand: bool with get, set
/// The set of active local marks in the ITextBuffer
abstract LocalMarks: (LocalMark * VirtualSnapshotPoint) seq
/// The associated IVimLocalSettings instance
abstract LocalSettings: IVimLocalSettings
/// The associated abbreviation map
abstract LocalAbbreviationMap: IVimLocalAbbreviationMap
/// The associated key map
abstract LocalKeyMap: IVimLocalKeyMap
/// ModeKind of the current mode of the IVimTextBuffer. It may seem odd at first to put ModeKind
/// at this level but it is indeed shared amongst all views. This can be demonstrated by opening
/// the same file in multiple tabs, switch to insert in one and then move to the other via the
/// mouse and noting it is also in Insert mode. Actual IMode values are ITextView specific though
/// and only live at the ITextView level
abstract ModeKind: ModeKind
/// Name of the buffer. Used for items like Marks
abstract Name: string
/// The IUndoRedoOperations associated with the IVimTextBuffer
abstract UndoRedoOperations: IUndoRedoOperations
/// The associated IVim instance
abstract Vim: IVim
/// The WordUtil for this IVimTextBuffer
abstract WordUtil: WordUtil
/// The ITextStructureNavigator for word values in the ITextBuffer
abstract WordNavigator: ITextStructureNavigator
/// Whether to use virtual space
abstract UseVirtualSpace: bool
/// Check the contents of the buffer for a modeline, returning a tuple of
/// the line we used as a modeline, if any, and a string representing the
/// first sub-option that produced an error if any
abstract CheckModeLine: WindowSettings: IVimWindowSettings -> string option * string option
/// Clear out all of the cached information in the IVimTextBuffer. It will reset to it's startup
/// state
abstract Clear: unit -> unit
/// Get the local mark value
abstract GetLocalMark: localMark: LocalMark -> VirtualSnapshotPoint option
/// Set the local mark value to the specified line and column. Returns false if the given
/// mark cannot be set
abstract SetLocalMark: localMark: LocalMark -> lineNumber: int -> offset: int -> bool
/// Remove the specified local mark. Returns whether a mark was actually removed
abstract RemoveLocalMark: localMark: LocalMark -> bool
/// Switch the current mode to the provided value
abstract SwitchMode: ModeKind -> ModeArgument -> unit
/// Raised when the mode is switched. Returns the old and new mode
[<CLIEvent>]
abstract SwitchedMode: IDelegateEvent<System.EventHandler<SwitchModeKindEventArgs>>
/// Raised when a mark is set
[<CLIEvent>]
abstract MarkSet: IDelegateEvent<System.EventHandler<MarkTextBufferEventArgs>>
/// Main interface for the Vim editor engine so to speak.
and IVimBuffer =
/// Sequence of available Modes
abstract AllModes: seq<IMode>
/// Buffered KeyInput list. When a key remapping has multiple source elements the input
/// is buffered until it is completed or the ambiguity is removed.
abstract BufferedKeyInputs: KeyInput list
/// The current directory for this particular buffer
abstract CurrentDirectory: string option with get, set
/// The ICommandUtil for this IVimBuffer
abstract CommandUtil: ICommandUtil
/// Global settings for the buffer
abstract GlobalSettings: IVimGlobalSettings
/// IIncrementalSearch instance associated with this IVimBuffer
abstract IncrementalSearch: IIncrementalSearch
/// Whether or not the IVimBuffer is currently processing a KeyInput value
abstract IsProcessingInput: bool
/// Whether or not the IVimBuffer is currently switching modes
abstract IsSwitchingMode: bool
/// Is this IVimBuffer instance closed
abstract IsClosed: bool
/// Jump list
abstract JumpList: IJumpList
/// The last status message produced, if any
abstract LastMessage: string option
/// Local settings for the buffer
abstract LocalSettings: IVimLocalSettings
/// The associated abbreviation map
abstract LocalAbbreviationMap: IVimLocalAbbreviationMap
/// The associated key map
abstract LocalKeyMap: IVimLocalKeyMap
/// Associated IMarkMap
abstract MarkMap: IMarkMap
/// Current mode of the buffer
abstract Mode: IMode
/// ModeKind of the current IMode in the buffer
abstract ModeKind: ModeKind
/// Name of the buffer. Used for items like Marks
abstract Name: string
/// If we are in the middle of processing a "one time command" (<c-o>) then this will
/// hold the ModeKind which will be switched back to after it's completed
abstract InOneTimeCommand: ModeKind option
/// Register map for IVim. Global to all IVimBuffer instances but provided here
/// for convenience
abstract RegisterMap: IRegisterMap
/// Underlying ITextBuffer Vim is operating under
abstract TextBuffer: ITextBuffer
/// Current ITextSnapshot of the ITextBuffer
abstract TextSnapshot: ITextSnapshot
/// View of the file
abstract TextView: ITextView
/// The IMotionUtil associated with this IVimBuffer instance
abstract MotionUtil: IMotionUtil
/// The IUndoRedoOperations associated with this IVimBuffer instance
abstract UndoRedoOperations: IUndoRedoOperations
/// Owning IVim instance
abstract Vim: IVim
/// Associated IVimTextBuffer
abstract VimTextBuffer: IVimTextBuffer
/// VimBufferData for the given IVimBuffer
abstract VimBufferData: IVimBufferData
/// The ITextStructureNavigator for word values in the buffer
abstract WordNavigator: ITextStructureNavigator
/// Associated IVimWindowSettings
abstract WindowSettings: IVimWindowSettings
/// Associated IVimData instance
abstract VimData: IVimData
/// INormalMode instance for normal mode
abstract NormalMode: INormalMode
/// ICommandMode instance for command mode
abstract CommandMode: ICommandMode
/// IDisabledMode instance for disabled mode
abstract DisabledMode: IDisabledMode
/// IVisualMode for visual character mode
abstract VisualCharacterMode: IVisualMode
/// IVisualMode for visual line mode
abstract VisualLineMode: IVisualMode
/// IVisualMode for visual block mode
abstract VisualBlockMode: IVisualMode
/// IInsertMode instance for insert mode
abstract InsertMode: IInsertMode
/// IInsertMode instance for replace mode
abstract ReplaceMode: IInsertMode
/// ISelectMode instance for character mode
abstract SelectCharacterMode: ISelectMode
/// ISelectMode instance for line mode
abstract SelectLineMode: ISelectMode
/// ISelectMode instance for block mode
abstract SelectBlockMode: ISelectMode
/// ISubstituteConfirmDoe instance for substitute confirm mode
abstract SubstituteConfirmMode: ISubstituteConfirmMode
/// IMode instance for external edits
abstract ExternalEditMode: IMode
/// Get the register of the given name
abstract GetRegister: RegisterName -> Register
/// Get the specified Mode
abstract GetMode: ModeKind -> IMode
/// Get the KeyInput value produced by this KeyInput in the current state of the
/// IVimBuffer. This will consider any buffered KeyInput values.
abstract GetKeyInputMapping: keyInput: KeyInput -> KeyMappingResult
/// Process the KeyInput and return whether or not the input was completely handled
abstract Process: KeyInput -> ProcessResult
/// Process all of the buffered KeyInput values.
abstract ProcessBufferedKeyInputs: unit -> unit
/// Can the passed in KeyInput be processed by the current state of IVimBuffer. The
/// provided KeyInput will participate in remapping based on the current mode
abstract CanProcess: KeyInput -> bool
/// Can the passed in KeyInput be processed as a Vim command by the current state of
/// the IVimBuffer. The provided KeyInput will participate in remapping based on the
/// current mode
///
/// This is very similar to CanProcess except it will return false for any KeyInput
/// which would be processed as a direct insert. In other words commands like 'a',
/// 'b' when handled by insert / replace mode
abstract CanProcessAsCommand: KeyInput -> bool
/// Switch the current mode to the provided value
abstract SwitchMode: ModeKind -> ModeArgument -> IMode
/// Switch the buffer back to the previous mode which is returned
abstract SwitchPreviousMode: unit -> IMode
/// Add a processed KeyInput value. This is a way for a host which is intercepting
/// KeyInput and custom processing it to still participate in items like Macro
/// recording. The provided value will not go through any remapping
abstract SimulateProcessed: KeyInput -> unit
/// Called when the view is closed and the IVimBuffer should uninstall itself
/// and it's modes
abstract Close: unit -> unit
/// Whether the buffer is readonly
abstract IsReadOnly: bool with get
/// Raised when the mode is switched. Returns the old and new mode
[<CLIEvent>]
abstract SwitchedMode: IDelegateEvent<System.EventHandler<SwitchModeEventArgs>>
/// Raised when a KeyInput is received by the buffer. This will be raised for the
/// KeyInput which was received and does not consider any mappings
[<CLIEvent>]
abstract KeyInputStart: IDelegateEvent<System.EventHandler<KeyInputStartEventArgs>>
/// This is raised just before the IVimBuffer attempts to process a KeyInput
/// value. This will not necessarily be the KeyInput which was raised in KeyInputStart
/// because a mapping could have changed it to one or many other different KeyInput
/// values.
///
/// If this event is marked as Handled then the KeyInput will never actually be
/// processed by the IVimBuffer. It will instead immediately move to the
/// KeyInputProcessed event
[<CLIEvent>]
abstract KeyInputProcessing: IDelegateEvent<System.EventHandler<KeyInputStartEventArgs>>
/// Raised when a key is processed. This is raised when the KeyInput is actually
/// processed by Vim, not when it is received.
///
/// Typically this occurs immediately after a Start command and is followed by an
/// End command. One case this doesn't happen is in a key remapping where the source
/// mapping contains more than one key. In this case the input is buffered until the
/// second key is read and then the inputs are processed
[<CLIEvent>]
abstract KeyInputProcessed: IDelegateEvent<System.EventHandler<KeyInputProcessedEventArgs>>
/// Raised when a key is received but not immediately processed. Occurs when a
/// key remapping has more than one source key strokes
[<CLIEvent>]
abstract KeyInputBuffered: IDelegateEvent<System.EventHandler<KeyInputSetEventArgs>>
/// Raised when a KeyInput is completed processing within the IVimBuffer. This happens
/// if the KeyInput is buffered or processed. This will be raised for the KeyInput which
/// was initially considered (came from KeyInputStart). It won't consider any mappings
[<CLIEvent>]
abstract KeyInputEnd: IDelegateEvent<System.EventHandler<KeyInputEventArgs>>
/// Raised when a warning is encountered
[<CLIEvent>]
abstract WarningMessage: IDelegateEvent<System.EventHandler<StringEventArgs>>
/// Raised when an error is encountered
[<CLIEvent>]
abstract ErrorMessage: IDelegateEvent<System.EventHandler<StringEventArgs>>
/// Raised when a status message is encountered
[<CLIEvent>]
abstract StatusMessage: IDelegateEvent<System.EventHandler<StringEventArgs>>
/// Raised when the IVimBuffer is being closed
[<CLIEvent>]
abstract Closing: IDelegateEvent<System.EventHandler>
/// Raised when the IVimBuffer is closed
[<CLIEvent>]
abstract Closed: IDelegateEvent<System.EventHandler>
/// Raised after the buffer is closed AND all pending KeyInputEnd events have been raised.
/// A buffer can be closed internally (i.e. while processing its own keyboard input), which will raise Closed -> KeyInputEnd -> PostClosed.
/// It can also be closed externally, which will raise Closed -> PostClosed.
[<CLIEvent>]
abstract PostClosed: IDelegateEvent<System.EventHandler>
inherit IPropertyOwner
/// Interface for a given Mode of Vim. For example normal, insert, etc ...
and IMode =
/// Associated IVimTextBuffer
abstract VimTextBuffer: IVimTextBuffer
/// What type of Mode is this
abstract ModeKind: ModeKind
/// Sequence of commands handled by the Mode.
abstract CommandNames: seq<KeyInputSet>
/// Can the mode process this particular KeyIput at the current time
abstract CanProcess: KeyInput -> bool
/// Process the given KeyInput
abstract Process: KeyInputData -> ProcessResult
/// Called when the mode is entered
abstract OnEnter: ModeArgument -> unit
/// Called when the mode is left
abstract OnLeave: unit -> unit
/// Called when the owning IVimBuffer is closed so that the mode can free up
/// any resources including event handlers
abstract OnClose: unit -> unit
and INormalMode =
/// Buffered input for the current command
abstract Command: string
/// The ICommandRunner implementation associated with NormalMode
abstract CommandRunner: ICommandRunner
/// Mode keys need to be remapped with currently
abstract KeyRemapMode: KeyRemapMode
/// Is normal mode in the middle of a count operation
abstract InCount: bool
/// Is normal mode in the middle of a character replace operation
abstract InReplace: bool
inherit IMode
/// This is the interface implemented by Insert and Replace mode
and IInsertMode =
/// The active IWordCompletionSession if one is active
abstract ActiveWordCompletionSession: IWordCompletionSession option
/// The paste indication character
abstract PasteCharacter: char option
/// Is insert mode currently in a paste operation
abstract IsInPaste: bool
/// Is this KeyInput value considered to be a direct insert command in the current
/// state of the IVimBuffer. This does not apply to commands which edit the buffer
/// like 'CTRL-D' but instead commands like 'a', 'b' which directly edit the
/// ITextBuffer
abstract IsDirectInsert: KeyInput -> bool
/// Raised when a command is successfully run
[<CLIEvent>]
abstract CommandRan: IDelegateEvent<System.EventHandler<CommandRunDataEventArgs>>
inherit IMode
and ICommandMode =
/// Buffered editable input for the current command
abstract EditableCommand: EditableCommand with get, set
/// The text of the current command
abstract Command: string with get, set
/// Is command mode currently waiting for a register paste operation to complete
abstract InPasteWait: bool
/// Run the specified command
abstract RunCommand: string -> unit
/// Raised when the command string is changed
[<CLIEvent>]
abstract CommandChanged: IDelegateEvent<System.EventHandler>
/// Raised when the command is run
[<CLIEvent>]
abstract CommandRan: IDelegateEvent<System.EventHandler<CommandEventArgs>>
inherit IMode
and IVisualMode =
/// The ICommandRunner implementation associated with NormalMode
abstract CommandRunner: ICommandRunner
/// Mode keys need to be remapped with currently
abstract KeyRemapMode: KeyRemapMode
/// Is visual mode in the middle of a count operation
abstract InCount: bool
/// The current Visual Selection
abstract VisualSelection: VisualSelection
/// Asks Visual Mode to reset what it perceives to be the original selection. Instead it
/// views the current selection as the original selection for entering the mode
abstract SyncSelection: unit -> unit
inherit IMode
and IDisabledMode =
/// Help message to display
abstract HelpMessage: string
inherit IMode
and ISelectMode =
/// Sync the selection with the current state
abstract SyncSelection: unit -> unit
inherit IMode
and ISubstituteConfirmMode =
/// The SnapshotSpan of the current matching piece of text
abstract CurrentMatch: SnapshotSpan option
/// The string which will replace the current match
abstract CurrentSubstitute: string option
/// Raised when the current match changes
[<CLIEvent>]
abstract CurrentMatchChanged: IEvent<SnapshotSpan option>
inherit IMode
[<Extension>]
module VimExtensions =
/// Is this ModeKind any type of Insert: Insert or Replace
[<Extension>]
let IsAnyInsert modeKind =
modeKind = ModeKind.Insert ||
modeKind = ModeKind.Replace
/// Is this ModeKind any type of Visual
[<Extension>]
let IsAnyVisual modeKind =
modeKind = ModeKind.VisualCharacter ||
modeKind = ModeKind.VisualLine ||
modeKind = ModeKind.VisualBlock
/// Is this ModeKind any type of Select
[<Extension>]
let IsAnySelect modeKind =
modeKind = ModeKind.SelectCharacter ||
modeKind = ModeKind.SelectLine ||
modeKind = ModeKind.SelectBlock
module internal VimCoreExtensions =
type IVim with
member x.GetVimBuffer textView =
let found, vimBuffer = x.TryGetVimBuffer textView
if found then
Some vimBuffer
else
None
member x.GetOrCreateVimBufferForHost textView =
let found, vimBuffer = x.TryGetOrCreateVimBufferForHost textView
if found then
Some vimBuffer
else
None
/// Alternate method of dispatching calls. This wraps the Dispatcher type and will
/// gracefully handle dispatch errors. Without this layer exceptions coming from a
/// dispatched operation will go directly to the dispatch loop and crash the host
/// application
type IProtectedOperations =
+ abstract member JoinableTaskContext: JoinableTaskContext
+
/// Get an Action delegate which invokes the original action and handles any
/// thrown Exceptions by passing them off the the available IExtensionErrorHandler
/// values
abstract member GetProtectedAction: action: Action -> Action
/// Get an EventHandler delegate which invokes the original action and handles any
/// thrown Exceptions by passing them off the the available IExtensionErrorHandler
/// values
abstract member GetProtectedEventHandler: eventHandler: EventHandler -> EventHandler
/// Report an Exception to the IExtensionErrorHandlers
abstract member Report: ex: Exception -> unit
diff --git a/Src/VimCore/MefComponents.fs b/Src/VimCore/MefComponents.fs
index 57cc33c..1ab76df 100644
--- a/Src/VimCore/MefComponents.fs
+++ b/Src/VimCore/MefComponents.fs
@@ -1,562 +1,568 @@
#light
namespace Vim
open Microsoft.VisualStudio.Text
open Microsoft.VisualStudio.Text.Editor
open Microsoft.VisualStudio.Text.Tagging
open Microsoft.VisualStudio.Text.Operations
open Microsoft.VisualStudio.Text.Classification
open Microsoft.VisualStudio.Utilities
+open Microsoft.VisualStudio.Threading
open System.ComponentModel.Composition
open System.Collections.Generic
open System.Diagnostics
open System
/// This is the type responsible for tracking a line + column across edits to the
/// underlying ITextBuffer. In a perfect world this would be implemented as an
/// ITrackingSpan so we didn't have to update the locations on every single
/// change to the ITextBuffer.
///
/// Unfortunately the limitations of the ITrackingSpaninterface prevent us from doing
/// that. One strategy you might employ is to say you'll track the Span which represents
/// the extent of the line you care about. This works great right until you consider
/// the case where the line break before your Span is deleted. Because you can't access
/// the full text of that ITextVersion you can't "find" the new front of the line
/// you are tracking (same happens with the end).
///
/// So for now we're stuck with updating these on every edit to the ITextBuffer. Not
/// ideal but will have to do for now.
type internal TrackingLineColumn
(
_textBuffer: ITextBuffer,
_offset: int,
_mode: LineColumnTrackingMode,
_onClose: TrackingLineColumn -> unit
) =
/// This is the SnapshotSpan of the line that we are tracking. It is None in the
/// case of a deleted line
let mutable _line: ITextSnapshotLine option = None
/// When the line this TrackingLineColumn is deleted, this will record the version
/// number of the last valid version containing the line. That way if we undo this
/// can become valid again
let mutable _lastValidVersion: (int * int) option = None
let mutable _offset = _offset
member x.TextBuffer = _textBuffer
member x.Line
with get() = _line
and set value = _line <- value
member x.Offset = _offset
member x.IsValid = Option.isSome _line
member x.VirtualPoint =
match _line with
| None -> None
| Some line -> Some (VirtualSnapshotPoint(line, _offset))
member x.Point =
match x.VirtualPoint with
| None -> None
| Some point -> Some point.Position
member x.Close () =
_onClose x
_line <- None
_lastValidVersion <- None
/// Update the internal tracking information based on the new ITextSnapshot
member x.OnBufferChanged (e: TextContentChangedEventArgs) =
match _line with
| Some snapshotLine ->
if e.AfterVersion <> snapshotLine.Snapshot.Version then
x.AdjustForChange snapshotLine e
| None -> x.CheckForUndo e
/// The change occurred and we are in a valid state. Update our cached data against
/// this change
///
/// Note: This method occurs on a hot path, especially in macro playback, hence we
/// take great care to avoid allocations on this path whenever possible
member x.AdjustForChange (oldLine: ITextSnapshotLine) (e: TextContentChangedEventArgs) =
let changes = e.Changes
match _mode with
| LineColumnTrackingMode.Default ->
if x.IsLineDeletedByChange oldLine changes then
// If this shouldn't survive a full line deletion and there is a deletion
// then we are invalid
x.MarkInvalid oldLine
else
x.AdjustForChangeCore oldLine e
| LineColumnTrackingMode.LastEditPoint ->
if x.IsLineDeletedByChange oldLine changes then
_offset <- 0
let newSnapshot = e.After
let number = min oldLine.LineNumber (newSnapshot.LineCount - 1)
_line <- Some (newSnapshot.GetLineFromLineNumber number)
| LineColumnTrackingMode.SurviveDeletes -> x.AdjustForChangeCore oldLine e
member x.AdjustForChangeCore (oldLine: ITextSnapshotLine) (e: TextContentChangedEventArgs) =
let newSnapshot = e.After
let changes = e.Changes
// Calculate the line number delta for this given change. All we care about here
// is the line number. So changes line shortening the line don't matter for
// us because the column position is fixed
let mutable delta = 0
for change in changes do
if change.LineCountDelta <> 0 && change.OldPosition <= oldLine.Start.Position then
// The change occurred before our line and there is a delta. This is the
// delta we need to apply to our line number
delta <- delta + change.LineCountDelta
let number = oldLine.LineNumber + delta
if number >= 0 && number < newSnapshot.LineCount then
_line <- Some (newSnapshot.GetLineFromLineNumber number)
else
x.MarkInvalid oldLine
/// Is the specified line deleted by this change
member x.IsLineDeletedByChange (snapshotLine: ITextSnapshotLine) (changes: INormalizedTextChangeCollection) =
if changes.IncludesLineChanges then
let span = snapshotLine.ExtentIncludingLineBreak.Span
let mutable isDeleted = false
for change in changes do
if change.LineCountDelta < 0 && change.OldSpan.Contains span then
isDeleted <- true
isDeleted
else
false
/// This line was deleted at some point in the past and hence we're invalid. If the
/// current change is an Undo back to the last version where we were valid then we
/// become valid again
member x.CheckForUndo (e: TextContentChangedEventArgs) =
Debug.Assert(not x.IsValid)
match _lastValidVersion with
| Some (version, lineNumber) ->
let newSnapshot = e.After
let newVersion = e.AfterVersion
if newVersion.ReiteratedVersionNumber = version && lineNumber <= newSnapshot.LineCount then
_line <- Some (newSnapshot.GetLineFromLineNumber(lineNumber))
_lastValidVersion <- None
| None -> ()
/// For whatever reason this is now invalid. Store the last good information so we can
/// recover during an undo operation
member x.MarkInvalid (snapshotLine: ITextSnapshotLine) =
_line <- None
_lastValidVersion <- Some (snapshotLine.Snapshot.Version.ReiteratedVersionNumber, snapshotLine.LineNumber)
override x.ToString() =
match x.VirtualPoint with
| Some point ->
let line = SnapshotPointUtil.GetContainingLine point.Position
sprintf "%d,%d - %s" line.LineNumber _offset (point.ToString())
| None -> "Invalid"
interface ITrackingLineColumn with
member x.TextBuffer = _textBuffer
member x.TrackingMode = _mode
member x.VirtualPoint = x.VirtualPoint
member x.Point = x.Point
member x.Column = match x.Point with Some p -> Some (SnapshotColumn(p)) | None -> None
member x.VirtualColumn = match x.VirtualPoint with Some p -> Some (VirtualSnapshotColumn(p)) | None -> None
member x.Close() = x.Close()
/// Implementation of ITrackingVisualSpan which is used to track a VisualSpan across edits
/// to the ITextBuffer
[<RequireQualifiedAccess>]
type internal TrackingVisualSpan =
/// Tracks the origin SnapshotPoint of the character span, the number of lines it
/// composes of and the length of the span on the last line
| Character of TrackingLineColumn: ITrackingLineColumn * LineCount: int * LastLineMaxPositionCount: int
/// Tracks the origin of the SnapshotLineRange and the number of lines it should comprise
/// of
| Line of TrackingLineColumn: ITrackingLineColumn * LineCount: int
/// Tracks the origin of the block selection, it's tabstop by width by height
| Block of TrackingLineColumn: ITrackingLineColumn * TabStop: int * Width: int * Height: int * EndOfLine: bool
with
member x.TrackingLineColumn =
match x with
| Character (trackingLineColumn, _, _) -> trackingLineColumn
| Line (trackingLineColumn, _) -> trackingLineColumn
| Block (trackingLineColumn, _, _, _, _) -> trackingLineColumn
member x.TextBuffer =
x.TrackingLineColumn.TextBuffer
/// Calculate the VisualSpan against the current ITextSnapshot
member x.VisualSpan =
let snapshot = x.TextBuffer.CurrentSnapshot
match x.TrackingLineColumn.Point with
| None ->
None
| Some point ->
match x with
| Character (_, lineCount, lastLineMaxPositionCount) ->
let characterSpan = CharacterSpan(point, lineCount, lastLineMaxPositionCount)
VisualSpan.Character characterSpan
| Line (_, count) ->
let line = SnapshotPointUtil.GetContainingLine point
SnapshotLineRangeUtil.CreateForLineAndMaxCount line count
|> VisualSpan.Line
| Block (_, tabStop, width, height, endOfLine) ->
let virtualPoint = VirtualSnapshotPointUtil.OfPoint point
let blockSpan = BlockSpan(virtualPoint, tabStop, width, height, endOfLine)
VisualSpan.Block blockSpan
|> Some
member x.Close() =
match x with
| Character (trackingLineColumn, _, _) -> trackingLineColumn.Close()
| Line (trackingLineColumn, _) -> trackingLineColumn.Close()
| Block (trackingLineColumn, _, _, _, _) -> trackingLineColumn.Close()
static member Create (bufferTrackingService: IBufferTrackingService) visualSpan =
match visualSpan with
| VisualSpan.Character characterSpan ->
// Implemented by tracking the start point of the SnapshotSpan, the number of lines
// in the span and the length of the final line
let textBuffer = characterSpan.Snapshot.TextBuffer
let trackingLineColumn =
let line, offset = VirtualSnapshotPointUtil.GetLineAndOffset characterSpan.VirtualStart
bufferTrackingService.CreateLineOffset textBuffer line.LineNumber offset LineColumnTrackingMode.Default
TrackingVisualSpan.Character (trackingLineColumn, characterSpan.LineCount, characterSpan.LastLineMaxPositionCount)
| VisualSpan.Line snapshotLineRange ->
// Setup an ITrackingLineColumn at the 0 column of the first line. This actually may be doable
// with an ITrackingPoint but for now sticking with an ITrackinglineColumn
let textBuffer = snapshotLineRange.Snapshot.TextBuffer
let trackingLineColumn = bufferTrackingService.CreateLineOffset textBuffer snapshotLineRange.StartLineNumber 0 LineColumnTrackingMode.Default
TrackingVisualSpan.Line (trackingLineColumn, snapshotLineRange.Count)
| VisualSpan.Block blockSpan ->
// Setup an ITrackLineColumn at the top left of the block selection
let trackingLineColumn =
let textBuffer = blockSpan.TextBuffer
let line, offset = VirtualSnapshotPointUtil.GetLineAndOffset blockSpan.VirtualStart.VirtualStartPoint
bufferTrackingService.CreateLineOffset textBuffer line.LineNumber offset LineColumnTrackingMode.Default
TrackingVisualSpan.Block (trackingLineColumn, blockSpan.TabStop, blockSpan.SpacesLength, blockSpan.Height, blockSpan.EndOfLine)
interface ITrackingVisualSpan with
member x.TextBuffer = x.TextBuffer
member x.VisualSpan = x.VisualSpan
member x.Close() = x.Close()
type internal TrackingVisualSelection
(
_trackingVisualSpan: ITrackingVisualSpan,
_path: SearchPath,
_column: int,
_blockCaretLocation: BlockCaretLocation
) =
member x.VisualSelection =
match _trackingVisualSpan.VisualSpan with
| None ->
None
| Some visualSpan ->
let visualSelection =
match visualSpan with
| VisualSpan.Character span -> VisualSelection.Character (span, _path)
| VisualSpan.Line lineRange -> VisualSelection.Line (lineRange, _path, _column)
| VisualSpan.Block blockSpan -> VisualSelection.Block (blockSpan, _blockCaretLocation)
Some visualSelection
member x.CaretPoint =
x.VisualSelection |> Option.map (fun visualSelection -> visualSelection.GetCaretPoint SelectionKind.Inclusive)
/// Get the caret in the given VisualSpan
member x.GetCaret visualSpan =
x.VisualSelection |> Option.map (fun visualSelection -> visualSelection.GetCaretPoint SelectionKind.Inclusive)
/// Create an ITrackingVisualSelection with the provided data
static member Create (bufferTrackingService: IBufferTrackingService) (visualSelection: VisualSelection)=
// Track the inclusive VisualSpan. Internally the VisualSelection type represents values as inclusive
// ones.
let trackingVisualSpan = bufferTrackingService.CreateVisualSpan visualSelection.VisualSpan
let path, column, blockCaretLocation =
match visualSelection with
| VisualSelection.Character (_, path) -> path, 0, BlockCaretLocation.TopRight
| VisualSelection.Line (_, path, column) -> path, column, BlockCaretLocation.TopRight
| VisualSelection.Block (_, blockCaretLocation) -> SearchPath.Forward, 0, blockCaretLocation
TrackingVisualSelection(trackingVisualSpan, path, column, blockCaretLocation)
interface ITrackingVisualSelection with
member x.CaretPoint = x.CaretPoint
member x.TextBuffer = _trackingVisualSpan.TextBuffer
member x.VisualSelection = x.VisualSelection
member x.Close() = _trackingVisualSpan.Close()
type internal TrackedData = {
List: List<TrackingLineColumn>
Observer: System.IDisposable
}
/// Service responsible for tracking various parts of an ITextBuffer which can't be replicated
/// by simply using ITrackingSpan or ITrackingPoint.
[<Export(typeof<IBufferTrackingService>)>]
[<Sealed>]
type internal BufferTrackingService() =
static let _key = obj()
member x.FindTrackedData (textBuffer: ITextBuffer) =
PropertyCollectionUtil.GetValue<TrackedData> _key textBuffer.Properties
/// Remove the TrackingLineColumn from the map. If it is the only remaining
/// TrackingLineColumn assigned to the ITextBuffer, remove it from the map
/// and unsubscribe from the Changed event
member x.Remove (trackingLineColumn: TrackingLineColumn) =
let textBuffer = trackingLineColumn.TextBuffer
match x.FindTrackedData textBuffer with
| Some trackedData ->
trackedData.List.Remove trackingLineColumn |> ignore
if trackedData.List.Count = 0 then
trackedData.Observer.Dispose()
textBuffer.Properties.RemoveProperty _key |> ignore
| None -> ()
/// Add the TrackingLineColumn to the map. If this is the first item in the
/// map then subscribe to the Changed event on the buffer
member x.Add (trackingLineColumn: TrackingLineColumn) =
let textBuffer = trackingLineColumn.TextBuffer
let trackedData =
match x.FindTrackedData textBuffer with
| Some trackedData -> trackedData
| None ->
let observer = textBuffer.Changed |> Observable.subscribe x.OnBufferChanged
let trackedData = { List = List<TrackingLineColumn>(); Observer = observer }
textBuffer.Properties.AddProperty(_key, trackedData)
trackedData
trackedData.List.Add trackingLineColumn
member x.OnBufferChanged (e: TextContentChangedEventArgs) =
match x.FindTrackedData e.Before.TextBuffer with
| Some trackedData -> trackedData.List |> Seq.iter (fun trackingLineColumn -> trackingLineColumn.OnBufferChanged e)
| None -> ()
member x.CreateLineOffset (textBuffer: ITextBuffer) lineNumber offset mode =
let trackingLineColumn = TrackingLineColumn(textBuffer, offset, mode, x.Remove)
let textSnapshot = textBuffer.CurrentSnapshot
let textLine = textSnapshot.GetLineFromLineNumber(lineNumber)
trackingLineColumn.Line <- Some textLine
x.Add trackingLineColumn
trackingLineColumn
member x.CreateColumn (column: SnapshotColumn) mode =
let textBuffer = column.Snapshot.TextBuffer
x.CreateLineOffset textBuffer column.LineNumber column.Offset mode
member x.HasTrackingItems textBuffer =
x.FindTrackedData textBuffer |> Option.isSome
interface IBufferTrackingService with
member x.CreateLineOffset textBuffer lineNumber offset mode = x.CreateLineOffset textBuffer lineNumber offset mode :> ITrackingLineColumn
member x.CreateColumn column mode = x.CreateColumn column mode :> ITrackingLineColumn
member x.CreateVisualSpan visualSpan = TrackingVisualSpan.Create x visualSpan :> ITrackingVisualSpan
member x.CreateVisualSelection visualSelection = TrackingVisualSelection.Create x visualSelection :> ITrackingVisualSelection
member x.HasTrackingItems textBuffer = x.HasTrackingItems textBuffer
/// Component which monitors commands across IVimBuffer instances and
/// updates the LastCommand value for repeat purposes
[<Export(typeof<IVimBufferCreationListener>)>]
type internal ChangeTracker
[<ImportingConstructor>]
(
_vim: IVim
) =
let _vimData = _vim.VimData
member x.OnVimBufferCreated (vimBuffer: IVimBuffer) =
let handler = x.OnCommandRan
vimBuffer.NormalMode.CommandRunner.CommandRan |> Event.add handler
vimBuffer.VisualLineMode.CommandRunner.CommandRan |> Event.add handler
vimBuffer.VisualBlockMode.CommandRunner.CommandRan |> Event.add handler
vimBuffer.VisualCharacterMode.CommandRunner.CommandRan |> Event.add handler
vimBuffer.InsertMode.CommandRan |> Event.add handler
vimBuffer.ReplaceMode.CommandRan |> Event.add handler
member x.OnCommandRan (args: CommandRunDataEventArgs) =
let data = args.CommandRunData
let command = data.CommandBinding
if command.IsMovement || command.IsSpecial then
// Movement and special commands don't participate in change tracking
()
elif command.IsRepeatable then
let storedCommand = StoredCommand.OfCommand data.Command data.CommandBinding
x.StoreCommand storedCommand
else
_vimData.LastCommand <- None
/// Store the given StoredCommand as the last command executed in the IVimBuffer. Take into
/// account linking with the previous command
member x.StoreCommand currentCommand =
match _vimData.LastCommand with
| None ->
// No last command so no linking to consider
_vimData.LastCommand <- Some currentCommand
| Some lastCommand ->
let shouldLink =
Util.IsFlagSet currentCommand.CommandFlags CommandFlags.LinkedWithPreviousCommand ||
Util.IsFlagSet lastCommand.CommandFlags CommandFlags.LinkedWithNextCommand
if shouldLink then
_vimData.LastCommand <- StoredCommand.LinkedCommand (lastCommand, currentCommand) |> Some
else
_vimData.LastCommand <- Some currentCommand
interface IVimBufferCreationListener with
member x.VimBufferCreated buffer = x.OnVimBufferCreated buffer
/// Implements the safe dispatching interface which prevents application crashes for
/// exceptions reaching the dispatcher loop
[<Export(typeof<IProtectedOperations>)>]
type internal ProtectedOperations =
val _errorHandlers: List<Lazy<IExtensionErrorHandler>>
+ val _joinableTaskContext: JoinableTaskContext
[<ImportingConstructor>]
- new ([<ImportMany>] errorHandlers: Lazy<IExtensionErrorHandler> seq) =
- { _errorHandlers = errorHandlers |> GenericListUtil.OfSeq }
+ new (joinableTaskContext: JoinableTaskContext, [<ImportMany>] errorHandlers: Lazy<IExtensionErrorHandler> seq) =
+ {
+ _joinableTaskContext = joinableTaskContext
+ _errorHandlers = errorHandlers |> GenericListUtil.OfSeq
+ }
- new (errorHandler: IExtensionErrorHandler) =
+ new (joinableTaskContext: JoinableTaskContext, errorHandler: IExtensionErrorHandler) =
let l = Lazy<IExtensionErrorHandler>(fun _ -> errorHandler)
let list = l |> Seq.singleton |> GenericListUtil.OfSeq
- { _errorHandlers = list }
-
- new () =
- { _errorHandlers = Seq.empty |> GenericListUtil.OfSeq }
+ {
+ _joinableTaskContext = joinableTaskContext
+ _errorHandlers = list
+ }
/// Produce a delegate that can safely execute the given action. If it throws an exception
/// then make sure to alert the error handlers
member private x.GetProtectedAction (action : Action): Action =
let a () =
try
action.Invoke()
with
| e -> x.AlertAll e
Action(a)
member private x.GetProtectedEventHandler (eventHandler: EventHandler): EventHandler =
let a sender e =
try
eventHandler.Invoke(sender, e)
with
| e -> x.AlertAll e
EventHandler(a)
/// Alert all of the IExtensionErrorHandlers that the given Exception occurred. Be careful to guard
/// against them for Exceptions as we are still on the dispatcher loop here and exceptions would be
/// fatal
member x.AlertAll e =
VimTrace.TraceError(e)
for handler in x._errorHandlers do
try
handler.Value.HandleError(x, e)
with
| e -> Debug.Fail((sprintf "Error handler threw: %O" e))
interface IProtectedOperations with
+ member x.JoinableTaskContext = x._joinableTaskContext
member x.GetProtectedAction action = x.GetProtectedAction action
member x.GetProtectedEventHandler eventHandler = x.GetProtectedEventHandler eventHandler
member x.Report ex = x.AlertAll ex
[<Export(typeof<IWordCompletionSessionFactoryService>)>]
type internal VimWordCompletionSessionFactoryService
[<ImportingConstructor>]
(
[<Import(AllowDefault=true)>] _wordCompletionSessionFactory: IWordCompletionSessionFactory
) =
let _created = StandardEvent<WordCompletionSessionEventArgs>()
member x.CreateWordCompletionSession textView wordSpan words isForward =
match OptionUtil.nullToOption _wordCompletionSessionFactory with
| None -> None
| Some factory ->
match factory.CreateWordCompletionSession textView wordSpan words isForward with
| None -> None
| Some session ->
_created.Trigger x (WordCompletionSessionEventArgs(session))
Some session
interface IWordCompletionSessionFactoryService with
member x.CreateWordCompletionSession textView wordSpan words isForward = x.CreateWordCompletionSession textView wordSpan words isForward
[<CLIEvent>]
member x.Created = _created.Publish
type internal SingleSelectionUtil(_textView: ITextView) =
member x.IsMultiSelectionSupported = false
member x.GetSelectedSpans () =
let caretPoint = _textView.Caret.Position.VirtualBufferPosition
let anchorPoint = _textView.Selection.AnchorPoint
let activePoint = _textView.Selection.ActivePoint
seq { yield SelectionSpan(caretPoint, anchorPoint, activePoint) }
member x.SetSelectedSpans (selectedSpans: SelectionSpan seq) =
let selectedSpan = Seq.head selectedSpans
_textView.Caret.MoveTo(selectedSpan.CaretPoint) |> ignore
if selectedSpan.Length <> 0 then
_textView.Selection.Select(selectedSpan.AnchorPoint, selectedSpan.ActivePoint)
interface ISelectionUtil with
member x.IsMultiSelectionSupported = x.IsMultiSelectionSupported
member x.GetSelectedSpans() = x.GetSelectedSpans()
member x.SetSelectedSpans selectedSpans = x.SetSelectedSpans selectedSpans
type internal SingleSelectionUtilFactory() =
static let s_key = new obj()
member x.GetSelectionUtil (textView: ITextView) =
let propertyCollection = textView.Properties
propertyCollection.GetOrCreateSingletonProperty(s_key,
fun () -> SingleSelectionUtil(textView) :> ISelectionUtil)
interface ISelectionUtilFactory with
member x.GetSelectionUtil textView = x.GetSelectionUtil textView
[<Export(typeof<ISelectionUtilFactoryService>)>]
type internal SelectionUtilService
[<ImportingConstructor>]
(
[<Import(AllowDefault=true)>] _selectionUtilFactory: ISelectionUtilFactory
) =
let _selectionUtilFactory = OptionUtil.nullToOption _selectionUtilFactory
static let s_singleSelectionUtilFactory =
SingleSelectionUtilFactory()
:> ISelectionUtilFactory
member x.GetSelectionUtilFactory () =
match _selectionUtilFactory with
| Some selectionUtilFactory -> selectionUtilFactory
| None -> s_singleSelectionUtilFactory
interface ISelectionUtilFactoryService with
member x.GetSelectionUtilFactory () = x.GetSelectionUtilFactory()
diff --git a/Src/VimCore/VimCore.fsproj b/Src/VimCore/VimCore.fsproj
index 216c9d4..7f0005d 100644
--- a/Src/VimCore/VimCore.fsproj
+++ b/Src/VimCore/VimCore.fsproj
@@ -1,160 +1,155 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<RootNamespace>Vim.Core</RootNamespace>
<AssemblyName>Vim.Core</AssemblyName>
<TargetFrameworks>net472;net6.0</TargetFrameworks>
<OtherFlags>--standalone</OtherFlags>
<NoWarn>2011</NoWarn>
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
<DebugType>portable</DebugType>
</PropertyGroup>
<ItemGroup>
<None Include="README.md" />
<Compile Include="Resources.fs" />
<Compile Include="Constants.fs" />
<Compile Include="FSharpUtil.fs" />
<Compile Include="VimTrace.fs" />
<Compile Include="StringUtil.fs" />
<Compile Include="Util.fs" />
<Compile Include="VimKey.fs" />
<Compile Include="KeyInput.fsi" />
<Compile Include="KeyInput.fs" />
<Compile Include="Unicode.fsi" />
<Compile Include="Unicode.fs" />
<Compile Include="CoreTypes.fs" />
<Compile Include="EditorUtil.fs" />
<Compile Include="Register.fs" />
<Compile Include="VimCharSet.fsi" />
<Compile Include="VimCharSet.fs" />
<Compile Include="VimSettingsInterface.fs" />
<Compile Include="Interpreter_Expression.fs" />
<Compile Include="TaggingInterfaces.fs" />
<Compile Include="WordUtil.fsi" />
<Compile Include="WordUtil.fs" />
<Compile Include="CoreInterfaces.fs" />
<Compile Include="CoreInternalInterfaces.fs" />
<Compile Include="CountCapture.fs" />
<Compile Include="VimRegexOptions.fs" />
<Compile Include="VimRegex.fsi" />
<Compile Include="VimRegex.fs" />
<Compile Include="MefInterfaces.fs" />
<Compile Include="KeyNotationUtil.fsi" />
<Compile Include="KeyNotationUtil.fs" />
<Compile Include="DigraphUtil.fs" />
<Compile Include="MotionCapture.fs" />
<Compile Include="RegexUtil.fs" />
<Compile Include="HistoryUtil.fsi" />
<Compile Include="HistoryUtil.fs" />
<Compile Include="PatternUtil.fs" />
<Compile Include="CommonOperations.fsi" />
<Compile Include="CommonOperations.fs" />
<Compile Include="Interpreter_Tokens.fs" />
<Compile Include="Interpreter_Tokenizer.fsi" />
<Compile Include="Interpreter_Tokenizer.fs" />
<Compile Include="Interpreter_Parser.fsi" />
<Compile Include="Interpreter_Parser.fs" />
<Compile Include="Interpreter_Interpreter.fsi" />
<Compile Include="Interpreter_Interpreter.fs" />
<Compile Include="CommandFactory.fsi" />
<Compile Include="CommandFactory.fs" />
<Compile Include="Modes_Command_CommandMode.fsi" />
<Compile Include="Modes_Command_CommandMode.fs" />
<Compile Include="Modes_Normal_NormalMode.fsi" />
<Compile Include="Modes_Normal_NormalMode.fs" />
<Compile Include="Modes_Insert_Components.fs" />
<Compile Include="Modes_Insert_InsertMode.fsi" />
<Compile Include="Modes_Insert_InsertMode.fs" />
<Compile Include="Modes_Visual_ISelectionTracker.fs" />
<Compile Include="Modes_Visual_SelectionTracker.fs" />
<Compile Include="Modes_Visual_VisualMode.fsi" />
<Compile Include="Modes_Visual_VisualMode.fs" />
<Compile Include="Modes_Visual_SelectMode.fsi" />
<Compile Include="Modes_Visual_SelectMode.fs" />
<Compile Include="Modes_SubstituteConfirm_SubstituteConfirmMode.fsi" />
<Compile Include="Modes_SubstituteConfirm_SubstituteConfirmMode.fs" />
<Compile Include="IncrementalSearch.fsi" />
<Compile Include="IncrementalSearch.fs" />
<Compile Include="CommandUtil.fsi" />
<Compile Include="CommandUtil.fs" />
<Compile Include="InsertUtil.fsi" />
<Compile Include="InsertUtil.fs" />
<Compile Include="TaggerUtil.fsi" />
<Compile Include="TaggerUtil.fs" />
<Compile Include="Tagger.fsi" />
<Compile Include="Tagger.fs" />
<Compile Include="CaretChangeTracker.fsi" />
<Compile Include="CaretChangeTracker.fs" />
<Compile Include="SelectionChangeTracker.fsi" />
<Compile Include="SelectionChangeTracker.fs" />
<Compile Include="MultiSelectionTracker.fsi" />
<Compile Include="MultiSelectionTracker.fs" />
<Compile Include="FoldManager.fsi" />
<Compile Include="FoldManager.fs" />
<Compile Include="ModeLineInterpreter.fsi" />
<Compile Include="ModeLineInterpreter.fs" />
<Compile Include="VimTextBuffer.fsi" />
<Compile Include="VimTextBuffer.fs" />
<Compile Include="VimBuffer.fsi" />
<Compile Include="VimBuffer.fs" />
<Compile Include="TextObjectUtil.fsi" />
<Compile Include="TextObjectUtil.fs" />
<Compile Include="MotionUtil.fsi" />
<Compile Include="MotionUtil.fs" />
<Compile Include="SearchService.fsi" />
<Compile Include="SearchService.fs" />
<Compile Include="RegisterMap.fsi" />
<Compile Include="RegisterMap.fs" />
<Compile Include="CaretRegisterMap.fsi" />
<Compile Include="CaretRegisterMap.fs" />
<Compile Include="ExternalEdit.fs" />
<Compile Include="DisabledMode.fs" />
<Compile Include="MarkMap.fsi" />
<Compile Include="MarkMap.fs" />
<Compile Include="MacroRecorder.fsi" />
<Compile Include="MacroRecorder.fs" />
<Compile Include="KeyMap.fsi" />
<Compile Include="KeyMap.fs" />
<Compile Include="DigraphMap.fsi" />
<Compile Include="DigraphMap.fs" />
<Compile Include="JumpList.fs" />
<Compile Include="LineNumbersMarginOption.fs" />
<Compile Include="VimSettings.fsi" />
<Compile Include="VimSettings.fs" />
<Compile Include="FileSystem.fs" />
<Compile Include="UndoRedoOperations.fsi" />
<Compile Include="UndoRedoOperations.fs" />
<Compile Include="CommandRunner.fsi" />
<Compile Include="CommandRunner.fs" />
<Compile Include="AutoCommandRunner.fsi" />
<Compile Include="AutoCommandRunner.fs" />
<Compile Include="Vim.fs" />
<Compile Include="StatusUtil.fsi" />
<Compile Include="StatusUtil.fs" />
<Compile Include="LineChangeTracker.fsi" />
<Compile Include="LineChangeTracker.fs" />
<Compile Include="MefComponents.fsi" />
<Compile Include="MefComponents.fs" />
<Compile Include="FSharpExtensions.fs" />
<Compile Include="AssemblyInfo.fs" />
</ItemGroup>
<ItemGroup>
<!-- Using element form vs. attributes to work around NuGet restore bug
https://github.com/NuGet/Home/issues/6367
https://github.com/dotnet/project-system/issues/3493 -->
<PackageReference Include="FSharp.Core" Version="6.0.3">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="System.ComponentModel.Composition" Version="6.0.0" />
+ <Reference Include="Microsoft.VisualStudio.Threading, Version=15.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.CoreUtility, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.Text.Data, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.Text.Logic, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.Text.UI, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
- <Reference Include="mscorlib" />
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="System.Numerics" />
- <Reference Include="System.Runtime.Serialization" />
- <Reference Include="System.Xml" />
</ItemGroup>
</Project>
diff --git a/Src/VimEditorHost/UnitTests/VimTestBase.cs b/Src/VimEditorHost/UnitTests/VimTestBase.cs
index a1ae483..ae77a09 100644
--- a/Src/VimEditorHost/UnitTests/VimTestBase.cs
+++ b/Src/VimEditorHost/UnitTests/VimTestBase.cs
@@ -1,565 +1,571 @@
#if VS_UNIT_TEST_HOST
using System;
using System.Collections.Generic;
using System.ComponentModel.Composition.Hosting;
using System.ComponentModel.Composition.Primitives;
using System.Diagnostics;
using System.Linq;
using Vim.EditorHost;
using Microsoft.FSharp.Collections;
using Microsoft.FSharp.Core;
using Microsoft.VisualStudio.Text;
using Microsoft.VisualStudio.Text.Editor;
using Microsoft.VisualStudio.Text.Operations;
using Vim.Interpreter;
using Vim.UnitTest;
using Vim.UnitTest.Mock;
using System.Windows;
using Microsoft.VisualStudio.Text.Projection;
using Microsoft.VisualStudio.Text.Outlining;
using Microsoft.VisualStudio.Utilities;
using System.Threading;
using System.ComponentModel.Composition;
using System.Text;
using Vim.UnitTest.Utilities;
using System.Windows.Threading;
using Xunit.Sdk;
using Vim.Extensions;
using Vim.EditorHost.Implementation.Misc;
using Vim.UI.Wpf;
using Vim.UI.Wpf.Implementation.Misc;
+using Microsoft.VisualStudio.Threading;
namespace Vim.UnitTest
{
/// <summary>
/// Standard test base for vim services which wish to do standard error monitoring like
/// - No dangling transactions
/// - No silent swallowed MEF errors
/// - Remove any key mappings
/// </summary>
public abstract class VimTestBase : IDisposable
{
private readonly VimEditorHost _vimEditorHost;
/// <summary>
/// Cache of composition containers. This is indexed on thread id as the underlying objects in the container
/// can, and often do, have thread affinity.
/// </summary>
private static readonly Dictionary<(Type, int), VimEditorHost> s_cachedVimEditorHostMap = new Dictionary<(Type, int), VimEditorHost>();
public StaContext StaContext { get; }
public Dispatcher Dispatcher => StaContext.Dispatcher;
public DispatcherSynchronizationContext DispatcherSynchronizationContext { get; }
+ public JoinableTaskContext JoinableTaskContext
+ {
+ get { return _vimEditorHost.JoinableTaskContext; }
+ }
+
public CompositionContainer CompositionContainer
{
get { return _vimEditorHost.CompositionContainer; }
}
public VimEditorHost VimEditorHost
{
get { return _vimEditorHost; }
}
public ISmartIndentationService SmartIndentationService
{
get { return _vimEditorHost.SmartIndentationService; }
}
public ITextBufferFactoryService TextBufferFactoryService
{
get { return _vimEditorHost.TextBufferFactoryService; }
}
public ITextEditorFactoryService TextEditorFactoryService
{
get { return _vimEditorHost.TextEditorFactoryService; }
}
public IProjectionBufferFactoryService ProjectionBufferFactoryService
{
get { return _vimEditorHost.ProjectionBufferFactoryService; }
}
public IEditorOperationsFactoryService EditorOperationsFactoryService
{
get { return _vimEditorHost.EditorOperationsFactoryService; }
}
public IEditorOptionsFactoryService EditorOptionsFactoryService
{
get { return _vimEditorHost.EditorOptionsFactoryService; }
}
public ITextSearchService TextSearchService
{
get { return _vimEditorHost.TextSearchService; }
}
public ITextBufferUndoManagerProvider TextBufferUndoManagerProvider
{
get { return _vimEditorHost.TextBufferUndoManagerProvider; }
}
public IOutliningManagerService OutliningManagerService
{
get { return _vimEditorHost.OutliningManagerService; }
}
public IContentTypeRegistryService ContentTypeRegistryService
{
get { return _vimEditorHost.ContentTypeRegistryService; }
}
public IProtectedOperations ProtectedOperations
{
get { return _vimEditorHost.ProtectedOperations; }
}
public IBasicUndoHistoryRegistry BasicUndoHistoryRegistry
{
get { return _vimEditorHost.BasicUndoHistoryRegistry; }
}
public IVim Vim
{
get { return _vimEditorHost.Vim; }
}
public VimRcState VimRcState
{
get { return Vim.VimRcState; }
set { ((VimImpl)Vim).VimRcState = value; }
}
public IVimData VimData
{
get { return _vimEditorHost.VimData; }
}
internal IVimBufferFactory VimBufferFactory
{
get { return _vimEditorHost.VimBufferFactory; }
}
public MockVimHost VimHost
{
get { return (MockVimHost)Vim.VimHost; }
}
public ICommonOperationsFactory CommonOperationsFactory
{
get { return _vimEditorHost.CommonOperationsFactory; }
}
public IFoldManagerFactory FoldManagerFactory
{
get { return _vimEditorHost.FoldManagerFactory; }
}
public IBufferTrackingService BufferTrackingService
{
get { return _vimEditorHost.BufferTrackingService; }
}
public IVimGlobalKeyMap GlobalKeyMap
{
get { return _vimEditorHost.GlobalKeyMap; }
}
public IKeyUtil KeyUtil
{
get { return _vimEditorHost.KeyUtil; }
}
public IClipboardDevice ClipboardDevice
{
get { return _vimEditorHost.ClipboardDevice; }
}
public IMouseDevice MouseDevice
{
get { return _vimEditorHost.MouseDevice; }
}
public IKeyboardDevice KeyboardDevice
{
get { return _vimEditorHost.KeyboardDevice; }
}
public virtual bool TrackTextViewHistory
{
get { return true; }
}
public IRegisterMap RegisterMap
{
get { return Vim.RegisterMap; }
}
public Register UnnamedRegister
{
get { return RegisterMap.GetRegister(RegisterName.Unnamed); }
}
public Dictionary<string, VariableValue> VariableMap
{
get { return Vim.VariableMap; }
}
public IVimErrorDetector VimErrorDetector
{
get { return _vimEditorHost.VimErrorDetector; }
}
protected VimTestBase()
{
// Parts of the core editor in Vs2012 depend on there being an Application.Current value else
// they will throw a NullReferenceException. Create one here to ensure the unit tests successfully
// pass
if (Application.Current == null)
{
new Application();
}
StaContext = StaContext.Default;
if (!StaContext.IsRunningInThread)
{
throw new Exception($"Need to apply {nameof(WpfFactAttribute)} to this test case");
}
if (SynchronizationContext.Current?.GetType() != typeof(DispatcherSynchronizationContext))
{
throw new Exception("Invalid synchronization context on test start");
}
_vimEditorHost = GetOrCreateVimEditorHost();
ClipboardDevice.Text = string.Empty;
// One setting we do differ on for a default is 'timeout'. We don't want them interfering
// with the reliability of tests. The default is on but turn it off here to prevent any
// problems
Vim.GlobalSettings.Timeout = false;
// Turn off autoloading of digraphs for the vast majority of tests.
Vim.AutoLoadDigraphs = false;
// Don't let the personal VimRc of the user interfere with the unit tests
Vim.AutoLoadVimRc = false;
Vim.AutoLoadSessionData = false;
// Don't let the current directory leak into the tests
Vim.VimData.CurrentDirectory = "";
// Don't show trace information in the unit tests. It really clutters the output in an
// xUnit run
VimTrace.TraceSwitch.Level = TraceLevel.Off;
}
public virtual void Dispose()
{
Vim.MarkMap.Clear();
try
{
CheckForErrors();
}
finally
{
ResetState();
}
}
private void ResetState()
{
Vim.MarkMap.Clear();
Vim.VimData.SearchHistory.Reset();
Vim.VimData.CommandHistory.Reset();
Vim.VimData.LastCommand = FSharpOption<StoredCommand>.None;
Vim.VimData.LastCommandLine = "";
Vim.VimData.LastShellCommand = FSharpOption<string>.None;
Vim.VimData.LastTextInsert = FSharpOption<string>.None;
Vim.VimData.AutoCommands = FSharpList<AutoCommand>.Empty;
Vim.VimData.AutoCommandGroups = FSharpList<AutoCommandGroup>.Empty;
Vim.DigraphMap.Clear();
Vim.GlobalKeyMap.ClearKeyMappings();
Vim.GlobalAbbreviationMap.ClearAbbreviations();
Vim.CloseAllVimBuffers();
Vim.IsDisabled = false;
// If digraphs were loaded, reload them.
if (Vim.AutoLoadDigraphs)
{
DigraphUtil.AddToMap(Vim.DigraphMap, DigraphUtil.DefaultDigraphs);
}
// The majority of tests run without a VimRc file but a few do customize it for specific
// test reasons. Make sure it's consistent
VimRcState = VimRcState.None;
// Reset all of the global settings back to their default values. Adds quite
// a bit of sanity to the test bed
foreach (var setting in Vim.GlobalSettings.Settings)
{
if (!setting.IsValueDefault && !setting.IsValueCalculated)
{
Vim.GlobalSettings.TrySetValue(setting.Name, setting.DefaultValue);
}
}
// Reset all of the register values to empty
foreach (var name in Vim.RegisterMap.RegisterNames)
{
Vim.RegisterMap.GetRegister(name).UpdateValue("");
}
// Don't let recording persist across tests
if (Vim.MacroRecorder.IsRecording)
{
Vim.MacroRecorder.StopRecording();
}
if (Vim.VimHost is MockVimHost vimHost)
{
vimHost.ShouldCreateVimBufferImpl = false;
vimHost.Clear();
}
VariableMap.Clear();
VimErrorDetector.Clear();
}
public void DoEvents()
{
Debug.Assert(SynchronizationContext.Current.GetEffectiveSynchronizationContext() is DispatcherSynchronizationContext);
Dispatcher.DoEvents();
}
private void CheckForErrors()
{
if (VimErrorDetector.HasErrors())
{
var message = FormatException(VimErrorDetector.GetErrors());
throw new Exception(message);
}
}
private static string FormatException(IEnumerable<Exception> exceptions)
{
var builder = new StringBuilder();
void appendException(Exception ex)
{
builder.AppendLine(ex.Message);
builder.AppendLine(ex.StackTrace);
if (ex.InnerException != null)
{
builder.AppendLine("Begin inner exception");
appendException(ex.InnerException);
builder.AppendLine("End inner exception");
}
switch (ex)
{
case AggregateException aggregate:
builder.AppendLine("Begin aggregate exceptions");
foreach (var inner in aggregate.InnerExceptions)
{
appendException(inner);
}
builder.AppendLine("End aggregate exceptions");
break;
}
}
var all = exceptions.ToList();
builder.AppendLine($"Exception count {all.Count}");
foreach (var exception in exceptions)
{
appendException(exception);
}
return builder.ToString();
}
public ITextBuffer CreateTextBufferRaw(string content)
{
return _vimEditorHost.CreateTextBufferRaw(content);
}
public ITextBuffer CreateTextBuffer(params string[] lines)
{
return _vimEditorHost.CreateTextBuffer(lines);
}
public ITextBuffer CreateTextBuffer(IContentType contentType, params string[] lines)
{
return _vimEditorHost.CreateTextBuffer(contentType, lines);
}
public IProjectionBuffer CreateProjectionBuffer(params SnapshotSpan[] spans)
{
return _vimEditorHost.CreateProjectionBuffer(spans);
}
public IWpfTextView CreateTextView(params string[] lines)
{
return _vimEditorHost.CreateTextView(lines);
}
public IWpfTextView CreateTextView(IContentType contentType, params string[] lines)
{
return _vimEditorHost.CreateTextView(contentType, lines);
}
public IContentType GetOrCreateContentType(string type, string baseType)
{
return _vimEditorHost.GetOrCreateContentType(type, baseType);
}
/// <summary>
/// Create an IVimTextBuffer instance with the given lines
/// </summary>
protected IVimTextBuffer CreateVimTextBuffer(params string[] lines)
{
var textBuffer = CreateTextBuffer(lines);
return Vim.CreateVimTextBuffer(textBuffer);
}
/// <summary>
/// Create a new instance of VimBufferData. Centralized here to make it easier to
/// absorb API changes in the Unit Tests
/// </summary>
protected IVimBufferData CreateVimBufferData(
ITextView textView,
IStatusUtil statusUtil = null,
IJumpList jumpList = null,
IVimWindowSettings windowSettings = null,
ICaretRegisterMap caretRegisterMap = null,
ISelectionUtil selectionUtil = null)
{
return CreateVimBufferData(
Vim.GetOrCreateVimTextBuffer(textView.TextBuffer),
textView,
statusUtil,
jumpList,
windowSettings,
caretRegisterMap,
selectionUtil);
}
/// <summary>
/// Create a new instance of VimBufferData. Centralized here to make it easier to
/// absorb API changes in the Unit Tests
/// </summary>
protected IVimBufferData CreateVimBufferData(
IVimTextBuffer vimTextBuffer,
ITextView textView,
IStatusUtil statusUtil = null,
IJumpList jumpList = null,
IVimWindowSettings windowSettings = null,
ICaretRegisterMap caretRegisterMap = null,
ISelectionUtil selectionUtil = null)
{
jumpList = jumpList ?? new JumpList(textView, BufferTrackingService);
statusUtil = statusUtil ?? CompositionContainer.GetExportedValue<IStatusUtilFactory>().GetStatusUtilForView(textView);
windowSettings = windowSettings ?? new WindowSettings(vimTextBuffer.GlobalSettings);
caretRegisterMap = caretRegisterMap ?? new CaretRegisterMap(Vim.RegisterMap);
selectionUtil = selectionUtil ?? new SingleSelectionUtil(textView);
return new VimBufferData(
vimTextBuffer,
textView,
windowSettings,
jumpList,
statusUtil,
selectionUtil,
caretRegisterMap);
}
/// <summary>
/// Create a new instance of VimBufferData. Centralized here to make it easier to
/// absorb API changes in the Unit Tests
/// </summary>
protected IVimBufferData CreateVimBufferData(params string[] lines)
{
var textView = CreateTextView(lines);
return CreateVimBufferData(textView);
}
/// <summary>
/// Create an IVimBuffer instance with the given lines
/// </summary>
protected IVimBuffer CreateVimBuffer(params string[] lines)
{
var textView = CreateTextView(lines);
return Vim.CreateVimBuffer(textView);
}
/// <summary>
/// Create an IVimBuffer instance with the given VimBufferData value
/// </summary>
protected IVimBuffer CreateVimBuffer(IVimBufferData vimBufferData)
{
return VimBufferFactory.CreateVimBuffer(vimBufferData);
}
protected IVimBuffer CreateVimBufferWithName(string fileName, params string[] lines)
{
var textView = CreateTextView(lines);
textView.TextBuffer.Properties[MockVimHost.FileNameKey] = fileName;
return Vim.CreateVimBuffer(textView);
}
protected WpfTextViewDisplay CreateTextViewDisplay(IWpfTextView textView, bool setFocus = true, bool show = true)
{
var host = TextEditorFactoryService.CreateTextViewHost(textView, setFocus);
var display = new WpfTextViewDisplay(host);
if (show)
{
display.Show();
}
return display;
}
internal CommandUtil CreateCommandUtil(
IVimBufferData vimBufferData,
IMotionUtil motionUtil = null,
ICommonOperations operations = null,
IFoldManager foldManager = null,
InsertUtil insertUtil = null)
{
motionUtil = motionUtil ?? new MotionUtil(vimBufferData, operations);
operations = operations ?? CommonOperationsFactory.GetCommonOperations(vimBufferData);
foldManager = foldManager ?? VimUtil.CreateFoldManager(vimBufferData.TextView, vimBufferData.StatusUtil);
insertUtil = insertUtil ?? new InsertUtil(vimBufferData, motionUtil, operations);
var lineChangeTracker = new LineChangeTracker(vimBufferData);
return new CommandUtil(
vimBufferData,
motionUtil,
operations,
foldManager,
insertUtil,
_vimEditorHost.BulkOperations,
lineChangeTracker);
}
protected virtual Type GetVimHostExportType() => typeof(TestableVimHost);
public static Func<Type, bool> GetVimEditorHostTypeFilter(Type vimHostExportType)
{
// The unit test host exports several replacement components to facilitate
// better testing. For example it exports TestableClipboard which doesn't use
// the real clipboard (would make testing flaky). Have to exclude the real components
// here to avoid export conflicts
var iVimHostType = typeof(IVimHost);
Func<Type, bool> typeFilter = type =>
{
if (type == typeof(Vim.UI.Wpf.Implementation.Misc.ClipboardDevice) ||
type == typeof(Vim.UI.Wpf.Implementation.Misc.KeyboardDeviceImpl) ||
type == typeof(Vim.UI.Wpf.Implementation.Misc.MouseDeviceImpl))
{
return false;
}
diff --git a/Src/VimEditorHost/VimEditorHost.cs b/Src/VimEditorHost/VimEditorHost.cs
index e8b85b2..ceb41ab 100644
--- a/Src/VimEditorHost/VimEditorHost.cs
+++ b/Src/VimEditorHost/VimEditorHost.cs
@@ -1,160 +1,163 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.Composition.Hosting;
using System.Linq;
using System.Text;
using Microsoft.VisualStudio.Text.Classification;
using Microsoft.VisualStudio.Text;
using Microsoft.VisualStudio.Text.Editor;
using Microsoft.VisualStudio.Text.Projection;
using Microsoft.VisualStudio.Text.Operations;
using Microsoft.VisualStudio.Text.Outlining;
using Microsoft.VisualStudio.Utilities;
using Vim.UI.Wpf;
using Vim.UnitTest;
+using Microsoft.VisualStudio.Threading;
namespace Vim.EditorHost
{
/// <summary>
/// Base class for hosting editor components. This is primarily used for unit
/// testing. Any test base can derive from this and use the Create* methods to get
/// ITextBuffer instances to run their tests against.
/// </summary>
public sealed class VimEditorHost
{
public CompositionContainer CompositionContainer { get; }
public ISmartIndentationService SmartIndentationService { get; }
public ITextBufferFactoryService TextBufferFactoryService { get; }
public ITextEditorFactoryService TextEditorFactoryService { get; }
public IProjectionBufferFactoryService ProjectionBufferFactoryService { get; }
public IEditorOperationsFactoryService EditorOperationsFactoryService { get; }
public IEditorOptionsFactoryService EditorOptionsFactoryService { get; }
public ITextSearchService TextSearchService { get; }
public ITextBufferUndoManagerProvider TextBufferUndoManagerProvider { get; }
public IOutliningManagerService OutliningManagerService { get; }
public IContentTypeRegistryService ContentTypeRegistryService { get; }
public IBasicUndoHistoryRegistry BasicUndoHistoryRegistry { get; }
public IClassificationTypeRegistryService ClassificationTypeRegistryService { get; }
public IVim Vim { get; }
internal IVimBufferFactory VimBufferFactory {get;}
public ICommonOperationsFactory CommonOperationsFactory {get;}
public IFoldManagerFactory FoldManagerFactory {get;}
public IBufferTrackingService BufferTrackingService {get;}
public IKeyUtil KeyUtil { get; }
public IClipboardDevice ClipboardDevice {get;}
public IMouseDevice MouseDevice {get;}
public IKeyboardDevice KeyboardDevice {get;}
public IProtectedOperations ProtectedOperations {get;}
public IVimErrorDetector VimErrorDetector {get;}
internal IBulkOperations BulkOperations {get;}
public IEditorFormatMapService EditorFormatMapService {get;}
public IClassificationFormatMapService ClassificationFormatMapService {get;}
+ public JoinableTaskContext JoinableTaskContext { get; }
public IVimData VimData => Vim.VimData;
public IVimHost VimHost => Vim.VimHost;
public IVimGlobalKeyMap GlobalKeyMap => Vim.GlobalKeyMap;
public VimEditorHost(CompositionContainer compositionContainer)
{
CompositionContainer = compositionContainer;
TextBufferFactoryService = CompositionContainer.GetExportedValue<ITextBufferFactoryService>();
TextEditorFactoryService = CompositionContainer.GetExportedValue<ITextEditorFactoryService>();
ProjectionBufferFactoryService = CompositionContainer.GetExportedValue<IProjectionBufferFactoryService>();
SmartIndentationService = CompositionContainer.GetExportedValue<ISmartIndentationService>();
EditorOperationsFactoryService = CompositionContainer.GetExportedValue<IEditorOperationsFactoryService>();
EditorOptionsFactoryService = CompositionContainer.GetExportedValue<IEditorOptionsFactoryService>();
TextSearchService = CompositionContainer.GetExportedValue<ITextSearchService>();
OutliningManagerService = CompositionContainer.GetExportedValue<IOutliningManagerService>();
TextBufferUndoManagerProvider = CompositionContainer.GetExportedValue<ITextBufferUndoManagerProvider>();
ContentTypeRegistryService = CompositionContainer.GetExportedValue<IContentTypeRegistryService>();
ClassificationTypeRegistryService = CompositionContainer.GetExportedValue<IClassificationTypeRegistryService>();
BasicUndoHistoryRegistry = CompositionContainer.GetExportedValue<IBasicUndoHistoryRegistry>();
VimBufferFactory = CompositionContainer.GetExportedValue<IVimBufferFactory>();
Vim = CompositionContainer.GetExportedValue<IVim>();
VimErrorDetector = CompositionContainer.GetExportedValue<IVimErrorDetector>();
CommonOperationsFactory = CompositionContainer.GetExportedValue<ICommonOperationsFactory>();
BufferTrackingService = CompositionContainer.GetExportedValue<IBufferTrackingService>();
FoldManagerFactory = CompositionContainer.GetExportedValue<IFoldManagerFactory>();
BulkOperations = CompositionContainer.GetExportedValue<IBulkOperations>();
KeyUtil = CompositionContainer.GetExportedValue<IKeyUtil>();
ProtectedOperations = CompositionContainer.GetExportedValue<IProtectedOperations>();
KeyboardDevice = CompositionContainer.GetExportedValue<IKeyboardDevice>();
MouseDevice = CompositionContainer.GetExportedValue<IMouseDevice>();
ClipboardDevice = CompositionContainer.GetExportedValue<IClipboardDevice>();
EditorFormatMapService = CompositionContainer.GetExportedValue<IEditorFormatMapService>();
ClassificationFormatMapService = CompositionContainer.GetExportedValue<IClassificationFormatMapService>();
+ JoinableTaskContext = CompositionContainer.GetExportedValue<JoinableTaskContext>();
}
/// <summary>
/// Create an ITextBuffer instance with the given content
/// </summary>
public ITextBuffer CreateTextBufferRaw(string content, IContentType contentType = null)
{
return TextBufferFactoryService.CreateTextBufferRaw(content, contentType);
}
/// <summary>
/// Create an ITextBuffer instance with the given lines
/// </summary>
public ITextBuffer CreateTextBuffer(params string[] lines)
{
return TextBufferFactoryService.CreateTextBuffer(lines);
}
/// <summary>
/// Create an ITextBuffer instance with the given IContentType
/// </summary>
public ITextBuffer CreateTextBuffer(IContentType contentType, params string[] lines)
{
return TextBufferFactoryService.CreateTextBuffer(contentType, lines);
}
/// <summary>
/// Create a simple IProjectionBuffer from the specified SnapshotSpan values
/// </summary>
public IProjectionBuffer CreateProjectionBuffer(params SnapshotSpan[] spans)
{
var list = new List<object>();
foreach (var span in spans)
{
var snapshot = span.Snapshot;
var trackingSpan = snapshot.CreateTrackingSpan(span.Span, SpanTrackingMode.EdgeInclusive);
list.Add(trackingSpan);
}
return ProjectionBufferFactoryService.CreateProjectionBuffer(
null,
list,
ProjectionBufferOptions.None);
}
/// <summary>
/// Create an ITextView instance with the given lines
/// </summary>
public IWpfTextView CreateTextView(params string[] lines)
{
var textBuffer = CreateTextBuffer(lines);
return TextEditorFactoryService.CreateTextView(textBuffer);
}
public IWpfTextView CreateTextView(IContentType contentType, params string[] lines)
{
var textBuffer = TextBufferFactoryService.CreateTextBuffer(contentType, lines);
return TextEditorFactoryService.CreateTextView(textBuffer);
}
/// <summary>
/// Get or create a content type of the specified name with the specified base content type
/// </summary>
public IContentType GetOrCreateContentType(string type, string baseType)
{
var ct = ContentTypeRegistryService.GetContentType(type);
if (ct == null)
{
ct = ContentTypeRegistryService.AddContentType(type, new[] { baseType });
}
return ct;
}
}
}
diff --git a/Test/VimCoreTest/ProtectedOperationsTest.cs b/Test/VimCoreTest/ProtectedOperationsTest.cs
index 95014f5..15698d2 100644
--- a/Test/VimCoreTest/ProtectedOperationsTest.cs
+++ b/Test/VimCoreTest/ProtectedOperationsTest.cs
@@ -1,130 +1,130 @@
using System;
using System.Windows.Threading;
using Microsoft.VisualStudio.Text;
using Moq;
using Xunit;
using Vim;
using Vim.EditorHost;
using Vim.UI.Wpf;
namespace Vim.UnitTest
{
- public sealed class ProtectedOperationsTest
+ public sealed class ProtectedOperationsTest : VimTestBase
{
private readonly Mock<IExtensionErrorHandler> _errorHandler;
private readonly ProtectedOperations _protectedOperationsRaw;
private readonly IProtectedOperations _protectedOperations;
public ProtectedOperationsTest()
{
_errorHandler = new Mock<IExtensionErrorHandler>(MockBehavior.Strict);
- _protectedOperationsRaw = new ProtectedOperations(_errorHandler.Object);
+ _protectedOperationsRaw = new ProtectedOperations(JoinableTaskContext, _errorHandler.Object);
_protectedOperations = _protectedOperationsRaw;
}
/// <summary>
/// Verify the returned action will execute the original one
/// </summary>
- [Fact]
+ [WpfFact]
public void GetProtectedAction_Standard()
{
var didRun = false;
var protectedAction = _protectedOperations.GetProtectedAction(delegate { didRun = true; });
protectedAction();
Assert.True(didRun);
}
/// <summary>
/// Verify that when the original action throws that it is passed on to the
/// listed IExtensionErrorHandlers
/// </summary>
- [Fact]
+ [WpfFact]
public void GetProtectedAction_Throws()
{
var exception = new Exception("hello world");
_errorHandler.Setup(x => x.HandleError(It.IsAny<object>(), exception)).Verifiable();
var protectedAction = _protectedOperations.GetProtectedAction(delegate { throw exception; });
protectedAction();
_errorHandler.Verify();
}
/// <summary>
/// Verify the returned EventHandler will execute the original one
/// </summary>
- [Fact]
+ [WpfFact]
public void GetProtectedEventHandler_Standard()
{
var didRun = false;
var protectedEventHandler = _protectedOperations.GetProtectedEventHandler(delegate { didRun = true; });
protectedEventHandler(null, EventArgs.Empty);
Assert.True(didRun);
}
/// <summary>
/// Verify that when the original EventHandler throws that it is passed on to the
/// listed IExtensionErrorHandlers
/// </summary>
- [Fact]
+ [WpfFact]
public void GetProtectedEventHandler_Throws()
{
var exception = new Exception("hello world");
_errorHandler.Setup(x => x.HandleError(It.IsAny<object>(), exception)).Verifiable();
var protectedEventHandler = _protectedOperations.GetProtectedEventHandler(delegate { throw exception; });
protectedEventHandler(null, EventArgs.Empty);
_errorHandler.Verify();
}
/// <summary>
/// Verify that the BeginInvoke will actually schedule the original action
/// </summary>
- [Fact]
+ [WpfFact]
public void BeginInvoke_Priority_Standard()
{
var didRun = false;
_protectedOperations.BeginInvoke(delegate { didRun = true; }, DispatcherPriority.Normal);
Dispatcher.CurrentDispatcher.DoEvents();
Assert.True(didRun);
}
/// <summary>
/// Verify that when an exception is thrown during processing that it makes it's way to the
/// IExtensionErrorHandler
/// </summary>
- [Fact]
+ [WpfFact]
public void BeginInvoke_Priority_Throws()
{
var exception = new Exception("hello world");
_errorHandler.Setup(x => x.HandleError(It.IsAny<object>(), exception)).Verifiable();
_protectedOperations.BeginInvoke(delegate { throw exception; }, DispatcherPriority.Normal);
Dispatcher.CurrentDispatcher.DoEvents();
_errorHandler.Verify();
}
/// <summary>
/// Verify that the BeginInvoke will actually schedule the original action
/// </summary>
- [Fact]
+ [WpfFact]
public void BeginInvoke_NoPriority_Standard()
{
var didRun = false;
_protectedOperations.BeginInvoke(delegate { didRun = true; });
Dispatcher.CurrentDispatcher.DoEvents();
Assert.True(didRun);
}
/// <summary>
/// Verify that when an exception is thrown during processing that it makes it's way to the
/// IExtensionErrorHandler
/// </summary>
- [Fact]
+ [WpfFact]
public void BeginInvoke_NoPriority_Throws()
{
var exception = new Exception("hello world");
_errorHandler.Setup(x => x.HandleError(It.IsAny<object>(), exception)).Verifiable();
_protectedOperations.BeginInvoke(delegate { throw exception; });
Dispatcher.CurrentDispatcher.DoEvents();
_errorHandler.Verify();
}
}
}
diff --git a/Test/VsVimSharedTest/CodeHygieneTest.cs b/Test/VsVimSharedTest/CodeHygieneTest.cs
index 8dc3536..8e36bf7 100644
--- a/Test/VsVimSharedTest/CodeHygieneTest.cs
+++ b/Test/VsVimSharedTest/CodeHygieneTest.cs
@@ -1,80 +1,80 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Text;
using Vim.UI.Wpf;
using Xunit;
namespace Vim.VisualStudio.UnitTest
{
/// <summary>
/// Pedantic code hygiene tests for the code base
/// </summary>
public sealed class CodeHygieneTest
{
private readonly Assembly _assembly = typeof(CodeHygieneTest).Assembly;
[Fact]
public void TestNamespace()
{
foreach (var type in _assembly.GetTypes().Where(x => x.IsPublic))
{
if (type.FullName.StartsWith("Vim.VisualStudio.UnitTest.", StringComparison.Ordinal) ||
type.FullName.StartsWith("Vim.EditorHost.", StringComparison.Ordinal) ||
type.FullName.StartsWith("Vim.UnitTest.", StringComparison.Ordinal) ||
type.FullName.StartsWith("Vim.UI.Wpf.UnitTest.", StringComparison.Ordinal))
{
continue;
}
Assert.False(true, $"Type {type.FullName} has incorrect namespace");
}
}
[Fact]
public void CodeNamespace()
{
const string prefix = "Vim.VisualStudio.";
var assembly = typeof(IVsAdapter).Assembly;
foreach (var type in assembly.GetTypes())
{
if (type.FullName.StartsWith("Xaml", StringComparison.Ordinal) ||
type.FullName.StartsWith("Microsoft.CodeAnalysis.EmbeddedAttribute", StringComparison.Ordinal) ||
type.FullName.StartsWith("System.Runtime.CompilerServices", StringComparison.Ordinal) ||
type.FullName.StartsWith("Vim.VisualStudio", StringComparison.Ordinal) ||
type.FullName.StartsWith("Vim.UI.Wpf", StringComparison.Ordinal))
{
continue;
}
Assert.True(type.FullName.StartsWith(prefix, StringComparison.Ordinal), $"Wrong namespace prefix on {type.FullName}");
}
}
/// <summary>
/// There should be no references to FSharp.Core in the projects. This should be embedded into
/// the Vim.Core assembly and not an actual reference. Too many ways that VS ships the DLL that
/// it makes referencing it too difficult. Embedding is much more reliably.
/// </summary>
- [Fact]
+ [Fact(Skip = "https://github.com/VsVim/VsVim/issues/2976")]
public void FSharpCoreReferences()
{
var assemblyList = new[]
{
typeof(IVimHost).Assembly,
typeof(VsVimHost).Assembly
};
Assert.Equal(assemblyList.Length, assemblyList.Distinct().Count());
foreach (var assembly in assemblyList)
{
foreach (var assemblyRef in assembly.GetReferencedAssemblies())
{
Assert.NotEqual("FSharp.Core", assemblyRef.Name, StringComparer.OrdinalIgnoreCase);
}
}
}
}
}
|
VsVim/VsVim
|
f158acb6f2285d5c8a9d61a0f75a28f079063455
|
Don't build Windows projects
|
diff --git a/Scripts/build.sh b/Scripts/build.sh
index 9538b9c..e36771d 100755
--- a/Scripts/build.sh
+++ b/Scripts/build.sh
@@ -1,26 +1,28 @@
echo "Downloading VSMac"
wget --quiet https://download.visualstudio.microsoft.com/download/pr/a643750b-8690-4e7b-a088-9dfc3b2865ba/f315ac486e00a8c3954df7127c0bf526/visualstudioformac-preview-17.0.0.8001-pre.7-x64.dmg
sudo hdiutil attach visualstudioformac-preview-17.0.0.8001-pre.7-x64.dmg
rm -rf ~/Library/Preferences/VisualStudio
rm -rf ~/Library/Preferences/Visual\ Studio
rm -rf ~/Library/Logs/VisualStudio
rm -rf ~/Library/VisualStudio
rm -rf ~/Library/Preferences/Xamarin/
rm -rf ~/Library/Developer/Xamarin
rm -rf ~/Library/Application\ Support/VisualStudio
echo "Installing VSMac 17.0 Preview"
ditto -rsrc "/Volumes/Visual Studio (Preview)/" /Applications/
echo "Installing dotnet 6.0.1xx"
wget https://dot.net/v1/dotnet-install.sh
bash dotnet-install.sh --channel 6.0.1xx
echo "Building the extension"
-dotnet msbuild /p:Configuration=ReleaseMac /p:Platform="Any CPU" /t:Restore /t:Build
+dotnet msbuild /p:Configuration=ReleaseMac /p:Platform="Any CPU" /t:Restore
+cd Src/VimMac
+dotnet msbuild /p:Configuration=ReleaseMac /p:Platform="Any CPU" /t:Build
echo "Creating and installing Extension"
# Generate mpack extension artifact
-dotnet msbuild Src/VimMac/VimMac.csproj /t:InstallAddin
+dotnet msbuild VimMac.csproj /t:InstallAddin
|
VsVim/VsVim
|
cd1df2f8614b80c18ff95dbb01f736400675ca01
|
Remove spurious CA1416 errors
|
diff --git a/Src/VimMac/VimMac.csproj b/Src/VimMac/VimMac.csproj
index a29f301..bd0e8a3 100644
--- a/Src/VimMac/VimMac.csproj
+++ b/Src/VimMac/VimMac.csproj
@@ -1,39 +1,40 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<RootNamespace>Vim.Mac</RootNamespace>
<AssemblyName>Vim.Mac</AssemblyName>
<TargetFramework>net6.0</TargetFramework>
<DefineConstants>$(DefineConstants);VS_SPECIFIC_MAC</DefineConstants>
+ <!-- Suppress warning CA1416 -->
+ <EnableNETAnalyzers>false</EnableNETAnalyzers>
</PropertyGroup>
-
<ItemGroup>
<AddinReference Include="MonoDevelop.TextEditor.Cocoa" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\VimCore\VimCore.fsproj" />
<PackageReference Include="Microsoft.VisualStudioMac.Sdk" Version="17.0.0-preview.7955" />
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
<Folder Include="Resources\" />
<Folder Include="FPFExtensions\" />
<Folder Include="InlineRename\" />
<Folder Include="RelativeLineNumbers\" />
<Folder Include="RelativeLineNumbers\Util\" />
</ItemGroup>
<ItemGroup>
<None Remove="Resources\beep.wav" />
<None Remove="Resources\KeyBindingSchemeVim.xml" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\beep.wav" />
<EmbeddedResource Include="Resources\KeyBindingSchemeVim.xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\VimWpf\Implementation\Misc\ClipboardDevice.cs">
<Link>ClipboardDevice.cs</Link>
</Compile>
</ItemGroup>
</Project>
|
VsVim/VsVim
|
23c8900d6916e47f3476d43c94e71fc9a57946f1
|
Fix artifact path
|
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 9e1eec8..76b66dc 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,113 +1,114 @@
trigger:
branches:
include:
- master
- refs/tags/*
pr:
- dev/jaredpar/*
- master
-# Standard CI loop (build and test). This will run against VS2017 and VS2019
+# Standard CI loop (build and test). This will run against VSMac 17.0
jobs:
- job: macOS
pool:
vmImage: 'macOS-10.15'
steps:
- script: VERSION_TAG=`git describe --tags` && echo "##vso[task.setvariable variable=VERSION_TAG]$VERSION_TAG"
displayName: Set the tag name as an environment variable
- script: EXTENSION_VERSION=`grep Version Src/VimMac/Properties/AddinInfo.cs | cut -d "\"" -f2` && echo "##vso[task.setvariable variable=EXTENSION_VERSION]$EXTENSION_VERSION"
displayName: Set the version number of the extension as an environment variable
- task: Bash@3
displayName: Build
inputs:
filePath: Scripts/build.sh
- task: PublishBuildArtifacts@1
inputs:
- pathToPublish: Binaries/Debug/VimMac/net472/Vim.Mac.VsVim_$(EXTENSION_VERSION).mpack
+ pathToPublish: Binaries/Debug/VimMac/net6.0/Vim.Mac.VsVim_$(EXTENSION_VERSION).mpack
artifactName: VSMacExtension
- task: GitHubRelease@0
condition: and(startsWith(variables['build.sourceBranch'], 'refs/tags/'), contains(variables['build.sourceBranch'], 'vsm'))
inputs:
displayName: 'Release VS Mac extension'
gitHubConnection: automationConnection
repositoryName: '$(Build.Repository.Name)'
action: 'create'
target: '$(Build.SourceVersion)'
tagSource: 'auto'
title: 'Visual Studio for Mac $(VERSION_TAG)'
- assets: Binaries/Debug/VimMac/net472/Vim.Mac.VsVim_$(EXTENSION_VERSION).mpack
+ assets: Binaries/Debug/VimMac/net6.0/Vim.Mac.VsVim_$(EXTENSION_VERSION).mpack
assetUploadMode: 'replace'
isDraft: false
+# Standard CI loop (build and test). This will run against VS2017 and VS2019
- job: VsVim_Build_Test
pool:
vmImage: 'windows-2022'
steps:
- task: PowerShell@2
displayName: Build
inputs:
filePath: Scripts\Build.ps1
arguments: -ci -config Debug -build
- task: PowerShell@2
displayName: Test
inputs:
filePath: Scripts\Build.ps1
arguments: -ci -config Debug -test
- task: PowerShell@2
displayName: Test Extra
inputs:
filePath: Scripts\Build.ps1
arguments: -ci -config Debug -testExtra
- task: PublishPipelineArtifact@0
displayName: Publish Logs
inputs:
targetPath: '$(Build.SourcesDirectory)\Binaries\Logs'
artifactName: 'Logs Windows'
condition: always()
- task: PublishTestResults@2
displayName: Publish xUnit Test Results
inputs:
testRunner: XUnit
testResultsFiles: '$(Build.SourcesDirectory)\Binaries\xUnitResults\*.xml'
mergeTestResults: true
testRunTitle: 'VsVim Test Results'
condition: always()
# This job is meant for building a Release VSIX for consumption and
# publishing it to two locations:
# - An Azure DevOps artifact for easy download / use on PR or CI
# - The Open VSIX gallery during CI
- job: Produce_Vsix
pool:
vmImage: 'windows-2022'
steps:
- task: PowerShell@2
displayName: Build
inputs:
filePath: Scripts\Build.ps1
arguments: -ci -build -updateVsixVersion -config Release
- task: PublishPipelineArtifact@0
displayName: Publish Vsix
inputs:
targetPath: '$(Build.SourcesDirectory)\Binaries\Deploy'
artifactName: 'Vsix'
- task: PowerShell@2
displayName: Publish to Open VSIX Gallery
inputs:
filePath: Scripts\Build.ps1
arguments: -ci -uploadVsix -config Release
condition: and(succeeded(), eq(variables['Build.SourceBranchName'], 'master'))
|
VsVim/VsVim
|
7d8f7e53e29c2d8bc782feaae538ce7dc2af155a
|
:s/cho/echo
|
diff --git a/Scripts/build.sh b/Scripts/build.sh
index a4c8350..9538b9c 100755
--- a/Scripts/build.sh
+++ b/Scripts/build.sh
@@ -1,26 +1,26 @@
echo "Downloading VSMac"
wget --quiet https://download.visualstudio.microsoft.com/download/pr/a643750b-8690-4e7b-a088-9dfc3b2865ba/f315ac486e00a8c3954df7127c0bf526/visualstudioformac-preview-17.0.0.8001-pre.7-x64.dmg
sudo hdiutil attach visualstudioformac-preview-17.0.0.8001-pre.7-x64.dmg
rm -rf ~/Library/Preferences/VisualStudio
rm -rf ~/Library/Preferences/Visual\ Studio
rm -rf ~/Library/Logs/VisualStudio
rm -rf ~/Library/VisualStudio
rm -rf ~/Library/Preferences/Xamarin/
rm -rf ~/Library/Developer/Xamarin
rm -rf ~/Library/Application\ Support/VisualStudio
-cho "Installing VSMac 17.0 Preview"
+echo "Installing VSMac 17.0 Preview"
ditto -rsrc "/Volumes/Visual Studio (Preview)/" /Applications/
echo "Installing dotnet 6.0.1xx"
wget https://dot.net/v1/dotnet-install.sh
bash dotnet-install.sh --channel 6.0.1xx
echo "Building the extension"
dotnet msbuild /p:Configuration=ReleaseMac /p:Platform="Any CPU" /t:Restore /t:Build
echo "Creating and installing Extension"
# Generate mpack extension artifact
dotnet msbuild Src/VimMac/VimMac.csproj /t:InstallAddin
|
VsVim/VsVim
|
defd5d65821f7dd5d57deb310753e031175a7610
|
Fix /Volumes path for preview 7
|
diff --git a/Scripts/build.sh b/Scripts/build.sh
index e716045..a4c8350 100755
--- a/Scripts/build.sh
+++ b/Scripts/build.sh
@@ -1,29 +1,26 @@
echo "Downloading VSMac"
wget --quiet https://download.visualstudio.microsoft.com/download/pr/a643750b-8690-4e7b-a088-9dfc3b2865ba/f315ac486e00a8c3954df7127c0bf526/visualstudioformac-preview-17.0.0.8001-pre.7-x64.dmg
sudo hdiutil attach visualstudioformac-preview-17.0.0.8001-pre.7-x64.dmg
-echo "Removing pre-installed VSMac"
-sudo rm -rf "/Applications/Visual Studio.app"
-rm -rf ~/Library/Caches/VisualStudio
rm -rf ~/Library/Preferences/VisualStudio
rm -rf ~/Library/Preferences/Visual\ Studio
rm -rf ~/Library/Logs/VisualStudio
rm -rf ~/Library/VisualStudio
rm -rf ~/Library/Preferences/Xamarin/
rm -rf ~/Library/Developer/Xamarin
rm -rf ~/Library/Application\ Support/VisualStudio
-echo "Installing VSMac 17.0 Preview"
-ditto -rsrc "/Volumes/Visual Studio for Mac Preview Installer/" /Applications/
+cho "Installing VSMac 17.0 Preview"
+ditto -rsrc "/Volumes/Visual Studio (Preview)/" /Applications/
echo "Installing dotnet 6.0.1xx"
wget https://dot.net/v1/dotnet-install.sh
bash dotnet-install.sh --channel 6.0.1xx
echo "Building the extension"
dotnet msbuild /p:Configuration=ReleaseMac /p:Platform="Any CPU" /t:Restore /t:Build
echo "Creating and installing Extension"
# Generate mpack extension artifact
dotnet msbuild Src/VimMac/VimMac.csproj /t:InstallAddin
|
VsVim/VsVim
|
ae1a312b1567c4e787519cab721532128ef64936
|
Use VSMac Preview 7 in build script
|
diff --git a/Scripts/build.sh b/Scripts/build.sh
index 168be04..e716045 100755
--- a/Scripts/build.sh
+++ b/Scripts/build.sh
@@ -1,29 +1,29 @@
echo "Downloading VSMac"
-wget --quiet https://download.visualstudio.microsoft.com/download/pr/40d0790a-f7b7-44d3-a6e5-9bc5677fb1d7/28697450215d02cbec72e943d988f51f/visualstudioformacpreviewinstaller-17.0.0.149.dmg
+wget --quiet https://download.visualstudio.microsoft.com/download/pr/a643750b-8690-4e7b-a088-9dfc3b2865ba/f315ac486e00a8c3954df7127c0bf526/visualstudioformac-preview-17.0.0.8001-pre.7-x64.dmg
-sudo hdiutil attach visualstudioformacpreviewinstaller-17.0.0.149.dmg
+sudo hdiutil attach visualstudioformac-preview-17.0.0.8001-pre.7-x64.dmg
echo "Removing pre-installed VSMac"
sudo rm -rf "/Applications/Visual Studio.app"
rm -rf ~/Library/Caches/VisualStudio
rm -rf ~/Library/Preferences/VisualStudio
rm -rf ~/Library/Preferences/Visual\ Studio
rm -rf ~/Library/Logs/VisualStudio
rm -rf ~/Library/VisualStudio
rm -rf ~/Library/Preferences/Xamarin/
rm -rf ~/Library/Developer/Xamarin
rm -rf ~/Library/Application\ Support/VisualStudio
echo "Installing VSMac 17.0 Preview"
ditto -rsrc "/Volumes/Visual Studio for Mac Preview Installer/" /Applications/
echo "Installing dotnet 6.0.1xx"
wget https://dot.net/v1/dotnet-install.sh
bash dotnet-install.sh --channel 6.0.1xx
echo "Building the extension"
dotnet msbuild /p:Configuration=ReleaseMac /p:Platform="Any CPU" /t:Restore /t:Build
echo "Creating and installing Extension"
# Generate mpack extension artifact
dotnet msbuild Src/VimMac/VimMac.csproj /t:InstallAddin
|
VsVim/VsVim
|
11ee90f09da2651037e1bca624e0b57c4f424c8a
|
Install dotnet 6.0.1xx
|
diff --git a/Scripts/build.sh b/Scripts/build.sh
index 3082df2..168be04 100755
--- a/Scripts/build.sh
+++ b/Scripts/build.sh
@@ -1,23 +1,29 @@
echo "Downloading VSMac"
wget --quiet https://download.visualstudio.microsoft.com/download/pr/40d0790a-f7b7-44d3-a6e5-9bc5677fb1d7/28697450215d02cbec72e943d988f51f/visualstudioformacpreviewinstaller-17.0.0.149.dmg
sudo hdiutil attach visualstudioformacpreviewinstaller-17.0.0.149.dmg
echo "Removing pre-installed VSMac"
sudo rm -rf "/Applications/Visual Studio.app"
rm -rf ~/Library/Caches/VisualStudio
rm -rf ~/Library/Preferences/VisualStudio
rm -rf ~/Library/Preferences/Visual\ Studio
rm -rf ~/Library/Logs/VisualStudio
rm -rf ~/Library/VisualStudio
rm -rf ~/Library/Preferences/Xamarin/
rm -rf ~/Library/Developer/Xamarin
rm -rf ~/Library/Application\ Support/VisualStudio
echo "Installing VSMac 17.0 Preview"
ditto -rsrc "/Volumes/Visual Studio for Mac Preview Installer/" /Applications/
+echo "Installing dotnet 6.0.1xx"
+wget https://dot.net/v1/dotnet-install.sh
+bash dotnet-install.sh --channel 6.0.1xx
+
+echo "Building the extension"
dotnet msbuild /p:Configuration=ReleaseMac /p:Platform="Any CPU" /t:Restore /t:Build
+echo "Creating and installing Extension"
# Generate mpack extension artifact
dotnet msbuild Src/VimMac/VimMac.csproj /t:InstallAddin
|
VsVim/VsVim
|
abae27386e4cc1a220d2c9b69a26b907335aa5f0
|
Fix volume path
|
diff --git a/Scripts/build.sh b/Scripts/build.sh
index 05a34c6..3082df2 100755
--- a/Scripts/build.sh
+++ b/Scripts/build.sh
@@ -1,23 +1,23 @@
echo "Downloading VSMac"
wget --quiet https://download.visualstudio.microsoft.com/download/pr/40d0790a-f7b7-44d3-a6e5-9bc5677fb1d7/28697450215d02cbec72e943d988f51f/visualstudioformacpreviewinstaller-17.0.0.149.dmg
sudo hdiutil attach visualstudioformacpreviewinstaller-17.0.0.149.dmg
echo "Removing pre-installed VSMac"
sudo rm -rf "/Applications/Visual Studio.app"
rm -rf ~/Library/Caches/VisualStudio
rm -rf ~/Library/Preferences/VisualStudio
rm -rf ~/Library/Preferences/Visual\ Studio
rm -rf ~/Library/Logs/VisualStudio
rm -rf ~/Library/VisualStudio
rm -rf ~/Library/Preferences/Xamarin/
rm -rf ~/Library/Developer/Xamarin
rm -rf ~/Library/Application\ Support/VisualStudio
echo "Installing VSMac 17.0 Preview"
-ditto -rsrc "/Volumes/Visual Studio (Preview)/" /Applications/
+ditto -rsrc "/Volumes/Visual Studio for Mac Preview Installer/" /Applications/
dotnet msbuild /p:Configuration=ReleaseMac /p:Platform="Any CPU" /t:Restore /t:Build
-# Generate Vim.Mac.VsVim_2.8.0.0.mpack extension artifact
+# Generate mpack extension artifact
dotnet msbuild Src/VimMac/VimMac.csproj /t:InstallAddin
|
VsVim/VsVim
|
97fa2813f3351575743dea0e59e1e5d8f74277ad
|
Build path fixes
|
diff --git a/Scripts/build.sh b/Scripts/build.sh
index e39c674..05a34c6 100755
--- a/Scripts/build.sh
+++ b/Scripts/build.sh
@@ -1,23 +1,23 @@
echo "Downloading VSMac"
wget --quiet https://download.visualstudio.microsoft.com/download/pr/40d0790a-f7b7-44d3-a6e5-9bc5677fb1d7/28697450215d02cbec72e943d988f51f/visualstudioformacpreviewinstaller-17.0.0.149.dmg
-sudo hdiutil attach visualstudioformac-17.0.0.149.dmg
+sudo hdiutil attach visualstudioformacpreviewinstaller-17.0.0.149.dmg
echo "Removing pre-installed VSMac"
sudo rm -rf "/Applications/Visual Studio.app"
rm -rf ~/Library/Caches/VisualStudio
rm -rf ~/Library/Preferences/VisualStudio
rm -rf ~/Library/Preferences/Visual\ Studio
rm -rf ~/Library/Logs/VisualStudio
rm -rf ~/Library/VisualStudio
rm -rf ~/Library/Preferences/Xamarin/
rm -rf ~/Library/Developer/Xamarin
rm -rf ~/Library/Application\ Support/VisualStudio
echo "Installing VSMac 17.0 Preview"
ditto -rsrc "/Volumes/Visual Studio (Preview)/" /Applications/
dotnet msbuild /p:Configuration=ReleaseMac /p:Platform="Any CPU" /t:Restore /t:Build
# Generate Vim.Mac.VsVim_2.8.0.0.mpack extension artifact
-msbuild Src/VimMac/VimMac.csproj /t:InstallAddin
+dotnet msbuild Src/VimMac/VimMac.csproj /t:InstallAddin
|
VsVim/VsVim
|
2c755f26e35f20f45617bf3caca9bc1c1db050af
|
Bump Microsoft.VisualStudioMac.Sdk version
|
diff --git a/Src/VimMac/VimMac.csproj b/Src/VimMac/VimMac.csproj
index 3eb6701..a29f301 100644
--- a/Src/VimMac/VimMac.csproj
+++ b/Src/VimMac/VimMac.csproj
@@ -1,39 +1,39 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<RootNamespace>Vim.Mac</RootNamespace>
<AssemblyName>Vim.Mac</AssemblyName>
<TargetFramework>net6.0</TargetFramework>
<DefineConstants>$(DefineConstants);VS_SPECIFIC_MAC</DefineConstants>
</PropertyGroup>
<ItemGroup>
<AddinReference Include="MonoDevelop.TextEditor.Cocoa" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\VimCore\VimCore.fsproj" />
- <PackageReference Include="Microsoft.VisualStudioMac.Sdk" Version="17.0.0" />
+ <PackageReference Include="Microsoft.VisualStudioMac.Sdk" Version="17.0.0-preview.7955" />
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
<Folder Include="Resources\" />
<Folder Include="FPFExtensions\" />
<Folder Include="InlineRename\" />
<Folder Include="RelativeLineNumbers\" />
<Folder Include="RelativeLineNumbers\Util\" />
</ItemGroup>
<ItemGroup>
<None Remove="Resources\beep.wav" />
<None Remove="Resources\KeyBindingSchemeVim.xml" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\beep.wav" />
<EmbeddedResource Include="Resources\KeyBindingSchemeVim.xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\VimWpf\Implementation\Misc\ClipboardDevice.cs">
<Link>ClipboardDevice.cs</Link>
</Compile>
</ItemGroup>
</Project>
|
VsVim/VsVim
|
3d94f58f68fac510e00ca74ba0a123f026660e71
|
Fix CodeHygiene tests
|
diff --git a/Test/VimCoreTest/CodeHygieneTest.cs b/Test/VimCoreTest/CodeHygieneTest.cs
index 26123ee..8517cb0 100644
--- a/Test/VimCoreTest/CodeHygieneTest.cs
+++ b/Test/VimCoreTest/CodeHygieneTest.cs
@@ -1,190 +1,191 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Text;
using Xunit;
using Vim.Extensions;
using Microsoft.FSharp.Core;
namespace Vim.UnitTest
{
/// <summary>
/// Pedantic code hygiene tests for the code base
/// </summary>
public abstract class CodeHygieneTest
{
private readonly Assembly _testAssembly = typeof(CodeHygieneTest).Assembly;
private readonly Assembly _sourceAssembly = typeof(VimImpl).Assembly;
private static bool IsDiscriminatedUnion(Type type)
{
var attribute = type.GetCustomAttributes(typeof(CompilationMappingAttribute), inherit: true);
if (attribute == null || attribute.Length != 1)
{
return false;
}
var compilatioMappingAttribute = (CompilationMappingAttribute)attribute[0];
var flags = compilatioMappingAttribute.SourceConstructFlags & ~SourceConstructFlags.NonPublicRepresentation;
return flags == SourceConstructFlags.SumType;
}
/// <summary>
/// Determine if this type is one that was embedded from FSharp.Core.dll
/// </summary>
private static bool IsFSharpCore(Type type)
{
return type.FullName.StartsWith("Microsoft.FSharp", StringComparison.Ordinal);
}
public sealed class NamingTest : CodeHygieneTest
{
[Fact]
private void TestNamespace()
{
foreach (var type in _testAssembly.GetTypes().Where(x => x.IsPublic))
{
if (type.FullName.StartsWith("Vim.UnitTest.", StringComparison.Ordinal) ||
type.FullName.StartsWith("Vim.EditorHost.", StringComparison.Ordinal) ||
type.FullName.StartsWith("Vim.UI.Wpf.", StringComparison.Ordinal))
{
continue;
}
Assert.False(true, $"Type {type.FullName} has incorrect namespace");
}
}
[Fact]
public void CodeNamespace()
{
const string prefix = "Vim.";
foreach (var type in typeof(IVim).Assembly.GetTypes())
{
if (type.FullName.StartsWith("<Startup", StringComparison.Ordinal) ||
type.FullName.StartsWith("Microsoft.FSharp", StringComparison.Ordinal) ||
- type.FullName.StartsWith("Microsoft.BuildSettings", StringComparison.Ordinal))
+ type.FullName.StartsWith("Microsoft.BuildSettings", StringComparison.Ordinal) ||
+ type.FullName.StartsWith("FSharp.BuildProperties", StringComparison.Ordinal))
{
continue;
}
Assert.True(type.FullName.StartsWith(prefix, StringComparison.Ordinal), $"Type {type.FullName} has incorrect prefix");
}
}
/// <summary>
/// Make sure all discriminated unions in the code base have RequiresQualifiedAccess
/// on them
/// </summary>
[Fact]
public void RequiresQualifiedAccess()
{
var any = false;
var list = new List<string>();
var types = _sourceAssembly
.GetTypes()
.Where(IsDiscriminatedUnion)
.Where(x => !IsFSharpCore(x));
foreach (var type in types)
{
any = true;
var attrib = type.GetCustomAttributes(typeof(RequireQualifiedAccessAttribute), inherit: true);
if (attrib == null || attrib.Length != 1)
{
list.Add($"{type.Name} does not have [<RequiresQualifiedAccess>]");
}
}
Assert.True(any);
var msg = list.Count == 0
? string.Empty
: list.Aggregate((x, y) => x + Environment.NewLine + y);
Assert.True(0 == list.Count, msg);
}
/// <summary>
/// Make sure all discriminated union values have explicit names
/// </summary>
[Fact]
public void UseExplicitRecordNames()
{
var any = false;
var list = new List<string>();
var types = _sourceAssembly
.GetTypes()
.Where(x => x.BaseType != null && IsDiscriminatedUnion(x.BaseType))
.Where(x => !IsFSharpCore(x));
foreach (var type in types)
{
any = true;
var anyItem = false;
foreach (var prop in type.GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.DeclaredOnly))
{
if (prop.Name.StartsWith("Item"))
{
anyItem = true;
break;
}
}
if (anyItem)
{
list.Add($"{type.BaseType.Name}.{type.Name} values do not have an explicit name");
}
}
Assert.True(any);
var msg = list.Count == 0
? string.Empty
: $"{list.Count} union values do not have explicit names" + Environment.NewLine + list.Aggregate((x, y) => x + Environment.NewLine + y);
Assert.True(0 == list.Count, msg);
}
}
/// <summary>
/// Simple code coverage checks that just don't merit and entire class to themselves
/// </summary>
public abstract class CodeCoverageTest : CodeHygieneTest
{
public sealed class Equality : CodeCoverageTest
{
private void Run<T>(T value, T otherValue)
{
EqualityUtil.RunAll(EqualityUnit.Create(value)
.WithEqualValues(value)
.WithNotEqualValues(otherValue));
}
[Fact]
public void DiscriminatedUnions()
{
Run(BlockCaretLocation.BottomLeft, BlockCaretLocation.BottomRight);
Run(CaretColumn.NewInLastLine(0), CaretColumn.NewInLastLine(1));
Run(CaretColumn.NewInLastLine(0), CaretColumn.NewInLastLine(2));
Run(CaseSpecifier.IgnoreCase, CaseSpecifier.None);
Run(ChangeCharacterKind.Rot13, ChangeCharacterKind.ToggleCase);
Run(CharSearchKind.TillChar, CharSearchKind.ToChar);
Run(KeyRemapMode.Language, KeyRemapMode.Normal);
Run(DirectiveKind.If, DirectiveKind.Else);
Run(MagicKind.NoMagic, MagicKind.Magic);
Run(MatchingTokenKind.Braces, MatchingTokenKind.Brackets);
Run(MotionContext.AfterOperator, MotionContext.Movement);
Run(MotionKind.LineWise, MotionKind.CharacterWiseExclusive);
Run(NumberFormat.Alpha, NumberFormat.Decimal);
Run(NumberValue.NewAlpha('c'), NumberValue.NewDecimal(1));
Run(OperationKind.CharacterWise, OperationKind.LineWise);
Run(RegisterOperation.Delete, RegisterOperation.Yank);
Run(SectionKind.Default, SectionKind.OnCloseBrace);
Run(SentenceKind.Default, SentenceKind.NoTrailingCharacters);
Run(SettingKind.Number, SettingKind.String);
Run(SelectionKind.Exclusive, SelectionKind.Inclusive);
Run(SettingValue.NewNumber(1), SettingValue.NewNumber(2));
Run(TextObjectKind.AlwaysCharacter, TextObjectKind.AlwaysLine);
Run(UnmatchedTokenKind.CurlyBracket, UnmatchedTokenKind.Paren);
Run(WordKind.BigWord, WordKind.NormalWord);
}
}
}
}
}
|
VsVim/VsVim
|
7d3d9331597e46543b0729445aed66c804add90d
|
Bump Windows agent to get .NET 6
|
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 0d26b8f..9e1eec8 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,113 +1,113 @@
trigger:
branches:
include:
- master
- refs/tags/*
pr:
- dev/jaredpar/*
- master
# Standard CI loop (build and test). This will run against VS2017 and VS2019
jobs:
- job: macOS
pool:
vmImage: 'macOS-10.15'
steps:
- script: VERSION_TAG=`git describe --tags` && echo "##vso[task.setvariable variable=VERSION_TAG]$VERSION_TAG"
displayName: Set the tag name as an environment variable
- script: EXTENSION_VERSION=`grep Version Src/VimMac/Properties/AddinInfo.cs | cut -d "\"" -f2` && echo "##vso[task.setvariable variable=EXTENSION_VERSION]$EXTENSION_VERSION"
displayName: Set the version number of the extension as an environment variable
- task: Bash@3
displayName: Build
inputs:
filePath: Scripts/build.sh
- task: PublishBuildArtifacts@1
inputs:
pathToPublish: Binaries/Debug/VimMac/net472/Vim.Mac.VsVim_$(EXTENSION_VERSION).mpack
artifactName: VSMacExtension
- task: GitHubRelease@0
condition: and(startsWith(variables['build.sourceBranch'], 'refs/tags/'), contains(variables['build.sourceBranch'], 'vsm'))
inputs:
displayName: 'Release VS Mac extension'
gitHubConnection: automationConnection
repositoryName: '$(Build.Repository.Name)'
action: 'create'
target: '$(Build.SourceVersion)'
tagSource: 'auto'
title: 'Visual Studio for Mac $(VERSION_TAG)'
assets: Binaries/Debug/VimMac/net472/Vim.Mac.VsVim_$(EXTENSION_VERSION).mpack
assetUploadMode: 'replace'
isDraft: false
- job: VsVim_Build_Test
pool:
- vmImage: 'windows-2019'
+ vmImage: 'windows-2022'
steps:
- task: PowerShell@2
displayName: Build
inputs:
filePath: Scripts\Build.ps1
arguments: -ci -config Debug -build
- task: PowerShell@2
displayName: Test
inputs:
filePath: Scripts\Build.ps1
arguments: -ci -config Debug -test
- task: PowerShell@2
displayName: Test Extra
inputs:
filePath: Scripts\Build.ps1
arguments: -ci -config Debug -testExtra
- task: PublishPipelineArtifact@0
displayName: Publish Logs
inputs:
targetPath: '$(Build.SourcesDirectory)\Binaries\Logs'
artifactName: 'Logs Windows'
condition: always()
- task: PublishTestResults@2
displayName: Publish xUnit Test Results
inputs:
testRunner: XUnit
testResultsFiles: '$(Build.SourcesDirectory)\Binaries\xUnitResults\*.xml'
mergeTestResults: true
testRunTitle: 'VsVim Test Results'
condition: always()
# This job is meant for building a Release VSIX for consumption and
# publishing it to two locations:
# - An Azure DevOps artifact for easy download / use on PR or CI
# - The Open VSIX gallery during CI
- job: Produce_Vsix
pool:
- vmImage: 'windows-2019'
+ vmImage: 'windows-2022'
steps:
- task: PowerShell@2
displayName: Build
inputs:
filePath: Scripts\Build.ps1
arguments: -ci -build -updateVsixVersion -config Release
- task: PublishPipelineArtifact@0
displayName: Publish Vsix
inputs:
targetPath: '$(Build.SourcesDirectory)\Binaries\Deploy'
artifactName: 'Vsix'
- task: PowerShell@2
displayName: Publish to Open VSIX Gallery
inputs:
filePath: Scripts\Build.ps1
arguments: -ci -uploadVsix -config Release
condition: and(succeeded(), eq(variables['Build.SourceBranchName'], 'master'))
|
VsVim/VsVim
|
786c4a3b1d493232166af39af993dfefd615ba10
|
Remove VSMac SDK source to see if Windows builds
|
diff --git a/nuget.config b/nuget.config
index ef1aeb7..f3a6fd3 100644
--- a/nuget.config
+++ b/nuget.config
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<clear />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="vssdk" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json" />
- <add key="vsmacsdk" value="https://devdiv.pkgs.visualstudio.com/DevDiv/_packaging/VSMac/nuget/v3/index.json" />
</packageSources>
</configuration>
|
VsVim/VsVim
|
ecbbd693b33924d1fa9950581ae0ba5afdad27ec
|
Bump mac bot to macOS-10.15
|
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index f881547..0d26b8f 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,113 +1,113 @@
trigger:
branches:
include:
- master
- refs/tags/*
pr:
- dev/jaredpar/*
- master
# Standard CI loop (build and test). This will run against VS2017 and VS2019
jobs:
- job: macOS
pool:
- vmImage: 'macOS-10.14'
+ vmImage: 'macOS-10.15'
steps:
- script: VERSION_TAG=`git describe --tags` && echo "##vso[task.setvariable variable=VERSION_TAG]$VERSION_TAG"
displayName: Set the tag name as an environment variable
- script: EXTENSION_VERSION=`grep Version Src/VimMac/Properties/AddinInfo.cs | cut -d "\"" -f2` && echo "##vso[task.setvariable variable=EXTENSION_VERSION]$EXTENSION_VERSION"
displayName: Set the version number of the extension as an environment variable
- task: Bash@3
displayName: Build
inputs:
filePath: Scripts/build.sh
- task: PublishBuildArtifacts@1
inputs:
pathToPublish: Binaries/Debug/VimMac/net472/Vim.Mac.VsVim_$(EXTENSION_VERSION).mpack
artifactName: VSMacExtension
- task: GitHubRelease@0
condition: and(startsWith(variables['build.sourceBranch'], 'refs/tags/'), contains(variables['build.sourceBranch'], 'vsm'))
inputs:
displayName: 'Release VS Mac extension'
gitHubConnection: automationConnection
repositoryName: '$(Build.Repository.Name)'
action: 'create'
target: '$(Build.SourceVersion)'
tagSource: 'auto'
title: 'Visual Studio for Mac $(VERSION_TAG)'
assets: Binaries/Debug/VimMac/net472/Vim.Mac.VsVim_$(EXTENSION_VERSION).mpack
assetUploadMode: 'replace'
isDraft: false
- job: VsVim_Build_Test
pool:
vmImage: 'windows-2019'
steps:
- task: PowerShell@2
displayName: Build
inputs:
filePath: Scripts\Build.ps1
arguments: -ci -config Debug -build
- task: PowerShell@2
displayName: Test
inputs:
filePath: Scripts\Build.ps1
arguments: -ci -config Debug -test
- task: PowerShell@2
displayName: Test Extra
inputs:
filePath: Scripts\Build.ps1
arguments: -ci -config Debug -testExtra
- task: PublishPipelineArtifact@0
displayName: Publish Logs
inputs:
targetPath: '$(Build.SourcesDirectory)\Binaries\Logs'
artifactName: 'Logs Windows'
condition: always()
- task: PublishTestResults@2
displayName: Publish xUnit Test Results
inputs:
testRunner: XUnit
testResultsFiles: '$(Build.SourcesDirectory)\Binaries\xUnitResults\*.xml'
mergeTestResults: true
testRunTitle: 'VsVim Test Results'
condition: always()
# This job is meant for building a Release VSIX for consumption and
# publishing it to two locations:
# - An Azure DevOps artifact for easy download / use on PR or CI
# - The Open VSIX gallery during CI
- job: Produce_Vsix
pool:
vmImage: 'windows-2019'
steps:
- task: PowerShell@2
displayName: Build
inputs:
filePath: Scripts\Build.ps1
arguments: -ci -build -updateVsixVersion -config Release
- task: PublishPipelineArtifact@0
displayName: Publish Vsix
inputs:
targetPath: '$(Build.SourcesDirectory)\Binaries\Deploy'
artifactName: 'Vsix'
- task: PowerShell@2
displayName: Publish to Open VSIX Gallery
inputs:
filePath: Scripts\Build.ps1
arguments: -ci -uploadVsix -config Release
condition: and(succeeded(), eq(variables['Build.SourceBranchName'], 'master'))
|
VsVim/VsVim
|
2fae6bfdf05d504dbe75d046e4c4e45c8ec59976
|
multi-target VimCore
|
diff --git a/Src/VimCore/VimCore.fsproj b/Src/VimCore/VimCore.fsproj
index 654570f..216c9d4 100644
--- a/Src/VimCore/VimCore.fsproj
+++ b/Src/VimCore/VimCore.fsproj
@@ -1,160 +1,160 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<RootNamespace>Vim.Core</RootNamespace>
<AssemblyName>Vim.Core</AssemblyName>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFrameworks>net472;net6.0</TargetFrameworks>
<OtherFlags>--standalone</OtherFlags>
<NoWarn>2011</NoWarn>
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
<DebugType>portable</DebugType>
</PropertyGroup>
<ItemGroup>
<None Include="README.md" />
<Compile Include="Resources.fs" />
<Compile Include="Constants.fs" />
<Compile Include="FSharpUtil.fs" />
<Compile Include="VimTrace.fs" />
<Compile Include="StringUtil.fs" />
<Compile Include="Util.fs" />
<Compile Include="VimKey.fs" />
<Compile Include="KeyInput.fsi" />
<Compile Include="KeyInput.fs" />
<Compile Include="Unicode.fsi" />
<Compile Include="Unicode.fs" />
<Compile Include="CoreTypes.fs" />
<Compile Include="EditorUtil.fs" />
<Compile Include="Register.fs" />
<Compile Include="VimCharSet.fsi" />
<Compile Include="VimCharSet.fs" />
<Compile Include="VimSettingsInterface.fs" />
<Compile Include="Interpreter_Expression.fs" />
<Compile Include="TaggingInterfaces.fs" />
<Compile Include="WordUtil.fsi" />
<Compile Include="WordUtil.fs" />
<Compile Include="CoreInterfaces.fs" />
<Compile Include="CoreInternalInterfaces.fs" />
<Compile Include="CountCapture.fs" />
<Compile Include="VimRegexOptions.fs" />
<Compile Include="VimRegex.fsi" />
<Compile Include="VimRegex.fs" />
<Compile Include="MefInterfaces.fs" />
<Compile Include="KeyNotationUtil.fsi" />
<Compile Include="KeyNotationUtil.fs" />
<Compile Include="DigraphUtil.fs" />
<Compile Include="MotionCapture.fs" />
<Compile Include="RegexUtil.fs" />
<Compile Include="HistoryUtil.fsi" />
<Compile Include="HistoryUtil.fs" />
<Compile Include="PatternUtil.fs" />
<Compile Include="CommonOperations.fsi" />
<Compile Include="CommonOperations.fs" />
<Compile Include="Interpreter_Tokens.fs" />
<Compile Include="Interpreter_Tokenizer.fsi" />
<Compile Include="Interpreter_Tokenizer.fs" />
<Compile Include="Interpreter_Parser.fsi" />
<Compile Include="Interpreter_Parser.fs" />
<Compile Include="Interpreter_Interpreter.fsi" />
<Compile Include="Interpreter_Interpreter.fs" />
<Compile Include="CommandFactory.fsi" />
<Compile Include="CommandFactory.fs" />
<Compile Include="Modes_Command_CommandMode.fsi" />
<Compile Include="Modes_Command_CommandMode.fs" />
<Compile Include="Modes_Normal_NormalMode.fsi" />
<Compile Include="Modes_Normal_NormalMode.fs" />
<Compile Include="Modes_Insert_Components.fs" />
<Compile Include="Modes_Insert_InsertMode.fsi" />
<Compile Include="Modes_Insert_InsertMode.fs" />
<Compile Include="Modes_Visual_ISelectionTracker.fs" />
<Compile Include="Modes_Visual_SelectionTracker.fs" />
<Compile Include="Modes_Visual_VisualMode.fsi" />
<Compile Include="Modes_Visual_VisualMode.fs" />
<Compile Include="Modes_Visual_SelectMode.fsi" />
<Compile Include="Modes_Visual_SelectMode.fs" />
<Compile Include="Modes_SubstituteConfirm_SubstituteConfirmMode.fsi" />
<Compile Include="Modes_SubstituteConfirm_SubstituteConfirmMode.fs" />
<Compile Include="IncrementalSearch.fsi" />
<Compile Include="IncrementalSearch.fs" />
<Compile Include="CommandUtil.fsi" />
<Compile Include="CommandUtil.fs" />
<Compile Include="InsertUtil.fsi" />
<Compile Include="InsertUtil.fs" />
<Compile Include="TaggerUtil.fsi" />
<Compile Include="TaggerUtil.fs" />
<Compile Include="Tagger.fsi" />
<Compile Include="Tagger.fs" />
<Compile Include="CaretChangeTracker.fsi" />
<Compile Include="CaretChangeTracker.fs" />
<Compile Include="SelectionChangeTracker.fsi" />
<Compile Include="SelectionChangeTracker.fs" />
<Compile Include="MultiSelectionTracker.fsi" />
<Compile Include="MultiSelectionTracker.fs" />
<Compile Include="FoldManager.fsi" />
<Compile Include="FoldManager.fs" />
<Compile Include="ModeLineInterpreter.fsi" />
<Compile Include="ModeLineInterpreter.fs" />
<Compile Include="VimTextBuffer.fsi" />
<Compile Include="VimTextBuffer.fs" />
<Compile Include="VimBuffer.fsi" />
<Compile Include="VimBuffer.fs" />
<Compile Include="TextObjectUtil.fsi" />
<Compile Include="TextObjectUtil.fs" />
<Compile Include="MotionUtil.fsi" />
<Compile Include="MotionUtil.fs" />
<Compile Include="SearchService.fsi" />
<Compile Include="SearchService.fs" />
<Compile Include="RegisterMap.fsi" />
<Compile Include="RegisterMap.fs" />
<Compile Include="CaretRegisterMap.fsi" />
<Compile Include="CaretRegisterMap.fs" />
<Compile Include="ExternalEdit.fs" />
<Compile Include="DisabledMode.fs" />
<Compile Include="MarkMap.fsi" />
<Compile Include="MarkMap.fs" />
<Compile Include="MacroRecorder.fsi" />
<Compile Include="MacroRecorder.fs" />
<Compile Include="KeyMap.fsi" />
<Compile Include="KeyMap.fs" />
<Compile Include="DigraphMap.fsi" />
<Compile Include="DigraphMap.fs" />
<Compile Include="JumpList.fs" />
<Compile Include="LineNumbersMarginOption.fs" />
<Compile Include="VimSettings.fsi" />
<Compile Include="VimSettings.fs" />
<Compile Include="FileSystem.fs" />
<Compile Include="UndoRedoOperations.fsi" />
<Compile Include="UndoRedoOperations.fs" />
<Compile Include="CommandRunner.fsi" />
<Compile Include="CommandRunner.fs" />
<Compile Include="AutoCommandRunner.fsi" />
<Compile Include="AutoCommandRunner.fs" />
<Compile Include="Vim.fs" />
<Compile Include="StatusUtil.fsi" />
<Compile Include="StatusUtil.fs" />
<Compile Include="LineChangeTracker.fsi" />
<Compile Include="LineChangeTracker.fs" />
<Compile Include="MefComponents.fsi" />
<Compile Include="MefComponents.fs" />
<Compile Include="FSharpExtensions.fs" />
<Compile Include="AssemblyInfo.fs" />
</ItemGroup>
<ItemGroup>
<!-- Using element form vs. attributes to work around NuGet restore bug
https://github.com/NuGet/Home/issues/6367
https://github.com/dotnet/project-system/issues/3493 -->
<PackageReference Include="FSharp.Core" Version="6.0.3">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="System.ComponentModel.Composition" Version="6.0.0" />
<Reference Include="Microsoft.VisualStudio.CoreUtility, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.Text.Data, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.Text.Logic, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.Text.UI, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="mscorlib" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Numerics" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Xml" />
</ItemGroup>
</Project>
|
VsVim/VsVim
|
2a8b9175af13144b96aa85df4a520bf29dde98a8
|
Switch to net6
|
diff --git a/Src/VimCore/FSharpUtil.fs b/Src/VimCore/FSharpUtil.fs
index d10bda7..c93dcc9 100644
--- a/Src/VimCore/FSharpUtil.fs
+++ b/Src/VimCore/FSharpUtil.fs
@@ -75,964 +75,964 @@ module internal NullableUtil =
let ToOption (x: System.Nullable<_>) =
if x.HasValue then
Some x.Value
else
None
[<AbstractClass>]
type internal ToggleHandler() =
abstract Add: unit -> unit
abstract Remove: unit -> unit
static member Create<'T> (source:System.IObservable<'T>) (func: 'T -> unit) = ToggleHandler<'T>(source,func)
static member Empty =
{ new ToggleHandler() with
member x.Add() = ()
member x.Remove() = () }
and internal ToggleHandler<'T>
(
_source: System.IObservable<'T>,
_func: 'T -> unit) =
inherit ToggleHandler()
let mutable _handler: System.IDisposable option = None
override x.Add() =
match _handler with
| Some(_) -> failwith "Already subscribed"
| None -> _handler <- _source |> Observable.subscribe _func |> Option.Some
override x.Remove() =
match _handler with
| Some(actual) ->
actual.Dispose()
_handler <- None
| None -> ()
/// F# friendly typed wrapper around the WeakReference class
type internal WeakReference<'T>( _weak: System.WeakReference ) =
member x.Target =
let v = _weak.Target
if v = null then
None
else
let v = v :?> 'T
Some v
module internal WeakReferenceUtil =
let Create<'T> (value: 'T) =
let weakReference = System.WeakReference(value)
WeakReference<'T>(weakReference)
module internal ListUtil =
let divide l = (l |> List.head), (l |> List.tail)
/// Try and get the head of the list. Will return the head of list and tail
/// as separate elements. Returns None if the list is empty
let tryHead l =
if List.isEmpty l then None
else Some (divide l)
let tryHeadOnly l =
if List.isEmpty l then None
else Some (List.head l)
let tryProcessHead l ifNonEmpty ifEmpty =
if List.isEmpty l then
ifEmpty()
else
let head,tail = divide l
ifNonEmpty head tail
let rec skip count l =
if count <= 0 then l
else
let _,tail = l |> divide
skip (count - 1) tail
let rec skipMax count l =
if count <= 0 then
l
else
match l with
| [] -> []
| _ :: tail -> skipMax (count - 1) tail
let rec skipWhile predicate l =
match l with
| h::t ->
if predicate h then skipWhile predicate t
else l
| [] -> l
let rec contentsEqual left right =
if List.length left <> List.length right then false
else
let leftData = tryHead left
let rightData = tryHead right
match leftData,rightData with
| None,None -> true
| Some(_),None -> false
| None,Some(_) -> false
| Some(leftHead,leftRest),Some(rightHead,rightRest) ->
if leftHead = rightHead then contentsEqual leftRest rightRest
else false
let rec contains value l =
match l with
| h::t ->
if h = value then true
else contains value t
| [] -> false
/// Is the head of the list the specified value
let isHead value list =
match list with
| [] -> false
| head :: _ -> head = value
module internal SeqUtil =
/// Try and get the head of the Sequence. Will return the head of list and tail
/// as separate elements. Returns None if the list is empty
let tryHead l =
if Seq.isEmpty l then None
else
let head = Seq.head l
let tail = l |> Seq.skip 1
Some (head,tail)
/// Get the head element in the sequence. Throws an ArgumentException if
/// the sequence is empty
let head (s:'a seq) =
match tryHead s with
| Some (h, _) -> h
| None -> invalidArg "s" "Sequence must not be empty"
/// Try and get the head of the sequence
let tryHeadOnly (sequence: 'a seq) =
use e = sequence.GetEnumerator()
if e.MoveNext() then
Some e.Current
else
None
/// Get the head of the sequence or the default value if the sequence is empty
let headOrDefault defaultValue l =
match tryHeadOnly l with
| Some h -> h
| None -> defaultValue
/// Get the last element in the sequence. Returns the None if
/// the sequence is empty
let tryLast (s:'a seq) =
use e = s.GetEnumerator()
if not (e.MoveNext()) then
None
else
let mutable value = e.Current
while e.MoveNext() do
value <- e.Current
Some value
/// Get the last element in the sequence. Throws an ArgumentException if
/// the sequence is empty
let last (s:'a seq) =
match tryLast s with
| Some h -> h
| None -> invalidArg "s" "Sequence must not be empty"
/// Get the last element in the sequence. Returns the default value if
/// the sequence is empty
let lastOrDefault defaultValue (s:'a seq) =
match tryLast s with
| Some h -> h
| None -> defaultValue
/// Return if the sequence is not empty
let isNotEmpty s = not (s |> Seq.isEmpty)
/// Returns if any of the elements in the sequence match the provided filter
let any filter s = s |> Seq.filter filter |> isNotEmpty
/// Returns if there exits an element in the collection which matches the specified
/// filter. Identical to exists except it passes an index
let existsi filter s =
s
|> Seq.mapi (fun i e -> (i, e))
|> Seq.exists (fun (i, e) -> filter i e)
/// Maps a seq of options to an option of list where None indicates at least one
/// entry was None and Some indicates all entries had values
let allOrNone s =
let rec inner s withNext =
if s |> Seq.isEmpty then withNext [] |> Some
else
match s |> Seq.head with
| None -> None
| Some(cur) ->
let rest = s |> Seq.skip 1
inner rest (fun next -> withNext (cur :: next))
inner s (fun all -> all)
/// Append a single element to the end of a sequence
let appendSingle element sequence =
let right = element |> Seq.singleton
Seq.append sequence right
/// Try and find the first value which meets the specified filter. If it does not exist then
/// return the specified default value
let tryFindOrDefault filter defaultValue sequence =
match Seq.tryFind filter sequence with
| Some(value) -> value
| None -> defaultValue
let filter2 filter sequence =
seq {
let index = ref 0
for cur in sequence do
if filter index.Value cur then
yield cur
index.Value <- index.Value + 1
}
/// Filter the list removing all None's
let filterToSome sequence =
seq {
for cur in sequence do
match cur with
| Some(value) -> yield value
| None -> ()
}
/// Filters the list removing all of the first tuple arguments which are None
let filterToSome2 (sequence: ('a option * 'b) seq) =
seq {
for cur in sequence do
let first,second = cur
match first with
| Some(value) -> yield (value,second)
| None -> ()
}
let contentsEqual (left:'a seq) (right:'a seq) =
use leftEnumerator = left.GetEnumerator()
use rightEnumerator = right.GetEnumerator()
let mutable areEqual = false
let mutable isDone = false
while not isDone do
let leftMove = leftEnumerator.MoveNext()
let rightMove = rightEnumerator.MoveNext()
isDone <-
if not leftMove && not rightMove then
areEqual <- true
true
elif leftMove <> rightMove then true
elif leftEnumerator.Current <> rightEnumerator.Current then true
else false
areEqual
/// Skip's a maximum of count elements. If there are more than
/// count elements in the sequence then an empty sequence will be
/// returned
let skipMax count (sequence:'a seq) =
let inner count =
seq {
let count = ref count
use e = sequence.GetEnumerator()
while !count > 0 && e.MoveNext() do
count := !count - 1
while e.MoveNext() do
yield e.Current }
inner count
/// Same functionality as Seq.tryFind except it allows you to pass
/// a state value along
let tryFind initialState predicate (sequence: 'a seq) =
use e = sequence.GetEnumerator()
let rec inner state =
match predicate e.Current state with
| true, _ -> Some e.Current
| false, state ->
if e.MoveNext() then
inner state
else
None
if e.MoveNext() then
inner initialState
else
None
module internal MapUtil =
/// Get the set of keys in the Map
let keys (map:Map<'TKey,'TValue>) = map |> Seq.map (fun pair -> pair.Key)
module internal GenericListUtil =
let OfSeq (col: 'T seq) = System.Collections.Generic.List<'T>(col)
[<RequireQualifiedAccess>]
type CharComparer =
| Exact
| IgnoreCase
with
member x.IsEqual left right =
if left = right then
true
else
match x with
| Exact -> false
| IgnoreCase ->
let left = System.Char.ToLower left
let right = System.Char.ToLower right
left = right
member x.Compare (left: char) (right: char) =
if left = right then
0
else
match x with
| Exact ->
left.CompareTo(right)
| IgnoreCase ->
let left = System.Char.ToLower left
let right = System.Char.ToLower right
left.CompareTo(right)
member x.GetHashCode (c: char) =
let c =
match x with
| Exact -> c
| IgnoreCase -> System.Char.ToLower c
int c
/// Thin wrapper around System.String which allows us to compare values in a
/// case insensitive + allocation free manner.
[<Struct>]
[<CustomComparison>]
[<CustomEquality>]
type internal CharSpan
(
_value: string,
_index: int,
_length: int,
_comparer: CharComparer
) =
new (value: string, comparer: CharComparer) =
CharSpan(value, 0, value.Length, comparer)
member x.Length = _length
member x.CharAt index: char =
let index = _index + index
_value.[index]
member x.StringComparison =
match _comparer with
| CharComparer.Exact -> System.StringComparison.Ordinal
| CharComparer.IgnoreCase -> System.StringComparison.OrdinalIgnoreCase
member x.StringComparer =
match _comparer with
| CharComparer.Exact -> System.StringComparer.Ordinal
| CharComparer.IgnoreCase -> System.StringComparer.OrdinalIgnoreCase
member x.CompareTo (other: CharSpan) =
let diff = x.Length - other.Length
if diff <> 0 then
diff
else
let mutable index = 0
let mutable value = 0
while index < x.Length && value = 0 do
let comp = _comparer.Compare (x.CharAt index) (other.CharAt index)
if comp <> 0 then
value <- comp
index <- index + 1
value
member x.GetSubSpan index length =
CharSpan(_value, index + _index, length, _comparer)
member x.IndexOf (c: char) =
let mutable index = 0
let mutable found = -1
while index < x.Length && found < 0 do
if _comparer.IsEqual c (x.CharAt index) then
found <- index
index <- index + 1
found
member x.LastIndexOf c =
let mutable index = x.Length - 1
let mutable found = -1
while index >= 0 && found < 0 do
if _comparer.IsEqual c (x.CharAt index) then
found <- index
index <- index - 1
found
member x.EqualsString str =
let other = CharSpan(str, _comparer)
0 = x.CompareTo other
override x.Equals(obj) =
match obj with
| :? CharSpan as other -> 0 = x.CompareTo other
| _ -> false
override x.ToString() = _value.Substring(_index, _length)
override x.GetHashCode() =
let mutable hashCode = 0
for i = 0 to _length - 1 do
let current = _comparer.GetHashCode (x.CharAt i)
hashCode <- hashCode ||| current
hashCode
interface System.IComparable with
member x.CompareTo yObj =
match yObj with
| :? CharSpan as other -> x.CompareTo other
| _ -> invalidArg "yObj" "Cannot compare values of different types"
interface System.IEquatable<CharSpan> with
member x.Equals other = 0 = x.CompareTo other
static member FromBounds (str: string) (startIndex: int) (endIndex: int) charComparer =
let length = endIndex - startIndex
CharSpan(str, startIndex, length, charComparer)
module CharUtil =
let PrintableCategories =
seq {
// Letters
yield UnicodeCategory.UppercaseLetter
yield UnicodeCategory.LowercaseLetter
yield UnicodeCategory.TitlecaseLetter
yield UnicodeCategory.ModifierLetter
yield UnicodeCategory.OtherLetter
// Marks
yield UnicodeCategory.NonSpacingMark
yield UnicodeCategory.SpacingCombiningMark
yield UnicodeCategory.EnclosingMark
// Digits
yield UnicodeCategory.DecimalDigitNumber
yield UnicodeCategory.LetterNumber
yield UnicodeCategory.OtherNumber
// Space separators
yield UnicodeCategory.SpaceSeparator
// Not other separators
//yield UnicodeCategory.LineSeparator
//yield UnicodeCategory.ParagraphSeparator
// Not control, etc.
//yield UnicodeCategory.Control
//yield UnicodeCategory.Format
//yield UnicodeCategory.Surrogate
//yield UnicodeCategory.PrivateUse
// Punctuation
yield UnicodeCategory.ConnectorPunctuation
yield UnicodeCategory.DashPunctuation
yield UnicodeCategory.OpenPunctuation
yield UnicodeCategory.ClosePunctuation
yield UnicodeCategory.InitialQuotePunctuation
yield UnicodeCategory.FinalQuotePunctuation
yield UnicodeCategory.OtherPunctuation
// Symbols
yield UnicodeCategory.MathSymbol
yield UnicodeCategory.CurrencySymbol
yield UnicodeCategory.ModifierSymbol
yield UnicodeCategory.OtherSymbol
// Not unassigned
//yield UnicodeCategory.OtherNotAssigned
} |> set
let MinValue = System.Char.MinValue
let IsDigit x = System.Char.IsDigit(x)
let IsOctalDigit (c: char) = c >= '0' && c <= '7'
let IsHexDigit (c: char) = System.Char.IsDigit c || c >= 'a' && c <= 'f' || c >= 'A' && c <= 'F'
let IsWhiteSpace x = System.Char.IsWhiteSpace(x)
let IsNotWhiteSpace x = not (System.Char.IsWhiteSpace(x))
let IsControl x = System.Char.IsControl x
let IsAscii x = x >= '\u0000' && x <= '\u00ff'
/// Is this the Vim definition of a blank character. That is it a space
/// or tab
let IsBlank x = x = ' ' || x = '\t'
/// Is this a non-blank character in Vim
let IsNotBlank x = not (IsBlank x)
let IsAlpha x = (x >= 'a' && x <= 'z') || (x >= 'A' && x <= 'Z')
let IsLetter x = System.Char.IsLetter(x)
let IsWordChar x = IsLetter x || x = '_'
let IsHighSurrogate x = System.Char.IsHighSurrogate(x)
let IsLowSurrogate x = System.Char.IsLowSurrogate(x)
let ConvertToCodePoint (highSurrogate: char) (lowSurrogate: char) = System.Char.ConvertToUtf32(highSurrogate, lowSurrogate)
let IsUpper x = System.Char.IsUpper(x)
let IsUpperLetter x = IsUpper x && IsLetter x
let IsLower x = System.Char.IsLower(x)
let IsLowerLetter x = IsLower x && IsLetter x
let IsLetterOrDigit x = System.Char.IsLetterOrDigit(x)
let IsTagNameChar x = System.Char.IsLetterOrDigit(x) || x = ':' || x = '.' || x = '_' || x = '-'
let IsFileNameChar x = IsTagNameChar x
let IsPrintable x =
- let category = CharUnicodeInfo.GetUnicodeCategory(x)
+ let category = CharUnicodeInfo.GetUnicodeCategory(x: char)
PrintableCategories.Contains category
let ToLower x = System.Char.ToLower(x)
let ToUpper x = System.Char.ToUpper(x)
let ChangeCase x = if IsUpper x then ToLower x else ToUpper x
let ChangeRot13 (x: char) =
let isUpper = IsUpper x
let x = ToLower x
let index = int x - int 'a'
let index = (index + 13 ) % 26
let c = char (index + int 'a')
if isUpper then ToUpper c else c
let LettersLower = ['a'..'z']
let LettersUpper = ['A'..'Z']
let Letters = Seq.append LettersLower LettersUpper
let Digits = ['0'..'9']
let IsEqual left right = left = right
let IsEqualIgnoreCase left right =
let func c = if IsLetter c then ToLower c else c
let left = func left
let right = func right
left = right
/// Get the Char value for the given ASCII code
let OfAsciiValue (value: byte) =
let asciiArray = [| value |]
let charArray = System.Text.Encoding.ASCII.GetChars(asciiArray)
if charArray.Length > 0 then
charArray.[0]
else
MinValue
let (|WhiteSpace|NonWhiteSpace|) char =
if IsWhiteSpace char then
WhiteSpace
else
NonWhiteSpace
/// Add 'count' to the given alpha value (a-z) and preserve case. If the count goes
/// past the a-z range then a or z will be returned
let AlphaAdd count c =
let isUpper = IsUpper c
let number =
let c = ToLower c
let index = (int c) - (int 'a')
index + count
let lowerBound, upperBound =
if isUpper then
'A', 'Z'
else
'a', 'z'
if number < 0 then
lowerBound
elif number >= 26 then
upperBound
else
char ((int lowerBound) + number)
let GetDigitValue c =
match c with
| '0' -> Some 0
| '1' -> Some 1
| '2' -> Some 2
| '3' -> Some 3
| '4' -> Some 4
| '5' -> Some 5
| '6' -> Some 6
| '7' -> Some 7
| '8' -> Some 8
| '9' -> Some 9
| _ -> None
/// The .Net mapping for the keys defined in :help key-notation
module internal CharCodes =
/// Nul key
let Zero = char 0
/// CR / Return / Enter key
let Enter = CharUtil.OfAsciiValue 13uy
/// ESC key
let Escape = CharUtil.OfAsciiValue 27uy
/// BS key
let Backspace = '\b'
module internal StringBuilderExtensions =
type StringBuilder with
member x.AppendChar (c: char) =
x.Append(c) |> ignore
member x.AppendCharCount (c: char) (count: int) =
x.Append(c, count) |> ignore
member x.AppendString (str: string) =
x.Append(str) |> ignore
member x.AppendStringCount (str: string) (count: int) =
for i = 0 to count - 1 do
x.Append(str) |> ignore
member x.AppendNumber (number: int) =
x.Append(number) |> ignore
member x.AppendCharSpan (charSpan: CharSpan) =
let mutable i = 0
while i < charSpan.Length do
let c = charSpan.CharAt i
x.AppendChar c
i <- i + 1
member x.AppendSubstring (str: string) (start: int) (length: int) =
let charSpan = CharSpan(str, start, length, CharComparer.Exact)
x.AppendCharSpan charSpan
module internal CollectionExtensions =
type System.Collections.Generic.Stack<'T> with
member x.PushRange (col: 'T seq) =
col |> Seq.iter (fun item -> x.Push(item))
type System.Collections.Generic.Queue<'T> with
member x.EnqueueRange (col: 'T seq) =
col |> Seq.iter (fun item -> x.Enqueue(item))
type System.Collections.Generic.Dictionary<'TKey, 'TValue> with
member x.TryGetValueEx (key: 'TKey) =
let found, value = x.TryGetValue key
if found then
Some value
else
None
module internal OptionUtil =
/// Collapse an option of an option to just an option
let collapse<'a> (opt: 'a option option) =
match opt with
| None -> None
| Some opt -> opt
/// Map an option to a value which produces an option and then collapse the result
let map2 mapFunc value =
match value with
| None -> None
| Some value -> mapFunc value
/// Combine an option with another value. If the option has no value then the result
/// is None. If the option has a value the result is an Option of a tuple of the original
/// value and the passed in one
let combine opt value =
match opt with
| Some(optValue) -> Some (optValue,value)
| None -> None
/// Combine an option with another value. Same as combine but takes a tupled argument
let combine2 (opt,value) = combine opt value
/// Combine an option with another value. If the option has no value then the result
/// is None. If the option has a value the result is an Option of a tuple of the original
/// value and the passed in one
let combineRev value opt =
match opt with
| Some(optValue) -> Some (value, optValue)
| None -> None
/// Combine an option with another value. Same as combine but takes a tuple'd argument
let combineRev2 (value,opt) = combine opt value
/// Combine two options into a single option. Only some if both are some
let combineBoth left right =
match left,right with
| Some(left),Some(right) -> Some(left,right)
| Some(_),None -> None
| None,Some(_) -> None
| None,None -> None
/// Combine two options into a single option. Only some if both are some
let combineBoth2 (left,right) = combineBoth left right
/// Get the value or the provided default
let getOrDefault defaultValue opt =
match opt with
| Some(value) -> value
| None -> defaultValue
/// Convert the Nullable<T> to an Option<T>
let ofNullable (value: System.Nullable<'T>) =
if value.HasValue then
Some value.Value
else
None
let nullToOption<'a> (x: 'a) =
if obj.ReferenceEquals(x, null) then None
else Some x
/// Represents a collection which is guarantee to have at least a single element. This
/// is very useful when dealing with discriminated unions of values where one is an element
/// and another is a collection where the collection has the constraint that it must
/// have at least a single element. This collection type allows the developer to avoid
/// the use of unsafe operations like List.head or SeqUtil.headOnly in favor of guaranteed
/// operations
type NonEmptyCollection<'T>
(
_head: 'T,
_rest: 'T list
) =
/// Number of items in the collection
member x.Count = 1 + _rest.Length
/// Head of the collection
member x.Head = _head
/// The remainder of the collection after the 'Head' element
member x.Rest = _rest
/// All of the items in the collection
member x.All =
seq {
yield _head
for cur in _rest do
yield cur
}
interface System.Collections.IEnumerable with
member x.GetEnumerator () = x.All.GetEnumerator() :> System.Collections.IEnumerator
interface System.Collections.Generic.IEnumerable<'T> with
member x.GetEnumerator () = x.All.GetEnumerator()
module NonEmptyCollectionUtil =
/// Appends a list to the NonEmptyCollection
let Append values (col: NonEmptyCollection<'T>) =
let rest = col.Rest @ values
NonEmptyCollection(col.Head, rest)
/// Attempts to create a NonEmptyCollection from a raw sequence
let OfSeq seq =
match SeqUtil.tryHead seq with
| None -> None
| Some (head, rest) -> NonEmptyCollection(head, rest |> List.ofSeq) |> Some
/// Maps the elements in the NonEmptyCollection using the specified function
let Map mapFunc (col: NonEmptyCollection<'T>) =
let head = mapFunc col.Head
let rest = List.map mapFunc col.Rest
NonEmptyCollection<_>(head, rest)
module internal ReadOnlyCollectionUtil =
let Single (item: 'T) =
let list = System.Collections.Generic.List<'T>()
list.Add(item)
ReadOnlyCollection<'T>(list)
let OfSeq (collection: 'T seq) =
let list = System.Collections.Generic.List<'T>(collection)
ReadOnlyCollection<'T>(list)
module internal HashSetUtil =
let OfSeq (collection: 'T seq) = System.Collections.Generic.HashSet<'T>(collection)
module internal SystemUtil =
let TryGetEnvironmentVariable name =
try
let value = System.Environment.GetEnvironmentVariable(name)
if value = null then
None
else
Some value
with
| _ -> None
let GetEnvironmentVariable name =
match TryGetEnvironmentVariable name with
| Some name -> name
| None -> ""
/// The IO.Path.Combine API has a lot of "features" which basically prevents it
/// from being a reliable API. The most notable is that if you pass it c:
/// instead of c:\ it will silently fail.
let CombinePath (path1: string) (path2: string) =
// Work around the c: problem by adding a trailing slash to a drive specification
let path1 =
if System.String.IsNullOrEmpty(path1) then
""
elif path1.Length = 2 && CharUtil.IsLetter path1.[0] && path1.[1] = ':' then
path1 + @"\"
else
path1
// Remove the begining slash from the second path so that it will combine properly
let path2 =
if System.String.IsNullOrEmpty(path2) then
""
elif path2.[0] = '\\' then
path2.Substring(1)
else
path2
Path.Combine(path1, path2)
/// Get the value of $HOME. There is no explicit documentation that I could find
/// for how this value is calculated. However experimentation shows that gVim 7.1
/// calculates it in the following order
/// %HOME%
/// %HOMEDRIVE%%HOMEPATH%
/// c:\
let GetHome () =
match TryGetEnvironmentVariable "HOME" with
| Some path -> path
| None ->
match TryGetEnvironmentVariable "HOMEDRIVE", TryGetEnvironmentVariable "HOMEPATH" with
| Some drive, Some path -> CombinePath drive path
| _ -> @"c:\"
/// Whether text starts with a leading tilde and is followed by either
// nothing else or a directory separator
let StartsWithTilde (text: string) =
if text.StartsWith("~") then
if text.Length = 1 then
true
else
let separator = text.Chars(1)
if separator = Path.DirectorySeparatorChar then
true
elif separator = Path.AltDirectorySeparatorChar then
true
else
false
else
false
/// Expand environment variables leaving undefined variables "as is"
///
/// This function considers a leading tilde as equivalent to "$HOME" or
/// "$HOMEDRIVE$HOMEPATH" if those variables are defined
let ResolvePath text =
let processMatch (regexMatch: Match) =
let token = regexMatch.Value
if token.StartsWith("$") then
let variable = token.Substring(1)
match TryGetEnvironmentVariable variable with
| Some value ->
value
| None ->
token
else
token
// According to Shell and Utilities volume of IEEE Std 1003.1-2001
// standard environment variable names should consist solely of
// uppercase letters, digits, and the '_'. However variables with
// lowercasesee lowercase letters are also popular, thus the regex
// below supports them as well.
// http://pubs.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap08.html
let text =
Regex.Matches(text, "(\$[\w_][\w\d_]*)|([^$]+)")
|> Seq.cast
|> Seq.map processMatch
|> String.concat ""
if StartsWithTilde text then
GetHome() + text.Substring(1)
else
text
/// Try to expand all the referenced environment variables and leading tilde
/// values. Returns true if the path was resolved according to Vim rules.
let TryResolvePath text =
let text = ResolvePath text
if StartsWithTilde text || text.Contains("$") then
None
else
Some text
- let EnsureRooted currentDirectory text =
+ let EnsureRooted (currentDirectory: string) (text: string) =
if Path.IsPathRooted text || not (Path.IsPathRooted currentDirectory) then
text
else
CombinePath currentDirectory text
/// Like ResolvePath except it will always return a rooted path. If the provided path
/// isn't rooted it will be rooted inside of 'currentDirectory'
///
/// This method can throw when provided paths with invalid path characters.
- let ResolveVimPath currentDirectory text =
+ let ResolveVimPath (currentDirectory: string) text =
match text with
| "." -> currentDirectory
| ".." -> Path.GetPathRoot currentDirectory
| _ ->
let text = ResolvePath text
EnsureRooted currentDirectory text
/// Remove the prefix from the path.
/// Note that directory separator chars are not compared, just the path directory components.
/// The relative path returned is normalized to use the standard directory separator char.
///
/// E.g. ("C:\A\B\C", "C:/A/B/C/D/foo.bar") -> ("D\foo.bar")
/// E.g. ("C:\A\B\C", "C:/A/B/C1/D/foo.bar") -> ("C:\A\B\C1\D\foo.bar")
let StripPathPrefix prefix path =
let rec stripPrefix (p1: string list) (p2: string list) =
if p1.Length = 0 || p2.Length = 0 || not (StringComparer.OrdinalIgnoreCase.Equals(p1.[0], p2.[0])) then
p1, p2
else
stripPrefix (List.tail p1) (List.tail p2)
let splitPath (path: string) =
path.Split([| Path.DirectorySeparatorChar; Path.AltDirectorySeparatorChar |], StringSplitOptions.RemoveEmptyEntries) |> List.ofArray
let sep = System.String(Path.DirectorySeparatorChar, 1)
let pathComponents = (splitPath path)
let remaining, pathPrefix = stripPrefix (splitPath prefix) pathComponents
if remaining.IsEmpty then
String.concat sep pathPrefix
else
String.concat sep pathComponents
// Simple hashing combination function taken from
// https://stackoverflow.com/questions/1646807/quick-and-simple-hash-code-combinations
module internal HashUtil =
let Combine2 (hash1: int) (hash2: int) =
let hash = 17
let hash = (hash * 31) + hash1
let hash = (hash * 31) + hash2
hash
let Combine3 (hash1: int) (hash2: int) (hash3: int) =
let hash = 17
let hash = (hash * 31) + hash1
let hash = (hash * 31) + hash2
let hash = (hash * 31) + hash3
hash
type internal OptionBuilder() =
member x.Bind (value, cont) =
match value with
| None -> None
| Some value -> cont value
member x.Return value = Some value
member x.ReturnFrom o = o
member x.Zero () = None
diff --git a/Src/VimCore/Interpreter_Interpreter.fs b/Src/VimCore/Interpreter_Interpreter.fs
index 3570c2b..de1315c 100644
--- a/Src/VimCore/Interpreter_Interpreter.fs
+++ b/Src/VimCore/Interpreter_Interpreter.fs
@@ -174,1782 +174,1782 @@ type VimScriptFunctionCaller
VariableValue.Error
[<Sealed>]
[<Class>]
type ExpressionInterpreter
(
_statusUtil: IStatusUtil,
_localSettings: IVimSettings,
_windowSettings: IVimSettings,
_variableMap: Dictionary<string, VariableValue>,
_registerMap: IRegisterMap
) =
let _builtinCaller = BuiltinFunctionCaller(_variableMap)
let _functionCaller = VimScriptFunctionCaller(_builtinCaller, _statusUtil)
let _getValue = VariableValueUtil(_statusUtil)
/// Get the specified expression as a number
member x.GetExpressionAsNumber expr =
x.RunExpression expr |> _getValue.ConvertToNumber
/// Get the specified expression as a number
member x.GetExpressionAsString expr =
x.RunExpression expr |> _getValue.ConvertToString
member x.GetSetting name =
match _localSettings.GetSetting name with
| None -> _windowSettings.GetSetting name
| Some setting -> Some setting
member x.GetValueOfSetting setting =
match setting.LiveSettingValue.Value with
| SettingValue.Toggle x -> VariableValue.Number (System.Convert.ToInt32 x)
| SettingValue.Number x -> VariableValue.Number x
| SettingValue.String x -> VariableValue.String x
member x.GetValueOfVariable name =
let found, value = _variableMap.TryGetValue name
if found then
value
else
VariableValue.Error
member x.GetValueOfRegister name =
(_registerMap.GetRegister name).StringValue |> VariableValue.String
/// Get the value of the specified expression
member x.RunExpression (expr: Expression): VariableValue =
let runExpression expressions = [for expr in expressions -> x.RunExpression expr]
match expr with
| Expression.ConstantValue value -> value
| Expression.Binary (binaryKind, leftExpr, rightExpr) -> x.RunBinaryExpression binaryKind leftExpr rightExpr
| Expression.OptionName name ->
match x.GetSetting name with
| None -> VariableValue.Error
| Some setting -> x.GetValueOfSetting setting
| Expression.VariableName name -> x.GetValueOfVariable name.Name
| Expression.EnvironmentVariableName name ->
match SystemUtil.TryGetEnvironmentVariable name with
| None -> VariableValue.Error
| Some value -> VariableValue.String value
| Expression.RegisterName name -> x.GetValueOfRegister name
| Expression.FunctionCall(name, args) -> runExpression args |> _functionCaller.Call name
| Expression.List expressions -> runExpression expressions |> VariableValue.List
/// Run the binary expression
member x.RunBinaryExpression binaryKind (leftExpr: Expression) (rightExpr: Expression) =
// Actually it seems that the user doesn't see these messages
// and see a generic expression interpreting error instead
// as the error status is updated later...
let notSupported() =
_statusUtil.OnError "Binary operation not supported at this time"
VariableValue.Error
let divByZero() =
_statusUtil.OnError Resources.Interpreter_DivByZero
VariableValue.Error
let modByZero() =
_statusUtil.OnError Resources.Interpreter_ModByZero
VariableValue.Error
let runConcat (leftValue: VariableValue) (rightValue: VariableValue) =
let leftString = _getValue.ConvertToString leftValue
let rightString = _getValue.ConvertToString rightValue
match leftString, rightString with
| Some left, Some right -> left + right |> VariableValue.String
| _ -> VariableValue.Error
let runNumericBinary (leftValue: VariableValue) (rightValue: VariableValue) (binaryKind: BinaryKind) =
if leftValue.VariableType = VariableType.List || rightValue.VariableType = VariableType.List then
notSupported()
else
let leftNumber = _getValue.ConvertToNumber leftValue
let rightNumber = _getValue.ConvertToNumber rightValue
match leftNumber, rightNumber, binaryKind with
| Some left, Some right, BinaryKind.Add -> left + right |> VariableValue.Number
| Some left, Some right, BinaryKind.Subtract -> left - right |> VariableValue.Number
| Some left, Some right, BinaryKind.Multiply -> left * right |> VariableValue.Number
| Some left, Some right, BinaryKind.Divide when right = 0 -> divByZero()
| Some left, Some right, BinaryKind.Divide -> left / right |> VariableValue.Number
| Some left, Some right, BinaryKind.Modulo when right = 0 -> modByZero()
| Some left, Some right, BinaryKind.Modulo -> left % right |> VariableValue.Number
| Some left, Some right, BinaryKind.GreaterThan -> left > right |> System.Convert.ToInt32 |> VariableValue.Number
| Some left, Some right, BinaryKind.LessThan -> left < right |> System.Convert.ToInt32 |> VariableValue.Number
| _ -> VariableValue.Error
let runStringEquality (leftValue: VariableValue) (rightValue: VariableValue) (binaryKind: BinaryKind) =
if leftValue.VariableType = VariableType.List || rightValue.VariableType = VariableType.List then
notSupported()
else
let leftString = _getValue.ConvertToString leftValue
let rightString = _getValue.ConvertToString rightValue
match leftString, rightString, binaryKind with
| Some left, Some right, BinaryKind.Equal ->
left = right |> System.Convert.ToInt32 |> VariableValue.Number
| Some left, Some right, BinaryKind.NotEqual ->
left <> right |> System.Convert.ToInt32 |> VariableValue.Number
| _ -> VariableValue.Error
let leftValue = x.RunExpression leftExpr
let rightValue = x.RunExpression rightExpr
match binaryKind with
| BinaryKind.Concatenate ->
runConcat leftValue rightValue
| BinaryKind.Add
| BinaryKind.Divide
| BinaryKind.Modulo
| BinaryKind.Multiply
| BinaryKind.Subtract
| BinaryKind.GreaterThan
| BinaryKind.LessThan ->
runNumericBinary leftValue rightValue binaryKind
| BinaryKind.Equal
| BinaryKind.NotEqual ->
runStringEquality leftValue rightValue binaryKind
[<Sealed>]
[<Class>]
type VimInterpreter
(
_vimBuffer: IVimBuffer,
_commonOperations: ICommonOperations,
_foldManager: IFoldManager,
_fileSystem: IFileSystem,
_bufferTrackingService: IBufferTrackingService
) =
let _vimBufferData = _vimBuffer.VimBufferData
let _vimTextBuffer = _vimBufferData.VimTextBuffer
let _vim = _vimBufferData.Vim
let _vimHost = _vim.VimHost
let _vimData = _vim.VimData
let _textBuffer = _vimBufferData.TextBuffer
let _textView = _vimBufferData.TextView
let _markMap = _vim.MarkMap
let _statusUtil = InterpreterStatusUtil(_vimBufferData.StatusUtil)
let _registerMap = _vimBufferData.Vim.RegisterMap
let _undoRedoOperations = _vimBufferData.UndoRedoOperations
let _localSettings = _vimBufferData.LocalSettings
let _windowSettings = _vimBufferData.WindowSettings
let _globalSettings = _localSettings.GlobalSettings
let _searchService = _vim.SearchService
let _variableMap = _vim.VariableMap
let _exprInterpreter = ExpressionInterpreter(_statusUtil, _localSettings, _windowSettings, _variableMap, _registerMap)
/// The SnapshotPoint for the caret
member x.CaretPoint = TextViewUtil.GetCaretPoint _textView
/// The ITextSnapshotLine for the caret
member x.CaretLine = TextViewUtil.GetCaretLine _textView
/// The line number for the caret
member x.CaretLineNumber = x.CaretLine.LineNumber
/// The SnapshotLineRange for the caret line
member x.CaretLineRange = x.CaretLine |> SnapshotLineRangeUtil.CreateForLine
/// The SnapshotPoint and ITextSnapshotLine for the caret
member x.CaretPointAndLine = TextViewUtil.GetCaretPointAndLine _textView
/// The current directory for the given IVimBuffer
member x.CurrentDirectory =
match _vimBuffer.CurrentDirectory with
| None -> _vimData.CurrentDirectory
| Some currentDirectory -> currentDirectory
/// The current ITextSnapshot instance for the ITextBuffer
member x.CurrentSnapshot = _textBuffer.CurrentSnapshot
/// Resolve the given path. In the case the path contains illegal characters it
/// will be returned unaltered.
member x.ResolveVimPath (path: string) =
try
SystemUtil.ResolveVimPath _vimData.CurrentDirectory path
with
| _ -> path
member x.GetKeyMap keyMapArguments: IVimKeyMap * KeyMapArgument list =
match keyMapArguments with
| [KeyMapArgument.Buffer] -> (_vimBuffer.LocalKeyMap :> IVimKeyMap, [])
| _ -> (_vim.GlobalKeyMap :> IVimKeyMap, keyMapArguments)
member x.KeyMaps = [_vim.GlobalKeyMap :> IVimKeyMap; _vimTextBuffer.LocalKeyMap :> IVimKeyMap]
/// Get a tuple of the ITextSnapshotLine specified by the given LineSpecifier and the
/// corresponding vim line number
member x.GetLineAndVimLineNumberCore lineSpecifier currentLine =
// To convert from a VS line number to a vim line number, simply add 1
let getLineAndNumber (line: ITextSnapshotLine) = (line, line.LineNumber + 1)
// Get the ITextSnapshotLine specified by lineSpecifier and then apply the
// given adjustment to the number. Can fail if the line number adjustment
// is invalid
let getAdjustment adjustment (line: ITextSnapshotLine) =
let vimLine = line.LineNumber + 1 + adjustment
let number = Util.VimLineToTssLine vimLine
SnapshotUtil.TryGetLine x.CurrentSnapshot number
|> Option.map (fun line -> line, vimLine)
match lineSpecifier with
| LineSpecifier.CurrentLine ->
currentLine |> getLineAndNumber |> Some
| LineSpecifier.LastLine ->
SnapshotUtil.GetLastNormalizedLine x.CurrentSnapshot |> getLineAndNumber |> Some
| LineSpecifier.MarkLine mark ->
match mark with
| Mark.GlobalMark letter -> _markMap.GetGlobalMark letter
| _ -> _markMap.GetMark mark _vimBufferData
|> Option.map VirtualSnapshotPointUtil.GetPoint
|> Option.map SnapshotPointUtil.GetContainingLine
|> Option.map getLineAndNumber
| LineSpecifier.Number number ->
// Must be a valid number
let tssNumber = Util.VimLineToTssLine number
SnapshotUtil.TryGetLine x.CurrentSnapshot tssNumber
|> Option.map (fun line -> line, number)
| LineSpecifier.LineSpecifierWithAdjustment (lineSpecifier, adjustment) ->
x.GetLine lineSpecifier |> OptionUtil.map2 (getAdjustment adjustment)
| LineSpecifier.NextLineWithPattern pattern ->
let pattern =
if pattern = "" then
_vim.VimData.LastSearchData.Pattern
else
pattern
x.GetMatchingLine pattern SearchPath.Forward currentLine
|> Option.map getLineAndNumber
| LineSpecifier.NextLineWithPreviousPattern ->
let pattern = _vim.VimData.LastSearchData.Pattern
x.GetMatchingLine pattern SearchPath.Forward currentLine
|> Option.map getLineAndNumber
| LineSpecifier.NextLineWithPreviousSubstitutePattern ->
match _vim.VimData.LastSubstituteData with
| Some substituteData ->
let pattern = substituteData.SearchPattern
x.GetMatchingLine pattern SearchPath.Forward currentLine
|> Option.map getLineAndNumber
| None ->
None
| LineSpecifier.PreviousLineWithPattern pattern ->
let pattern =
if pattern = "" then
_vim.VimData.LastSearchData.Pattern
else
pattern
x.GetMatchingLine pattern SearchPath.Backward currentLine
|> Option.map getLineAndNumber
| LineSpecifier.PreviousLineWithPreviousPattern ->
let pattern = _vim.VimData.LastSearchData.Pattern
x.GetMatchingLine pattern SearchPath.Backward currentLine
|> Option.map getLineAndNumber
/// Get the first line matching the specified pattern in the specified
/// direction
member x.GetMatchingLine pattern path currentLine =
if StringUtil.IsNullOrEmpty pattern then
None
else
let startPoint =
match path with
| SearchPath.Forward ->
currentLine |> SnapshotLineUtil.GetEnd
| SearchPath.Backward ->
currentLine |> SnapshotLineUtil.GetStart
let searchData = SearchData(pattern, path, _globalSettings.WrapScan)
_vimData.LastSearchData <- searchData
let wordNavigator = _vimBufferData.VimTextBuffer.WordUtil.SnapshotWordNavigator
let result = _searchService.FindNextPattern startPoint searchData wordNavigator 1
match result with
| SearchResult.Found (_, span, _, _) ->
span.Start
|> SnapshotPointUtil.GetContainingLine
|> Some
| _ ->
None
// Get a tuple of the ITextSnapshotLine specified by the given LineSpecifier and the
// corresponding vim line number
member x.GetLineAndVimLineNumber lineSpecifier =
x.GetLineAndVimLineNumberCore lineSpecifier x.CaretLine
/// Get the ITextSnapshotLine specified by the given LineSpecifier
member x.GetLineCore lineSpecifier currentLine =
x.GetLineAndVimLineNumberCore lineSpecifier currentLine
|> Option.map (fun (line, vimLine) -> line)
/// Get the ITextSnapshotLine specified by the given LineSpecifier
member x.GetLine lineSpecifier =
x.GetLineCore lineSpecifier x.CaretLine
/// Get the specified LineRange in the IVimBuffer.
///
/// TODO: Should this calculation be done against the visual buffer?
/// TODO: Note that :del is already configured against the visual buffer
member x.GetLineRangeOrDefault lineRange defaultLineRange =
match lineRange with
| LineRangeSpecifier.None ->
// None is specified so use the default
match defaultLineRange with
| DefaultLineRange.None -> None
| DefaultLineRange.CurrentLine -> SnapshotLineRangeUtil.CreateForLine x.CaretLine |> Some
| DefaultLineRange.EntireBuffer -> SnapshotLineRangeUtil.CreateForSnapshot x.CurrentSnapshot |> Some
| LineRangeSpecifier.EntireBuffer ->
SnapshotLineRangeUtil.CreateForSnapshot x.CurrentSnapshot |> Some
| LineRangeSpecifier.SingleLine lineSpecifier ->
x.GetLine lineSpecifier |> Option.map SnapshotLineRangeUtil.CreateForLine
| LineRangeSpecifier.Range (leftLineSpecifier, rightLineSpecifier, adjustCaret) ->
match x.GetLine leftLineSpecifier, x.GetLine rightLineSpecifier with
| Some leftLine, Some rightLine ->
// Make sure both lines belong to the same text buffer.
if leftLine.Snapshot = rightLine.Snapshot then
let result =
SnapshotLineRangeUtil.CreateForLineRange leftLine rightLine
|> Some
// If the adjustCaret option was specified then we need to
// move the caret before interpreting the next
// LineSpecifier. The caret should remain moved after this
// completes.
if adjustCaret then
// Be careful because the line might belong to a
// different text buffer.
if _textView.TextSnapshot = leftLine.Snapshot then
TextViewUtil.MoveCaretToPoint _textView leftLine.Start
result
else
None
else
result
else
None
| _ -> None
| LineRangeSpecifier.WithEndCount (lineRange, count) ->
// WithEndCount should create for a single line which is 'count' lines below the
// end of the specified range
match x.GetLineRangeOrDefault lineRange defaultLineRange with
| None -> None
| Some lineRange -> SnapshotLineRangeUtil.CreateForLineAndMaxCount lineRange.LastLine count |> Some
| LineRangeSpecifier.Join (lineRange, count) ->
match lineRange, count with
| LineRangeSpecifier.None, _ ->
// Count is the only thing important when there is no explicit range is the
// count. It is special cased when there is no line range
let count =
match count with
| None -> 2
| Some 1 -> 2
| Some count -> count
SnapshotLineRangeUtil.CreateForLineAndMaxCount x.CaretLine count |> Some
| _, Some count -> x.GetLineRangeOrDefault (LineRangeSpecifier.WithEndCount (lineRange, count)) defaultLineRange
| _, None -> x.GetLineRangeOrDefault lineRange defaultLineRange
member x.GetLineRange lineRange =
x.GetLineRangeOrDefault lineRange DefaultLineRange.None
/// Get the count value or the default of 1
member x.GetCountOrDefault count = Util.CountOrDefault count
/// Get the point after the specified range or the the default
member x.GetPointAfterOrDefault lineRange defaultLineRange =
match lineRange with
| LineRangeSpecifier.SingleLine (LineSpecifier.Number line) when line = 0 ->
SnapshotUtil.GetStartPoint _textView.TextSnapshot |> Some
| _ ->
match x.GetLineRangeOrDefault lineRange defaultLineRange with
| Some lineRange ->
lineRange.EndIncludingLineBreak |> Some
| None -> None
/// Get the point after the specified range or the the default
member x.GetPointAfter lineRange =
x.GetPointAfterOrDefault lineRange DefaultLineRange.None
member x.RunAbbreviate lhs rhs allowRemap modeList isLocal =
// Even when doing a global mapping the abbreviation is still parsed in the context of
// the current buffer using `iskeyword`. This means that some global abbreviations are valid
// to set in some buffers but not others if they have significantly different `iskeyword`
// values
match _vimTextBuffer.LocalAbbreviationMap.Parse lhs with
| None ->
_statusUtil.OnError Resources.Parser_InvalidArgument
| Some _ ->
let map =
if isLocal then _vimTextBuffer.LocalAbbreviationMap :> IVimAbbreviationMap
else _vim.GlobalAbbreviationMap :> IVimAbbreviationMap
match KeyNotationUtil.TryStringToKeyInputSet lhs, KeyNotationUtil.TryStringToKeyInputSet rhs with
| Some lhs, Some rhs ->
for mode in modeList do
map.AddAbbreviation(lhs, rhs, allowRemap, mode)
| _ -> _statusUtil.OnError Resources.Parser_InvalidArgument
member x.RunAbbreviateClear modeList isLocal =
let map =
if isLocal then _vimTextBuffer.LocalAbbreviationMap :> IVimAbbreviationMap
else _vim.GlobalAbbreviationMap :> IVimAbbreviationMap
for mode in modeList do
map.ClearAbbreviations(mode)
member x.RunUnabbreviate keyNotation modeList isLocal =
let map =
if isLocal then _vimTextBuffer.LocalAbbreviationMap :> IVimAbbreviationMap
else _vim.GlobalAbbreviationMap :> IVimAbbreviationMap
match KeyNotationUtil.TryStringToKeyInputSet keyNotation with
| None -> _statusUtil.OnError Resources.Parser_InvalidArgument
| Some keyInputSet ->
let mutable succeeded = true
for mode in modeList do
if not (map.RemoveAbbreviation(keyInputSet, mode)) then
// When the LHS doesn't have a match then remove all mappings where the RHS
// matches the provided key notation.
let all = map.GetAbbreviations mode |> Seq.filter (fun x -> x.Replacement = keyInputSet) |> List.ofSeq
if all.IsEmpty then
succeeded <- false
else
for abbreviation in all do
map.RemoveAbbreviation(abbreviation.Abbreviation, mode) |> ignore
if not succeeded then
_statusUtil.OnError Resources.Parser_InvalidArgument
/// Add the specified auto command to the list
member x.RunAddAutoCommand (autoCommandDefinition: AutoCommandDefinition) =
let builder = System.Collections.Generic.List<AutoCommand>()
for eventKind in autoCommandDefinition.EventKinds do
for pattern in autoCommandDefinition.Patterns do
let autoCommand = {
Group = autoCommandDefinition.Group
EventKind = eventKind
Pattern = pattern
LineCommandText = autoCommandDefinition.LineCommandText
}
builder.Add(autoCommand)
let newList = List.ofSeq builder
let autoCommands = List.append _vimData.AutoCommands newList
_vimData.AutoCommands <- autoCommands
/// Move in a linewise fashion to point, preserving spaces or obeying
/// 'startofline'
member x.MoveLinewiseToPoint point =
let spaces = _commonOperations.GetSpacesToCaret()
_commonOperations.MoveCaretToPoint point (ViewFlags.Standard &&& (~~~ViewFlags.TextExpanded))
_commonOperations.RestoreSpacesToCaret spaces true
/// Run the behave command
member x.RunBehave model =
match model with
| "mswin" ->
_globalSettings.SelectModeOptions <- (SelectModeOptions.Mouse ||| SelectModeOptions.Keyboard)
_globalSettings.MouseModel <- "popup"
_globalSettings.KeyModelOptions <- (KeyModelOptions.StartSelection ||| KeyModelOptions.StopSelection)
_globalSettings.Selection <- "exclusive"
| "xterm" ->
_globalSettings.SelectModeOptions <- SelectModeOptions.None
_globalSettings.MouseModel <- "extend"
_globalSettings.KeyModelOptions <- KeyModelOptions.None
_globalSettings.Selection <- "inclusive"
| _ -> _statusUtil.OnError (Resources.Interpreter_InvalidArgument model)
member x.RunCSharpScript (callInfo :CallInfo, createEachTime :bool) =
_vimHost.RunCSharpScript _vimBuffer callInfo createEachTime
member x.RunCall (callInfo: CallInfo) =
_statusUtil.OnError (Resources.Interpreter_CallNotSupported callInfo.Name)
/// Change the directory to the given value
member x.RunChangeDirectory symbolicPath =
match symbolicPath with
| [] ->
// On non-Unix systems the :cd commandshould print out the directory when
// cd is given no options
_statusUtil.OnStatus x.CurrentDirectory
| _ ->
- let directoryPath = x.InterpretSymbolicPath symbolicPath
+ let (directoryPath: string) = x.InterpretSymbolicPath symbolicPath
let directoryPath =
if not (Path.IsPathRooted directoryPath) then
Path.GetFullPath(Path.Combine(_vimData.CurrentDirectory, directoryPath))
else directoryPath
if not (Directory.Exists directoryPath) then
// Not a fan of this function but we need to emulate the Vim behavior here
_statusUtil.OnError (Resources.Interpreter_CantFindDirectory directoryPath)
else
// Setting the global directory will clear out the local directory for the window
_vimBuffer.CurrentDirectory <- None
_vimData.CurrentDirectory <- directoryPath
/// Change the local directory to the given value
member x.RunChangeLocalDirectory symbolicPath =
match symbolicPath with
| [] ->
// On non-Unix systems the :cd commandshould print out the directory when
// cd is given no options
_statusUtil.OnStatus x.CurrentDirectory
| _ ->
let directoryPath = x.InterpretSymbolicPath symbolicPath
let directoryPath =
if not (Path.IsPathRooted directoryPath) then
Path.GetFullPath(Path.Combine(_vimData.CurrentDirectory, directoryPath))
else directoryPath
if not (Directory.Exists directoryPath) then
// Not a fan of this function but we need to emulate the Vim behavior here
_statusUtil.OnError (Resources.Interpreter_CantFindDirectory directoryPath)
else
// Setting the global directory will clear out the local directory for the window
_vimBuffer.CurrentDirectory <- Some directoryPath
member x.RunCopyOrMoveTo sourceLineRange destLineRange count transactionName editOperation =
x.RunWithLineRangeOrDefault sourceLineRange DefaultLineRange.CurrentLine (fun sourceLineRange ->
// The :copy command allows the specification of a full range but for the destination
// it will only be valid for single line specifiers.
let destLineSpec =
match destLineRange with
| LineRangeSpecifier.None -> None
| LineRangeSpecifier.EntireBuffer -> None
| LineRangeSpecifier.WithEndCount _ -> None
| LineRangeSpecifier.Join _ -> None
| LineRangeSpecifier.Range (left, _ , _) -> left |> Some
| LineRangeSpecifier.SingleLine line ->
// If a single line and a count is specified then we need to apply the count to
// the line
match count with
| Some count -> LineSpecifier.LineSpecifierWithAdjustment(line, count) |> Some
| _ -> line |> Some
let destLineInfo = destLineSpec |> OptionUtil.map2 x.GetLineAndVimLineNumber
match destLineInfo with
| None ->
_statusUtil.OnError Resources.Common_InvalidAddress
| Some (destLine, destLineNum) ->
let destPoint =
if destLineNum = 0 then
// If the target line is vim line 0, the intent is to insert the text
// above the first line
destLine.Start
else
destLine.EndIncludingLineBreak
let text =
if _textView.TextSnapshot = destPoint.Snapshot then
if destLine.LineBreakLength = 0 then
// Last line in the ITextBuffer. Inserted text must begin with a line
// break to force a new line and additionally don't use the final new
// line from the source as it would add an extra line to the buffer
let newLineText = _commonOperations.GetNewLineText destLine.EndIncludingLineBreak
newLineText + (sourceLineRange.GetText())
elif sourceLineRange.LastLine.LineBreakLength = 0 then
// Last line in the source doesn't have a new line (last line). Need
// to add one to create a break for line after
let newLineText = _commonOperations.GetNewLineText destLine.EndIncludingLineBreak
(sourceLineRange.GetText()) + newLineText
else
sourceLineRange.GetTextIncludingLineBreak()
else
sourceLineRange.GetTextIncludingLineBreak()
// Use an undo transaction so that the caret move and insert is a single
// operation
if _textView.TextSnapshot = destPoint.Snapshot then
_undoRedoOperations.EditWithUndoTransaction transactionName _textView (fun() -> editOperation sourceLineRange destPoint text)
else
editOperation sourceLineRange destPoint text)
/// Copy the text from the source address to the destination address
member x.RunCopyTo sourceLineRange destLineRange count =
x.RunCopyOrMoveTo sourceLineRange destLineRange count "CopyTo" (fun sourceLineRange destPoint text ->
let spaces = _commonOperations.GetSpacesToCaret()
let destTextBuffer = destPoint.Snapshot.TextBuffer
destTextBuffer.Insert(destPoint.Position, text) |> ignore
new SnapshotPoint(_textBuffer.CurrentSnapshot, destPoint.Position)
|> (fun point -> _commonOperations.MoveCaretToPoint point ViewFlags.VirtualEdit)
_commonOperations.RestoreSpacesToCaret spaces true)
/// Move the text from the source address to the destination address
member x.RunMoveTo sourceLineRange destLineRange count =
x.RunCopyOrMoveTo sourceLineRange destLineRange count "MoveTo" (fun sourceLineRange destPoint text ->
// Perform the move.
let spaces = _commonOperations.GetSpacesToCaret()
let destTextBuffer = destPoint.Snapshot.TextBuffer
let sourceTextBuffer = sourceLineRange.Start.Snapshot.TextBuffer
use edit = destTextBuffer.CreateEdit()
edit.Insert(destPoint.Position, text) |> ignore
if sourceLineRange.Start.Snapshot = destPoint.Snapshot then
edit.Delete(sourceLineRange.ExtentIncludingLineBreak.Span) |> ignore
else
sourceTextBuffer.Delete(sourceLineRange.ExtentIncludingLineBreak.Span) |> ignore
edit.Apply() |> ignore
// If the destination belongs to the current text buffer, move the
// caret.
let newSnapshot = destTextBuffer.CurrentSnapshot
if newSnapshot = _textView.TextSnapshot then
// Translate the insertion point to the current snapshot and
// move to it.
_commonOperations.MapPointNegativeToCurrentSnapshot destPoint
|> (fun point -> _commonOperations.MoveCaretToPoint point ViewFlags.VirtualEdit)
_commonOperations.RestoreSpacesToCaret spaces true)
/// Compose two line commands
member x.RunCompose lineCommand1 lineCommand2 =
use transaction = _undoRedoOperations.CreateLinkedUndoTransactionWithFlags "Compose Command" LinkedUndoTransactionFlags.CanBeEmpty
x.RunLineCommand lineCommand1
x.RunLineCommand lineCommand2
transaction.Complete()
/// Clear out the key map for the given modes
member x.RunClearKeyMap keyRemapModes mapArgumentList =
let keyMap, mapArgumentList = x.GetKeyMap mapArgumentList
if not (List.isEmpty mapArgumentList) then
_statusUtil.OnError (Resources.Interpreter_OptionNotSupported "map special arguments")
else
keyRemapModes
|> Seq.iter keyMap.ClearKeyMappings
/// Run the close command
member x.RunClose hasBang =
if hasBang then
_vimHost.Close _textView
else
_commonOperations.CloseWindowUnlessDirty()
/// Run the delete command. Delete the specified range of text and set it to
/// the given Register
member x.RunDelete lineRange registerName =
x.RunWithLineRangeOrDefault lineRange DefaultLineRange.CurrentLine (fun lineRange ->
_commonOperations.DeleteLines lineRange.StartLine lineRange.Count registerName)
member x.RunDeleteMarkCore mark =
let markMap = _vimBufferData.Vim.MarkMap
markMap.DeleteMark mark _vimBufferData |> ignore
member x.RunDeleteMarks marks =
marks |> Seq.iter x.RunDeleteMarkCore
member x.RunDeleteAllMarks () =
LocalMark.All
|> Seq.filter (fun mark ->
match mark with
| LocalMark.Number _ -> false
| _ -> true)
|> Seq.map (fun localMark -> Mark.LocalMark localMark)
|> Seq.iter x.RunDeleteMarkCore
member x.RunFunction (func: Function) =
_statusUtil.OnError Resources.Interpreter_FunctionNotSupported
/// Run the ':digraphs' command
member x.RunDigraphs digraphList =
let digraphMap = _vimBuffer.Vim.DigraphMap
// Get the two characters that make up the digraph.
let getChars char1 char2 =
string(char1) + string(char2)
// Get the display string for the replacement text.
let getDisplay code =
code
|> DigraphUtil.GetText
|> StringUtil.GetDisplayString
if List.isEmpty digraphList then
let columns = 4
digraphMap.Mappings
|> Seq.map (fun (char1, char2, code) ->
(getChars char1 char2, getDisplay code, code))
|> Seq.sortBy (fun (_, _, code) -> code)
|> Seq.mapi (fun index (digraph, text, code) ->
(index + 1, sprintf "%2s %-2s %5d " digraph text code))
|> Seq.map (fun (index, output) ->
output + (if index % columns = 0 then System.Environment.NewLine else ""))
|> String.concat ""
|> _statusUtil.OnStatus
else
DigraphUtil.AddToMap _vimBuffer.Vim.DigraphMap digraphList
member x.RunDisplayAbbreviation modeList (lhs: string option) =
let list = List<string>()
let appendMap (map: IVimAbbreviationMap) isLocalChar =
let modeToChar mode =
match mode with
| AbbreviationMode.Insert -> 'i'
| AbbreviationMode.Command -> 'c'
let add mode str =
if Seq.contains mode modeList then
list.Add str
let getDisplayString key (abbreviations: Abbreviation seq) =
match List.ofSeq abbreviations with
| [a] -> add a.Mode (sprintf "%c %O\t%c%O" (modeToChar a.Mode) key isLocalChar a.Replacement)
| [a1; a2] when a1.Replacement = a2.Replacement -> list.Add(sprintf "! %O\t%c%O" key isLocalChar a1.Replacement)
| [a1; a2] ->
add a1.Mode (sprintf "%c %O\t%c%O" (modeToChar a1.Mode) key isLocalChar a1.Replacement)
add a2.Mode (sprintf "%c %O\t%c%O" (modeToChar a2.Mode) key isLocalChar a2.Replacement)
| _ -> ()
let groupedAbbreviations =
map.Abbreviations
|> Seq.groupBy (fun x -> x.Abbreviation)
|> Seq.sortBy (fun (key, _) -> key)
for (key, abbreviations) in groupedAbbreviations do
getDisplayString key abbreviations
appendMap _vimTextBuffer.LocalAbbreviationMap '!'
appendMap _vimTextBuffer.GlobalAbbreviationMap ' '
_statusUtil.OnStatusLong (list :> string seq)
/// Display the given map modes
member x.RunDisplayKeyMap keyRemapModes prefixFilter =
// Define the mode groups used to group identical mappings.
let nvoGroup = [
KeyRemapMode.Normal
KeyRemapMode.Visual
KeyRemapMode.Select
KeyRemapMode.OperatorPending
]
let vGroup = [
KeyRemapMode.Visual
KeyRemapMode.Select
]
let bangGroup = [
KeyRemapMode.Insert
KeyRemapMode.Command
]
// Separate out complete subsets of a mode group from a list of modes.
let separateOutGroup (modeGroup: KeyRemapMode list) (modes: KeyRemapMode list) =
let matches =
modes |> List.filter (fun mode -> modeGroup |> Seq.contains mode)
let nonMatches =
modes |> List.filter (fun mode -> modeGroup |> Seq.contains mode |> not)
if matches.Length = modeGroup.Length then
[modeGroup], nonMatches
else
List.Empty, modes
// Replace any standard group included in all the remap modes with a
// single entry assigned to the combined remap mode.
let combineByGroup (mappings: (KeyRemapMode * KeyInputSet * KeyInputSet) list) =
let modes = mappings |> Seq.map (fun (mode, _, _) -> mode) |> Seq.toList
let _, lhs, rhs = mappings.Head
let rest = modes
let group1, rest = rest |> separateOutGroup nvoGroup
let group2, rest = rest |> separateOutGroup vGroup
let group3, rest = rest |> separateOutGroup bangGroup
seq {
yield! group1
yield! group2
yield! group3
yield! rest |> Seq.map (fun mode -> [mode])
}
|> Seq.map (fun modes -> modes, lhs, rhs)
// Whether the specified key input set starts with another key input
// set.
let startsWith (keyInputSet: KeyInputSet) (prefix: KeyInputSet) =
if prefix.Length > keyInputSet.Length then
false
else
keyInputSet.KeyInputs
|> Seq.take prefix.Length
|> KeyInputSetUtil.OfSeq
|> (fun subset -> subset = prefix)
// If provided, filter the list to those whose left hand side starts
// with the specified prefix.
let filterByPrefix sequence =
match prefixFilter with
| Some prefixNotation ->
match KeyNotationUtil.TryStringToKeyInputSet prefixNotation with
| Some prefix ->
sequence
|> Seq.filter (fun (_, lhs, _) -> startsWith lhs prefix)
| None ->
sequence
| None ->
sequence
// Get the label for the set of modes.
let getModeLabel modes =
match modes with
| modes when modes = nvoGroup -> " "
| modes when modes = vGroup -> "v"
| modes when modes = bangGroup -> "!"
| [KeyRemapMode.Normal] -> "n"
| [KeyRemapMode.Visual] -> "x"
| [KeyRemapMode.Select] -> "s"
| [KeyRemapMode.OperatorPending] -> "o"
| [KeyRemapMode.Command] -> "c"
| [KeyRemapMode.Language] -> "l"
| [KeyRemapMode.Insert] -> "i"
| _ -> "?"
// Get a printable string for a key input set.
let getKeyInputSetLine (keyInputSet: KeyInputSet) =
KeyNotationUtil.KeyInputSetToString keyInputSet
// Get a printable line for the specified mode list, left and right side.
let getLine modes lhs rhs =
sprintf "%-3s%-10s %s" (getModeLabel modes) (getKeyInputSetLine lhs) (getKeyInputSetLine rhs)
x.KeyMaps
|> Seq.collect (fun (keyMap: IVimKeyMap) ->
keyRemapModes
|> Seq.collect (fun mode ->
// Generate a mode / lhs / rhs tuple for all mappings in the
// specified mode.
mode
|> keyMap.GetKeyMappings
|> Seq.map (fun keyMapping -> (mode, keyMapping.Left, keyMapping.Right)))
|> filterByPrefix
|> Seq.groupBy (fun (_, lhs, rhs) -> lhs, rhs)
|> Seq.map (fun (_, mappings) -> mappings |> Seq.toList)
|> Seq.collect combineByGroup
|> Seq.sortBy (fun (modes, lhs, _) -> lhs, modes)
|> Seq.map (fun (modes, lhs, rhs) -> getLine modes lhs rhs))
|> _statusUtil.OnStatusLong
/// Display the registers. If a particular name is specified only display that register
member x.RunDisplayRegisters nameList =
// Convert the register value to a human-readable form.
let normalizeDisplayString (registerValue: RegisterValue) =
if registerValue.IsString then
StringUtil.GetDisplayString registerValue.StringValue
else
registerValue.KeyInputs
|> KeyInputSetUtil.OfList
|> KeyNotationUtil.KeyInputSetToString
let displayNames =
match nameList with
| [] ->
// The documentation for this command says that it should display only the
// named and numbered registers. Experimentation shows that it should also
// display last search, the quote star and a few others
RegisterName.All
|> Seq.filter (fun name ->
match name with
| RegisterName.Numbered _ -> true
| RegisterName.Named named -> not named.IsAppend
| RegisterName.SelectionAndDrop drop -> drop <> SelectionAndDropRegister.Star
| RegisterName.LastSearchPattern -> true
| RegisterName.ReadOnly ReadOnlyRegister.Colon -> true
| _ -> false)
| _ -> nameList |> Seq.ofList
// Build up the status string messages
let lines =
displayNames
|> Seq.map (fun name ->
let register = _registerMap.GetRegister name
match register.Name.Char, StringUtil.IsNullOrEmpty register.StringValue with
| None, _ -> None
| Some c, true -> None
| Some c, false -> Some (c, normalizeDisplayString register.RegisterValue))
|> SeqUtil.filterToSome
|> Seq.map (fun (name, value) -> sprintf "\"%c %s" name value)
let lines = Seq.append (Seq.singleton Resources.CommandMode_RegisterBanner) lines
_statusUtil.OnStatusLong lines
/// Display the value of the specified (or all) variables
member x.RunDisplayLet (names: VariableName list) =
let names =
if names.IsEmpty then
_variableMap.Keys
|> Seq.sortBy id
|> Seq.map (fun key -> { NameScope = NameScope.Global; Name = key })
|> Seq.toList
else
names
seq {
for name in names do
let found, value = _variableMap.TryGetValue name.Name
yield
if found then
sprintf "%s %O" name.Name value
else
Resources.Interpreter_UndefinedVariable name.Name
}
|> _statusUtil.OnStatusLong
/// Display the specified marks
member x.RunDisplayMarks (marks: Mark list) =
let printMarkInfo info =
let ident, name, line, column = info
sprintf " %c %5d%5d %s" ident (line + 1) column name
let getMark (mark: Mark) =
match _markMap.GetMarkInfo mark _vimBufferData with
| Some markInfo ->
(markInfo.Ident, markInfo.Name, markInfo.Line, markInfo.Column)
|> Some
| None ->
None
seq {
yield Mark.LastJump
for letter in Letter.All do
yield Mark.LocalMark (LocalMark.Letter letter)
for letter in Letter.All do
yield Mark.GlobalMark letter
for number in NumberMark.All do
yield Mark.LocalMark (LocalMark.Number number)
yield Mark.LastExitedPosition
yield Mark.LocalMark LocalMark.LastChangeOrYankStart
yield Mark.LocalMark LocalMark.LastChangeOrYankEnd
yield Mark.LocalMark LocalMark.LastInsertExit
yield Mark.LocalMark LocalMark.LastEdit
yield Mark.LocalMark LocalMark.LastSelectionStart
yield Mark.LocalMark LocalMark.LastSelectionEnd
}
|> Seq.filter (fun mark -> marks.Length = 0 || List.contains mark marks)
|> Seq.map getMark
|> Seq.filter (fun option -> option.IsSome)
|> Seq.map (fun option -> option.Value)
|> Seq.map (fun info -> printMarkInfo info)
|> Seq.append ("mark line col file/text" |> Seq.singleton)
|> _statusUtil.OnStatusLong
/// Run the echo command
member x.RunEcho expression =
let value = x.RunExpression expression
let rec valueAsString value =
match value with
| VariableValue.Number number -> string number
| VariableValue.String str -> str
| VariableValue.List values ->
let listItemAsString value =
let stringified = valueAsString value
match value with
| VariableValue.String str -> sprintf "'%s'" stringified
| _ -> stringified
List.map listItemAsString values
|> String.concat ", "
|> sprintf "[%s]"
| VariableValue.Dictionary _ -> "{}"
| _ -> "<error>"
_statusUtil.OnStatus <| valueAsString value
/// Run the execute command
member x.RunExecute expression =
let parser = Parser(_globalSettings, _vimData)
let execute str =
parser.ParseLineCommand str |> x.RunLineCommand
match x.RunExpression expression with
| VariableValue.Number number -> execute (string number)
| VariableValue.String str -> execute str
| _ -> _statusUtil.OnStatus "Error executing expression"
/// Edit the specified file
member x.RunEdit hasBang fileOptions commandOption symbolicPath =
let filePath = x.InterpretSymbolicPath symbolicPath
if not (List.isEmpty fileOptions) then
_statusUtil.OnError (Resources.Interpreter_OptionNotSupported "[++opt]")
elif Option.isSome commandOption then
_statusUtil.OnError (Resources.Interpreter_OptionNotSupported "[++cmd]")
elif System.String.IsNullOrEmpty filePath then
if not hasBang && _vimHost.IsDirty _textBuffer then
_statusUtil.OnError Resources.Common_NoWriteSinceLastChange
else
let caret =
let point = TextViewUtil.GetCaretPoint _textView
point.Snapshot.CreateTrackingPoint(point.Position, PointTrackingMode.Negative)
if not (_vimHost.Reload _textView) then
_commonOperations.Beep()
else
match TrackingPointUtil.GetPoint _textView.TextSnapshot caret with
| None -> ()
| Some point -> _commonOperations.MoveCaretToPoint point ViewFlags.Standard
elif not hasBang && _vimHost.IsDirty _textBuffer then
_statusUtil.OnError Resources.Common_NoWriteSinceLastChange
else
let resolvedFilePath = x.ResolveVimPath filePath
_vimHost.LoadFileIntoExistingWindow resolvedFilePath _textView |> ignore
/// Get the value of the specified expression
member x.RunExpression expr =
_exprInterpreter.RunExpression expr
/// Evaluate the text as an expression and return its value
member x.EvaluateExpression (text: string) =
let parser = Parser(_globalSettings, _vimData)
match parser.ParseExpression(text) with
| ParseResult.Succeeded expression ->
_exprInterpreter.RunExpression expression |> EvaluateResult.Succeeded
| ParseResult.Failed message ->
EvaluateResult.Failed message
/// Print out the applicable file history information
member x.RunFiles () =
let output = List<string>()
output.Add(" # file history")
let historyList = _vimData.FileHistory
for i = 0 to historyList.Count - 1 do
let item = historyList.Items.[i]
let msg = sprintf "%7d %s" i item
output.Add(msg)
_statusUtil.OnStatusLong(output)
/// Fold the specified line range
member x.RunFold lineRange =
x.RunWithLineRangeOrDefault lineRange DefaultLineRange.CurrentLine (fun lineRange ->
if lineRange.Count > 1 then
_foldManager.CreateFold lineRange)
member x.RunNormal (lineRange: LineRangeSpecifier) input =
let transactionMap = System.Collections.Generic.Dictionary<IVimBuffer, ILinkedUndoTransaction>();
let modeSwitchMap = System.Collections.Generic.Dictionary<IVimBuffer, IVimBuffer>();
try
let rec inner list =
match list with
| [] ->
// No more input so we are finished
true
| keyInput :: tail ->
// Prefer the focussed IVimBuffer over the current. It's possible for the
// macro playback switch the active buffer via gt, gT, etc ... and playback
// should continue on the newly focussed IVimBuffer. Should the host API
// fail to return an active IVimBuffer continue using the original one
let buffer =
match _vim.FocusedBuffer with
| Some buffer -> buffer
| None -> _vimBuffer
// Make sure we have an IUndoTransaction open in the ITextBuffer
if not (transactionMap.ContainsKey(buffer)) then
let transaction = _undoRedoOperations.CreateLinkedUndoTransactionWithFlags "Normal Command" LinkedUndoTransactionFlags.CanBeEmpty
transactionMap.Add(buffer, transaction)
if not (modeSwitchMap.ContainsKey(buffer)) then
buffer.SwitchMode ModeKind.Normal ModeArgument.None |> ignore
modeSwitchMap.Add(buffer, buffer)
// Actually run the KeyInput. If processing the KeyInput value results
// in an error then we should stop processing the macro
match buffer.Process keyInput with
| ProcessResult.Handled _ -> inner tail
| ProcessResult.HandledNeedMoreInput -> inner tail
| ProcessResult.NotHandled -> false
| ProcessResult.Error -> false
let revertModes () =
modeSwitchMap.Values |> Seq.iter (fun buffer ->
buffer.SwitchPreviousMode() |> ignore
)
modeSwitchMap.Clear()
match x.GetLineRange lineRange with
| None ->
try
inner input |> ignore
finally
revertModes ()
| _ ->
x.RunWithLineRange lineRange (fun lineRange ->
// Each command we run can, and often will, change the underlying buffer whcih
// will change the current ITextSnapshot. Run one pass to get the line numbers
// and then a second to edit the commands
let lineNumbers =
lineRange.Lines
|> Seq.map (fun snapshotLine ->
let lineNumber, offset = SnapshotPointUtil.GetLineNumberAndOffset snapshotLine.Start
_bufferTrackingService.CreateLineOffset _textBuffer lineNumber offset LineColumnTrackingMode.Default)
|> List.ofSeq
// Now perform the command for every line. Make sure to map forward to the
// current ITextSnapshot
lineNumbers |> List.iter (fun trackingLineColumn ->
match trackingLineColumn.Point with
| None -> ()
| Some point ->
let point =
point
|> SnapshotPointUtil.GetContainingLine
|> SnapshotLineUtil.GetStart
// Caret needs to move to the start of the line for each :global command
// action. The caret will persist on the final line in the range once
// the :global command completes
TextViewUtil.MoveCaretToPoint _textView point
try
inner input |> ignore
finally
revertModes ()
)
// Now close all of the ITrackingLineColumn values so that they stop taking up resources
lineNumbers |> List.iter (fun trackingLineColumn -> trackingLineColumn.Close())
)
finally
transactionMap.Values |> Seq.iter (fun transaction ->
transaction.Dispose()
)
/// Run the global command.
member x.RunGlobal lineRange pattern matchPattern lineCommand =
let pattern =
if StringUtil.IsNullOrEmpty pattern then _vimData.LastSearchData.Pattern
else
_vimData.LastSearchData <- SearchData(pattern, SearchPath.Forward)
pattern
x.RunWithLineRangeOrDefault lineRange DefaultLineRange.EntireBuffer (fun lineRange ->
let options = VimRegexFactory.CreateRegexOptions _globalSettings
match VimRegexFactory.Create pattern options with
| None -> _statusUtil.OnError Resources.Interpreter_Error
| Some regex ->
// All of the edits should behave as a single vim undo. Can't do this as a single
// global undo as it executes as series of sub commands which create their own
// global undo units
use transaction = _undoRedoOperations.CreateLinkedUndoTransactionWithFlags "Global Command" LinkedUndoTransactionFlags.CanBeEmpty
try
// Each command we run can, and often will, change the underlying buffer whcih
// will change the current ITextSnapshot. Run one pass to get the line numbers
// and then a second to edit the commands
let lineNumbers =
lineRange.Lines
|> Seq.filter (fun snapshotLine ->
let text = SnapshotLineUtil.GetText snapshotLine
let didMatch = regex.IsMatch text
didMatch = matchPattern)
|> Seq.map (fun snapshotLine ->
let lineNumber, offset = SnapshotPointUtil.GetLineNumberAndOffset snapshotLine.Start
_bufferTrackingService.CreateLineOffset _textBuffer lineNumber offset LineColumnTrackingMode.Default)
|> List.ofSeq
// Now perform the edit for every line. Make sure to map forward to the
// current ITextSnapshot
lineNumbers |> List.iter (fun trackingLineColumn ->
match trackingLineColumn.Point with
| None -> ()
| Some point ->
let point =
point
|> SnapshotPointUtil.GetContainingLine
|> SnapshotLineUtil.GetStart
// Caret needs to move to the start of the line for each :global command
// action. The caret will persist on the final line in the range once
// the :global command completes
TextViewUtil.MoveCaretToPoint _textView point
x.RunLineCommand lineCommand |> ignore)
// Now close all of the ITrackingLineColumn values so that they stop taking up resources
lineNumbers |> List.iter (fun trackingLineColumn -> trackingLineColumn.Close())
finally
transaction.Complete())
/// Go to the first tab
member x.RunGoToFirstTab() =
_commonOperations.GoToTab 0
/// Go to the last tab
member x.RunGoToLastTab() =
_commonOperations.GoToTab _vimHost.TabCount
/// Go to the next "count" tab
member x.RunGoToNextTab count =
let count = x.GetCountOrDefault count
_commonOperations.GoToNextTab SearchPath.Forward count
/// Go to the previous "count" tab
member x.RunGoToPreviousTab count =
let count = x.GetCountOrDefault count
_commonOperations.GoToNextTab SearchPath.Backward count
/// Show VsVim help on the specified subject
member x.RunHelp subject =
let wiki = "https://github.com/VsVim/VsVim/wiki"
let link = wiki
_vimHost.OpenLink link |> ignore
_statusUtil.OnStatus "For help on Vim, use :vimhelp"
/// Run 'find in files' using the specified vim regular expression
member x.RunVimGrep count hasBang pattern flags filePattern =
// Action to perform when completing the operation.
let onFindDone () =
if Util.IsFlagSet flags VimGrepFlags.NoJumpToFirst |> not then
let listKind = ListKind.Location
let navigationKind = NavigationKind.First
x.RunNavigateToListItem listKind navigationKind None false
// Convert the vim regex to a BCL regex for use with 'find in files'.
match VimRegexFactory.Create pattern VimRegexOptions.Default with
| Some regex ->
let pattern = regex.RegexPattern
let matchCase =
match regex.CaseSpecifier with
| CaseSpecifier.IgnoreCase ->
false
| CaseSpecifier.OrdinalCase ->
true
| CaseSpecifier.None ->
not _globalSettings.IgnoreCase
let filesOfType = filePattern
_vimHost.FindInFiles pattern matchCase filesOfType flags onFindDone
| None ->
_commonOperations.Beep()
/// Show Vim help on the specified subject
member x.RunVimHelp (subject: string) =
let subject = subject.Replace("*", "star")
- let extractFolderVersion = fun pathName ->
+ let extractFolderVersion = fun (pathName: string) ->
let folder = System.IO.Path.GetFileName(pathName)
let m = System.Text.RegularExpressions.Regex.Match(folder, "^vim(\d+)", System.Text.RegularExpressions.RegexOptions.IgnoreCase)
match m with
| x when x.Success -> Some(folder, m.Groups.[1].Value |> int)
| _ -> None
// Function to find a vim installation folder
let findVimFolder specialFolder =
try
let folder =
match specialFolder with
| System.Environment.SpecialFolder.ProgramFiles ->
match System.Environment.GetEnvironmentVariable("ProgramW6432") with
| null -> System.Environment.GetFolderPath(specialFolder)
| folder -> folder
| _ -> System.Environment.GetFolderPath(specialFolder)
let vimFolder = System.IO.Path.Combine(folder, "Vim")
if System.IO.Directory.Exists(vimFolder) then
let latest =
System.IO.Directory.EnumerateDirectories vimFolder
|> Seq.choose (extractFolderVersion)
|> Seq.sortByDescending (fun (_, version) -> version)
|> Seq.map (fun (folder, _) -> folder)
|> Seq.tryHead
match latest with
| Some folder -> System.IO.Path.Combine(vimFolder, folder) |> Some
| None -> None
else
None
with
| _ -> None
// Find a vim installation folder, checking native first
let vimFolder =
match findVimFolder System.Environment.SpecialFolder.ProgramFiles with
| Some folder -> Some folder
| None -> findVimFolder System.Environment.SpecialFolder.ProgramFilesX86
// Load the default help
let loadDefaultHelp vimDoc =
let helpFile = System.IO.Path.Combine(vimDoc, "help.txt")
_commonOperations.LoadFileIntoNewWindow helpFile (Some 0) None |> ignore
let onStatusFocusedWindow message =
fun (commonOperations: ICommonOperations) ->
commonOperations.OnStatusFitToWindow message
|> _commonOperations.ForwardToFocusedWindow
match vimFolder with
| Some vimFolder ->
// We found an installation folder for vim.
let vimDoc = System.IO.Path.Combine(vimFolder, "doc")
if StringUtil.IsNullOrEmpty subject then
loadDefaultHelp vimDoc
onStatusFocusedWindow "For help on VsVim, use :help"
else
// Try to navigate to the tag.
match _commonOperations.GoToTagInNewWindow vimDoc subject with
| Result.Succeeded ->
()
| Result.Failed message ->
// Load the default help and report the error.
loadDefaultHelp vimDoc
onStatusFocusedWindow message
| None ->
// We cannot find an installation folder for vim so use the web.
// Ideally we would use vimhelp.org here, but it doesn't support a
// tag-based search API.
let subject = System.Net.WebUtility.UrlEncode(subject)
let doc = "http://vimdoc.sourceforge.net/search.php"
let link = sprintf "%s?search=%s&docs=help" doc subject
_vimHost.OpenLink link |> ignore
_statusUtil.OnStatus "For help on VsVim, use :help"
/// Print out the applicable history information
member x.RunHistory () =
let output = List<string>()
output.Add(" # cmd history")
let historyList = _vimData.CommandHistory
let mutable index = historyList.TotalCount - historyList.Count
for item in historyList.Items |> List.rev do
index <- index + 1
let msg = sprintf "%7d %s" index item
output.Add(msg)
_statusUtil.OnStatusLong(output)
/// Run the if command
member x.RunIf (conditionalBlockList: ConditionalBlock list) =
let shouldRun (conditionalBlock: ConditionalBlock) =
match conditionalBlock.Conditional with
| None -> true
| Some expr ->
match _exprInterpreter.GetExpressionAsNumber expr with
| None -> false
| Some value -> value <> 0
match List.tryFind shouldRun conditionalBlockList with
| None -> ()
| Some conditionalBlock -> conditionalBlock.LineCommands |> Seq.iter (fun lineCommand -> x.RunLineCommand lineCommand |> ignore)
/// Join the lines in the specified range
member x.RunJoin lineRange joinKind =
x.RunWithLineRangeOrDefault lineRange DefaultLineRange.CurrentLine (fun lineRange ->
_commonOperations.Join lineRange joinKind)
/// Jump to the last line of the specified line range
member x.RunJumpToLastLine lineRange =
x.RunWithLooseLineRangeOrDefault lineRange DefaultLineRange.CurrentLine (fun lineRange ->
x.MoveLinewiseToPoint lineRange.LastLine.Start)
/// Run the let command
member x.RunLet (name: VariableName) expr =
// TODO: At this point we are treating all variables as if they were global. Need to
// take into account the NameScope at this level too
match x.RunExpression expr with
| VariableValue.Error -> _statusUtil.OnError Resources.Interpreter_Error
| value -> _variableMap.[name.Name] <- value
/// Run the let environment variable command
member x.RunLetEnvironment (name: string) expr =
match x.RunExpression expr with
| VariableValue.Error -> _statusUtil.OnError Resources.Interpreter_Error
| value ->
try
System.Environment.SetEnvironmentVariable(name, value.StringValue)
with
| _ ->
value
|> string
|> Resources.Interpreter_ErrorSettingEnvironmentVariable name
|> _statusUtil.OnError
/// Run the let command for registers
member x.RunLetRegister (name: RegisterName) expr =
let setRegister (value: string) =
let registerValue = RegisterValue(value, OperationKind.CharacterWise)
_commonOperations.SetRegisterValue (Some name) RegisterOperation.Yank registerValue
match _exprInterpreter.GetExpressionAsString expr with
| Some value -> setRegister value
| None -> ()
/// Run the host make command
member x.RunMake hasBang arguments =
_vimHost.Make (hasBang) arguments
/// Run the map keys command
member x.RunMapKeys leftKeyNotation rightKeyNotation keyRemapModes allowRemap mapArgumentList =
// At this point we can parse out all of the key mapping options, we just don't support
// most of them. Warn the developer but continue processing
let keyMap, mapArgumentList = x.GetKeyMap mapArgumentList
for mapArgument in mapArgumentList do
let name = sprintf "%A" mapArgument
_statusUtil.OnWarning (Resources.Interpreter_KeyMappingOptionNotSupported name)
match keyMap.ParseKeyNotation leftKeyNotation, keyMap.ParseKeyNotation rightKeyNotation with
| Some lhs, Some rhs ->
// Empirically with vim/gvim, <S-$> on the left is never
// matched, but <S-$> on the right is treated as '$'. Reported
// in issue #2313.
let rhs =
rhs.KeyInputs
|> Seq.map KeyInputUtil.NormalizeKeyModifiers
|> KeyInputSetUtil.OfSeq
keyRemapModes
|> Seq.iter (fun keyRemapMode -> keyMap.AddKeyMapping(lhs, rhs, allowRemap, keyRemapMode))
| _ ->
_statusUtil.OnError (Resources.Interpreter_UnableToMapKeys leftKeyNotation rightKeyNotation)
/// Run the 'nohlsearch' command. Temporarily disables highlighitng in the buffer
member x.RunNoHighlightSearch() =
_vimData.SuspendDisplayPattern()
/// Report a parse error that has already been line number annotated
member x.RunParseError msg =
_vimBufferData.StatusUtil.OnError msg
/// Print out the contents of the specified range
member x.RunDisplayLines lineRange lineCommandFlags =
x.RunWithLineRangeOrDefault lineRange DefaultLineRange.CurrentLine (fun lineRange ->
// Leave enough room to right justify any line number, with a
// minimum of three digits to mimic vim.
let snapshot = SnapshotLineUtil.GetSnapshot lineRange.StartLine
let lastLineNumber = SnapshotUtil.GetLastNormalizedLineNumber snapshot
let digits = max 3 (int(floor(log10(double(lastLineNumber + 1)))) + 1)
let hasListFlag = Util.IsFlagSet lineCommandFlags LineCommandFlags.List
let addLineNumber = Util.IsFlagSet lineCommandFlags LineCommandFlags.AddLineNumber
// List line with control characters encoded.
let listLine (line: ITextSnapshotLine) =
line
|> SnapshotLineUtil.GetText
|> (fun text -> (StringUtil.GetDisplayString text) + "$")
// Print line with tabs expanded.
let printLine (line: ITextSnapshotLine) =
line
|> SnapshotLineUtil.GetText
|> (fun text -> StringUtil.ExpandTabsForColumn text 0 _localSettings.TabStop)
// Print or list line.
let printOrListLine (line: ITextSnapshotLine) =
line
|> if hasListFlag then listLine else printLine
// Display line with leading line number
let formatLineNumberAndLine (line: ITextSnapshotLine) =
line
|> printOrListLine
|> sprintf "%*d %s" digits (line.LineNumber + 1)
let formatLine (line: ITextSnapshotLine) =
if addLineNumber || _localSettings.Number then
formatLineNumberAndLine line
else
printOrListLine line
lineRange.Lines
|> Seq.map formatLine
|> _statusUtil.OnStatusLong)
/// Print out the current directory
member x.RunPrintCurrentDirectory() =
_statusUtil.OnStatus x.CurrentDirectory
/// Put the register after the last line in the given range
member x.RunPut lineRange registerName putAfter =
let register = _commonOperations.GetRegister registerName
x.RunWithLineRangeOrDefault lineRange DefaultLineRange.CurrentLine (fun lineRange ->
// Need to get the cursor position correct for undo / redo so start an undo
// transaction
_undoRedoOperations.EditWithUndoTransaction "PutLine" _textView (fun () ->
// Get the point to start the Put operation at
let line =
if putAfter then lineRange.LastLine
else lineRange.StartLine
let point =
if putAfter then line.EndIncludingLineBreak
else line.Start
_commonOperations.Put point register.StringData OperationKind.LineWise
// Need to put the caret on the first non-blank of the last line of the
// inserted text
let lineCount = x.CurrentSnapshot.LineCount - point.Snapshot.LineCount
let line =
let number = if putAfter then line.LineNumber + 1 else line.LineNumber
let number = number + (lineCount - 1)
SnapshotUtil.GetLine x.CurrentSnapshot number
let point = SnapshotLineUtil.GetFirstNonBlankOrEnd line
_commonOperations.MoveCaretToPoint point ViewFlags.VirtualEdit))
/// Run the 'open list window' command, e.g. ':cwindow'
member x.RunOpenListWindow listKind =
_vimHost.OpenListWindow listKind
/// Run the 'navigate to list item' command, e.g. ':cnext'
member x.RunNavigateToListItem listKind navigationKind argument hasBang =
// Handle completing navigation to a find result.
let onNavigateDone (listItem: ListItem) (commonOperations: ICommonOperations) =
// Display the list item in the window navigated to.
let itemNumber = listItem.ItemNumber
let listLength = listItem.ListLength
let message = StringUtil.GetDisplayString listItem.Message
sprintf "(%d of %d): %s" itemNumber listLength message
|> commonOperations.OnStatusFitToWindow
// Ensure view properties are met in the new window.
commonOperations.EnsureAtCaret ViewFlags.Standard
// Forward the navigation request to the host.
match _vimHost.NavigateToListItem listKind navigationKind argument hasBang with
| Some listItem ->
// We navigated to a (possibly new) document window.
listItem
|> onNavigateDone
|> _commonOperations.ForwardToFocusedWindow
| None ->
// We reached the beginning or end of the list, or something else
// went wrong.
_statusUtil.OnStatus Resources.Interpreter_NoMoreItems
/// Run the quit command
member x.RunQuit hasBang =
x.RunClose hasBang
/// Run the quit all command
member x.RunQuitAll hasBang =
// If the ! flag is not passed then we raise an error if any of the ITextBuffer instances
// are dirty
if not hasBang then
let anyDirty = _vim.VimBuffers |> Seq.exists (fun buffer -> _vimHost.IsDirty buffer.TextBuffer)
if anyDirty then
_statusUtil.OnError Resources.Common_NoWriteSinceLastChange
else
_vimHost.Quit()
else
_vimHost.Quit()
member x.RunQuitWithWrite lineRange hasBang fileOptions filePath =
x.RunWithLineRangeOrDefault lineRange DefaultLineRange.EntireBuffer (fun lineRange ->
if not (List.isEmpty fileOptions) then
_statusUtil.OnError (Resources.Interpreter_OptionNotSupported "[++opt]")
else
match filePath with
| None -> _vimHost.Save _textView.TextBuffer |> ignore
| Some filePath ->
let filePath = x.ResolveVimPath filePath
_vimHost.SaveTextAs (lineRange.GetTextIncludingLineBreak()) filePath |> ignore
_commonOperations.CloseWindowUnlessDirty())
/// Run the core parts of the read command
member x.RunReadCore (point: SnapshotPoint) (lines: string[]) =
let lineBreak = _commonOperations.GetNewLineText point
let text =
let builder = System.Text.StringBuilder()
for line in lines do
builder.AppendString line
builder.AppendString lineBreak
builder.ToString()
_textBuffer.Insert(point.Position, text) |> ignore
/// Run the read command command
member x.RunReadCommand lineRange command =
x.ExecuteCommand lineRange command true
/// Run the read file command.
member x.RunReadFile lineRange fileOptionList filePath =
let filePath = x.ResolveVimPath filePath
x.RunWithPointAfterOrDefault lineRange DefaultLineRange.CurrentLine (fun point ->
if not (List.isEmpty fileOptionList) then
_statusUtil.OnError (Resources.Interpreter_OptionNotSupported "[++opt]")
else
match _fileSystem.ReadAllLines filePath with
| None ->
_statusUtil.OnError (Resources.Interpreter_CantOpenFile filePath)
| Some lines ->
x.RunReadCore point lines)
/// Run a single redo operation
member x.RunRedo() =
_commonOperations.Redo 1
/// Remove the auto commands which match the specified definition
member x.RemoveAutoCommands (autoCommandDefinition: AutoCommandDefinition) =
let isMatch (autoCommand: AutoCommand) =
if autoCommand.Group = autoCommandDefinition.Group then
let isPatternMatch = Seq.exists (fun p -> autoCommand.Pattern = p) autoCommandDefinition.Patterns
let isEventMatch = Seq.exists (fun e -> autoCommand.EventKind = e) autoCommandDefinition.EventKinds
match autoCommandDefinition.Patterns.Length > 0, autoCommandDefinition.EventKinds.Length > 0 with
| true, true -> isPatternMatch && isEventMatch
| true, false -> isPatternMatch
| false, true -> isEventMatch
| false, false -> true
else
false
let rest =
_vimData.AutoCommands
|> Seq.filter (fun x -> not (isMatch x))
|> List.ofSeq
_vimData.AutoCommands <- rest
/// Process the :retab command. Changes all sequences of spaces and tabs which contain
/// at least a single tab into the normalized value based on the provided 'tabstop' or
/// default 'tabstop' setting
member x.RunRetab lineRange includeSpaces tabStop =
x.RunWithLineRangeOrDefault lineRange DefaultLineRange.EntireBuffer (fun lineRange ->
let newTabStop =
match tabStop with
| None -> _localSettings.TabStop
| Some tabStop -> tabStop
let snapshot = lineRange.Snapshot
// First break into a sequence of SnapshotSpan values which contain only space and tab
// values. We'll filter out the space only ones later if needed
let spans =
// Find the next position which has a space or tab value
let rec nextPoint (point: SnapshotPoint) =
if point.Position >= lineRange.End.Position then
None
elif SnapshotPointUtil.IsBlank point then
Some point
else
point |> SnapshotPointUtil.AddOne |> nextPoint
lineRange.Start
|> Seq.unfold (fun point ->
match nextPoint point with
| None ->
None
| Some startPoint ->
// Now find the first point which is not a space or tab.
let endPoint =
SnapshotSpan(startPoint, lineRange.End)
|> SnapshotSpanUtil.GetPoints SearchPath.Forward
|> Seq.skipWhile SnapshotPointUtil.IsBlank
|> SeqUtil.headOrDefault lineRange.End
let span = SnapshotSpan(startPoint, endPoint)
Some (span, endPoint))
|> Seq.filter (fun span ->
// Filter down to the SnapshotSpan values which contain tabs or spaces
// depending on the switch
if includeSpaces then
true
else
let hasTab =
span
|> SnapshotSpanUtil.GetPoints SearchPath.Forward
|> SeqUtil.any (SnapshotPointUtil.IsChar '\t')
hasTab)
// Now that we have the set of spans perform the edit
use edit = _textBuffer.CreateEdit()
for span in spans do
let oldText = span.GetText()
let spacesToColumn = _commonOperations.GetSpacesToPoint span.Start
let newText = _commonOperations.NormalizeBlanksForNewTabStop oldText spacesToColumn newTabStop
edit.Replace(span.Span, newText) |> ignore
edit.Apply() |> ignore
// If the user explicitly specified a 'tabstop' it becomes the new value.
match tabStop with
| None -> ()
| Some tabStop -> _localSettings.TabStop <- tabStop)
/// Run the search command in the given direction
member x.RunSearch lineRange path pattern =
x.RunWithLineRangeOrDefault lineRange DefaultLineRange.CurrentLine (fun lineRange ->
let pattern =
if StringUtil.IsNullOrEmpty pattern then _vimData.LastSearchData.Pattern
else pattern
// The search start after the end of the specified line range or
// before its beginning.
let startPoint =
match path with
| SearchPath.Forward ->
lineRange.End
| SearchPath.Backward ->
lineRange.Start
let searchData = SearchData(pattern, path, _globalSettings.WrapScan)
let result = _searchService.FindNextPattern startPoint searchData _vimTextBuffer.WordUtil.SnapshotWordNavigator 1
_commonOperations.RaiseSearchResultMessage(result)
match result with
| SearchResult.Found (searchData, span, _, _) ->
x.MoveLinewiseToPoint span.Start
_vimData.LastSearchData <- searchData
| SearchResult.NotFound _ -> ()
| SearchResult.Cancelled _ -> ()
| SearchResult.Error _ -> ())
/// Run the :set command. Process each of the arguments
member x.RunSet setArguments =
// Get the setting for the specified name
let withSetting name msg (func: Setting -> IVimSettings -> unit) =
match _localSettings.GetSetting name with
| None ->
match _windowSettings.GetSetting name with
| None -> _statusUtil.OnError (Resources.Interpreter_UnknownOption name)
| Some setting -> func setting _windowSettings
| Some setting -> func setting _localSettings
// Display the specified setting
let getSettingDisplay (setting: Setting ) =
match setting.Value with
| SettingValue.Toggle b ->
if b then setting.Name
else sprintf "no%s" setting.Name
| SettingValue.String s ->
sprintf "%s=\"%s\"" setting.Name s
| SettingValue.Number n ->
sprintf "%s=%d" setting.Name n
diff --git a/Src/VimCore/VimCore.fsproj b/Src/VimCore/VimCore.fsproj
index c6dc372..654570f 100644
--- a/Src/VimCore/VimCore.fsproj
+++ b/Src/VimCore/VimCore.fsproj
@@ -1,170 +1,160 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<RootNamespace>Vim.Core</RootNamespace>
<AssemblyName>Vim.Core</AssemblyName>
- <TargetFramework>net472</TargetFramework>
+ <TargetFramework>net6.0</TargetFramework>
<OtherFlags>--standalone</OtherFlags>
<NoWarn>2011</NoWarn>
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
<DebugType>portable</DebugType>
</PropertyGroup>
<ItemGroup>
<None Include="README.md" />
<Compile Include="Resources.fs" />
<Compile Include="Constants.fs" />
<Compile Include="FSharpUtil.fs" />
<Compile Include="VimTrace.fs" />
<Compile Include="StringUtil.fs" />
<Compile Include="Util.fs" />
<Compile Include="VimKey.fs" />
<Compile Include="KeyInput.fsi" />
<Compile Include="KeyInput.fs" />
<Compile Include="Unicode.fsi" />
<Compile Include="Unicode.fs" />
<Compile Include="CoreTypes.fs" />
<Compile Include="EditorUtil.fs" />
<Compile Include="Register.fs" />
<Compile Include="VimCharSet.fsi" />
<Compile Include="VimCharSet.fs" />
<Compile Include="VimSettingsInterface.fs" />
<Compile Include="Interpreter_Expression.fs" />
<Compile Include="TaggingInterfaces.fs" />
<Compile Include="WordUtil.fsi" />
<Compile Include="WordUtil.fs" />
<Compile Include="CoreInterfaces.fs" />
<Compile Include="CoreInternalInterfaces.fs" />
<Compile Include="CountCapture.fs" />
<Compile Include="VimRegexOptions.fs" />
<Compile Include="VimRegex.fsi" />
<Compile Include="VimRegex.fs" />
<Compile Include="MefInterfaces.fs" />
<Compile Include="KeyNotationUtil.fsi" />
<Compile Include="KeyNotationUtil.fs" />
<Compile Include="DigraphUtil.fs" />
<Compile Include="MotionCapture.fs" />
<Compile Include="RegexUtil.fs" />
<Compile Include="HistoryUtil.fsi" />
<Compile Include="HistoryUtil.fs" />
<Compile Include="PatternUtil.fs" />
<Compile Include="CommonOperations.fsi" />
<Compile Include="CommonOperations.fs" />
<Compile Include="Interpreter_Tokens.fs" />
<Compile Include="Interpreter_Tokenizer.fsi" />
<Compile Include="Interpreter_Tokenizer.fs" />
<Compile Include="Interpreter_Parser.fsi" />
<Compile Include="Interpreter_Parser.fs" />
<Compile Include="Interpreter_Interpreter.fsi" />
<Compile Include="Interpreter_Interpreter.fs" />
<Compile Include="CommandFactory.fsi" />
<Compile Include="CommandFactory.fs" />
<Compile Include="Modes_Command_CommandMode.fsi" />
<Compile Include="Modes_Command_CommandMode.fs" />
<Compile Include="Modes_Normal_NormalMode.fsi" />
<Compile Include="Modes_Normal_NormalMode.fs" />
<Compile Include="Modes_Insert_Components.fs" />
<Compile Include="Modes_Insert_InsertMode.fsi" />
<Compile Include="Modes_Insert_InsertMode.fs" />
<Compile Include="Modes_Visual_ISelectionTracker.fs" />
<Compile Include="Modes_Visual_SelectionTracker.fs" />
<Compile Include="Modes_Visual_VisualMode.fsi" />
<Compile Include="Modes_Visual_VisualMode.fs" />
<Compile Include="Modes_Visual_SelectMode.fsi" />
<Compile Include="Modes_Visual_SelectMode.fs" />
<Compile Include="Modes_SubstituteConfirm_SubstituteConfirmMode.fsi" />
<Compile Include="Modes_SubstituteConfirm_SubstituteConfirmMode.fs" />
<Compile Include="IncrementalSearch.fsi" />
<Compile Include="IncrementalSearch.fs" />
<Compile Include="CommandUtil.fsi" />
<Compile Include="CommandUtil.fs" />
<Compile Include="InsertUtil.fsi" />
<Compile Include="InsertUtil.fs" />
<Compile Include="TaggerUtil.fsi" />
<Compile Include="TaggerUtil.fs" />
<Compile Include="Tagger.fsi" />
<Compile Include="Tagger.fs" />
<Compile Include="CaretChangeTracker.fsi" />
<Compile Include="CaretChangeTracker.fs" />
<Compile Include="SelectionChangeTracker.fsi" />
<Compile Include="SelectionChangeTracker.fs" />
<Compile Include="MultiSelectionTracker.fsi" />
<Compile Include="MultiSelectionTracker.fs" />
<Compile Include="FoldManager.fsi" />
<Compile Include="FoldManager.fs" />
<Compile Include="ModeLineInterpreter.fsi" />
<Compile Include="ModeLineInterpreter.fs" />
<Compile Include="VimTextBuffer.fsi" />
<Compile Include="VimTextBuffer.fs" />
<Compile Include="VimBuffer.fsi" />
<Compile Include="VimBuffer.fs" />
<Compile Include="TextObjectUtil.fsi" />
<Compile Include="TextObjectUtil.fs" />
<Compile Include="MotionUtil.fsi" />
<Compile Include="MotionUtil.fs" />
<Compile Include="SearchService.fsi" />
<Compile Include="SearchService.fs" />
<Compile Include="RegisterMap.fsi" />
<Compile Include="RegisterMap.fs" />
<Compile Include="CaretRegisterMap.fsi" />
<Compile Include="CaretRegisterMap.fs" />
<Compile Include="ExternalEdit.fs" />
<Compile Include="DisabledMode.fs" />
<Compile Include="MarkMap.fsi" />
<Compile Include="MarkMap.fs" />
<Compile Include="MacroRecorder.fsi" />
<Compile Include="MacroRecorder.fs" />
<Compile Include="KeyMap.fsi" />
<Compile Include="KeyMap.fs" />
<Compile Include="DigraphMap.fsi" />
<Compile Include="DigraphMap.fs" />
<Compile Include="JumpList.fs" />
<Compile Include="LineNumbersMarginOption.fs" />
<Compile Include="VimSettings.fsi" />
<Compile Include="VimSettings.fs" />
<Compile Include="FileSystem.fs" />
<Compile Include="UndoRedoOperations.fsi" />
<Compile Include="UndoRedoOperations.fs" />
<Compile Include="CommandRunner.fsi" />
<Compile Include="CommandRunner.fs" />
<Compile Include="AutoCommandRunner.fsi" />
<Compile Include="AutoCommandRunner.fs" />
<Compile Include="Vim.fs" />
<Compile Include="StatusUtil.fsi" />
<Compile Include="StatusUtil.fs" />
<Compile Include="LineChangeTracker.fsi" />
<Compile Include="LineChangeTracker.fs" />
<Compile Include="MefComponents.fsi" />
<Compile Include="MefComponents.fs" />
<Compile Include="FSharpExtensions.fs" />
<Compile Include="AssemblyInfo.fs" />
</ItemGroup>
<ItemGroup>
<!-- Using element form vs. attributes to work around NuGet restore bug
https://github.com/NuGet/Home/issues/6367
https://github.com/dotnet/project-system/issues/3493 -->
- <PackageReference Include="FSharp.Core">
- <Version>4.6.2</Version>
+ <PackageReference Include="FSharp.Core" Version="6.0.3">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
-
- <!-- Excluding thes package to avoid the auto-include that is happening
- via F# targets and hittnig a restore issue in 15.7
- https://github.com/NuGet/Home/issues/6936 -->
- <PackageReference Include="System.ValueTuple">
- <Version>4.3.1</Version>
- <ExcludeAssets>all</ExcludeAssets>
- <PrivateAssets>all</PrivateAssets>
- </PackageReference>
+ <PackageReference Include="System.ComponentModel.Composition" Version="6.0.0" />
<Reference Include="Microsoft.VisualStudio.CoreUtility, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.Text.Data, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.Text.Logic, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.Text.UI, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="mscorlib" />
<Reference Include="System" />
- <Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Core" />
<Reference Include="System.Numerics" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Xml" />
</ItemGroup>
</Project>
diff --git a/Src/VimMac/Properties/AddinInfo.cs b/Src/VimMac/Properties/AddinInfo.cs
index 48ac478..2e9a028 100644
--- a/Src/VimMac/Properties/AddinInfo.cs
+++ b/Src/VimMac/Properties/AddinInfo.cs
@@ -1,15 +1,15 @@
using System;
using Mono.Addins;
using Mono.Addins.Description;
[assembly: Addin(
"VsVim",
Namespace = "Vim.Mac",
- Version = "2.8.0.14"
+ Version = "2.8.0.15"
)]
[assembly: AddinName("VsVim")]
[assembly: AddinCategory("IDE extensions")]
[assembly: AddinUrl("https://github.com/VsVim/VsVim")]
[assembly: AddinDescription("VIM emulation layer for Visual Studio")]
[assembly: AddinAuthor("Jared Parsons")]
diff --git a/Src/VimMac/RelativeLineNumbers/CocoaExtensions.cs b/Src/VimMac/RelativeLineNumbers/CocoaExtensions.cs
index 8368e6e..e8e6129 100644
--- a/Src/VimMac/RelativeLineNumbers/CocoaExtensions.cs
+++ b/Src/VimMac/RelativeLineNumbers/CocoaExtensions.cs
@@ -1,124 +1,125 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
using System;
using System.Linq;
using System.Windows;
using System.Windows.Media;
using AppKit;
using CoreAnimation;
using CoreGraphics;
using CoreText;
using Foundation;
+using ObjCRuntime;
namespace Vim.UI.Cocoa.Implementation.RelativeLineNumbers
{
public static class CocoaExtensions
{
public static double WidthIncludingTrailingWhitespace(this CTLine line)
=> line.GetBounds(0).Width;
//Before "optimising" this to `new CGColor(color.R / 255f, color.G / 255f, color.B / 255f, color.A / 255f);`
//notice that doesn't handle colorspace correctly
public static CGColor AsCGColor(this Color color)
=> NSColor.FromRgba(color.R, color.G, color.B, color.A).CGColor;
public static bool IsDarkColor(this CGColor color)
{
double red;
double green;
double blue;
var components = color?.Components;
if (components == null || components.Length == 0)
return false;
if (components.Length >= 3)
{
red = components[0];
green = components[1];
blue = components[2];
}
else
{
red = green = blue = components[0];
}
// https://www.w3.org/WAI/ER/WD-AERT/#color-contrast
var brightness = (red * 255 * 299 + green * 255 * 587 + blue * 255 * 114) / 1000;
return brightness <= 155;
}
public static bool IsMouseOver(this NSView view)
{
var mousePoint = NSEvent.CurrentMouseLocation;
return IsMouseOver(view, mousePoint);
}
public static bool IsMouseOver(this NSView view, CGPoint mousePoint)
{
var window = view.Window;
if (window == null)
{
return false;
}
var viewScreenRect = window.ConvertRectToScreen(
view.ConvertRectToView(view.Frame, null));
return viewScreenRect.Contains(mousePoint);
}
public static Rect AsRect(this CGRect rect)
{
return new Rect(rect.X, rect.Y, rect.Width, rect.Height);
}
public static CGPoint AsCGPoint(this Point point)
{
return new CGPoint(point.X, point.Y);
}
public static Point PointToScreen(this NSView view, Point point)
{
var p = view.ConvertPointToView(new CGPoint(point.X, point.Y), null);
if (view.Window == null)
return new Point(p.X, p.Y);
p = view.Window.ConvertPointToScreen(p);
return new Point(p.X, p.Y);
}
public static CGPoint PointToScreen(this NSView view, CGPoint point)
{
var p = view.ConvertPointToView(point, null);
if (view.Window == null)
return p;
p = view.Window.ConvertPointToScreen(p);
return p;
}
private static readonly NSDictionary disableAnimations = new NSDictionary(
"actions", NSNull.Null,
"contents", NSNull.Null,
"hidden", NSNull.Null,
"onLayout", NSNull.Null,
"onOrderIn", NSNull.Null,
"onOrderOut", NSNull.Null,
"position", NSNull.Null,
"sublayers", NSNull.Null,
"transform", NSNull.Null,
"bounds", NSNull.Null);
public static void DisableImplicitAnimations(this CALayer layer)
=> layer.Actions = disableAnimations;
}
}
namespace CoreGraphics
{
internal static class CoreGraphicsExtensions
{
public static CGSize InflateToIntegral(this CGSize size)
=> new CGSize(NMath.Ceiling(size.Width), NMath.Ceiling(size.Height));
}
}
diff --git a/Src/VimMac/RelativeLineNumbers/CocoaLineNumberMarginDrawingVisual.cs b/Src/VimMac/RelativeLineNumbers/CocoaLineNumberMarginDrawingVisual.cs
index 4daf52b..a1a9746 100644
--- a/Src/VimMac/RelativeLineNumbers/CocoaLineNumberMarginDrawingVisual.cs
+++ b/Src/VimMac/RelativeLineNumbers/CocoaLineNumberMarginDrawingVisual.cs
@@ -1,94 +1,95 @@
using System;
using System.Globalization;
using AppKit;
using CoreAnimation;
using CoreGraphics;
using CoreText;
using Foundation;
+using ObjCRuntime;
using Vim.UI.Wpf.Implementation.RelativeLineNumbers;
namespace Vim.UI.Cocoa.Implementation.RelativeLineNumbers
{
internal sealed class CocoaLineNumberMarginDrawingVisual : CALayer, ICALayerDelegate
{
private NSStringAttributes stringAttributes;
private CGRect lineBounds;
private nfloat lineAscent;
private CTLine ctLine;
public int LineNumber { get; private set; }
public int DisplayNumber { get; private set; }
public bool InUse
{
get => !Hidden;
set => Hidden = !value;
}
public CocoaLineNumberMarginDrawingVisual()
{
Delegate = this;
NeedsDisplayOnBoundsChange = true;
this.DisableImplicitAnimations();
}
internal void Update(
NSStringAttributes stringAttributes,
Line line,
nfloat lineWidth)
{
// NOTE: keep this in sync with CocoaRenderedLineVisual regarding any font
// metric handling, transforms, etc. Ensure that line numbers are always
// exactly aligned with the actual editor text lines. Test with Fluent
// Calibri and many other fonts at various sizes.
if (DisplayNumber != line.DisplayNumber || this.stringAttributes != stringAttributes)
{
DisplayNumber = line.DisplayNumber;
this.stringAttributes = stringAttributes;
ctLine?.Dispose();
ctLine = new CTLine(new NSAttributedString(
line.DisplayNumber.ToString(CultureInfo.CurrentUICulture.NumberFormat),
stringAttributes));
lineBounds = ctLine.GetBounds(0);
ctLine.GetTypographicBounds(out lineAscent, out _, out _);
SetNeedsDisplay();
}
AffineTransform = new CGAffineTransform(
1, 0,
0, 1,
0, (nfloat)line.TextTop);
var transformRect = AffineTransform.TransformRect(new CGRect(
line.IsCaretLine ? 0 : lineWidth - lineBounds.Width, // right justify
line.Baseline - lineAscent,
lineBounds.Width,
lineBounds.Height));
Frame = new CGRect(
NMath.Floor(transformRect.X),
NMath.Floor(transformRect.Y),
NMath.Ceiling(transformRect.Width),
NMath.Ceiling(transformRect.Height));
}
[Export("drawLayer:inContext:")]
private void Draw(CALayer _, CGContext context)
{
if (ctLine == null)
return;
CocoaTextManager.ConfigureContext(context);
context.TextPosition = new CGPoint(0, -lineAscent);
context.ScaleCTM(1, -1);
ctLine.Draw(context);
}
}
}
diff --git a/Src/VimMac/VimMac.csproj b/Src/VimMac/VimMac.csproj
index 4e6a2ba..3eb6701 100644
--- a/Src/VimMac/VimMac.csproj
+++ b/Src/VimMac/VimMac.csproj
@@ -1,44 +1,39 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<RootNamespace>Vim.Mac</RootNamespace>
<AssemblyName>Vim.Mac</AssemblyName>
- <TargetFramework>net472</TargetFramework>
+ <TargetFramework>net6.0</TargetFramework>
<DefineConstants>$(DefineConstants);VS_SPECIFIC_MAC</DefineConstants>
</PropertyGroup>
<ItemGroup>
<AddinReference Include="MonoDevelop.TextEditor.Cocoa" />
</ItemGroup>
- <ItemGroup>
- <Reference Include="System.ComponentModel.Composition" />
- </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\VimCore\VimCore.fsproj" />
- </ItemGroup>
- <ItemGroup>
- <PackageReference Include="MonoDevelop.Addins" Version="0.4.7" />
+ <PackageReference Include="Microsoft.VisualStudioMac.Sdk" Version="17.0.0" />
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
<Folder Include="Resources\" />
<Folder Include="FPFExtensions\" />
<Folder Include="InlineRename\" />
<Folder Include="RelativeLineNumbers\" />
<Folder Include="RelativeLineNumbers\Util\" />
</ItemGroup>
<ItemGroup>
<None Remove="Resources\beep.wav" />
<None Remove="Resources\KeyBindingSchemeVim.xml" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\beep.wav" />
<EmbeddedResource Include="Resources\KeyBindingSchemeVim.xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\VimWpf\Implementation\Misc\ClipboardDevice.cs">
<Link>ClipboardDevice.cs</Link>
</Compile>
</ItemGroup>
</Project>
diff --git a/nuget.config b/nuget.config
index f3a6fd3..ef1aeb7 100644
--- a/nuget.config
+++ b/nuget.config
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<clear />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="vssdk" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json" />
+ <add key="vsmacsdk" value="https://devdiv.pkgs.visualstudio.com/DevDiv/_packaging/VSMac/nuget/v3/index.json" />
</packageSources>
</configuration>
|
VsVim/VsVim
|
e5c469b34b73656bad6acf308d0c02ae510fe28f
|
Add base directory to search path for csx/csxe (#2945)
|
diff --git a/Src/VsVimShared/Implementation/CSharpScript/CSharpScriptExecutor.cs b/Src/VsVimShared/Implementation/CSharpScript/CSharpScriptExecutor.cs
index b2d07b9..46f84cf 100644
--- a/Src/VsVimShared/Implementation/CSharpScript/CSharpScriptExecutor.cs
+++ b/Src/VsVimShared/Implementation/CSharpScript/CSharpScriptExecutor.cs
@@ -1,119 +1,120 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.Composition;
using System.IO;
using System.Reflection;
using System.Threading.Tasks;
using Vim.Interpreter;
namespace Vim.VisualStudio.Implementation.CSharpScript
{
using Microsoft.CodeAnalysis.CSharp.Scripting;
using Microsoft.CodeAnalysis.Scripting;
using CSharpScript = Microsoft.CodeAnalysis.CSharp.Scripting.CSharpScript;
[Export(typeof(ICSharpScriptExecutor))]
internal sealed partial class CSharpScriptExecutor : ICSharpScriptExecutor
{
private const string ScriptFolder = "vsvimscripts";
private Dictionary<string, Script<object>> _scripts = new Dictionary<string, Script<object>>(StringComparer.OrdinalIgnoreCase);
private ScriptOptions _scriptOptions = null;
[ImportingConstructor]
public CSharpScriptExecutor()
{
}
private async Task ExecuteAsync(IVimBuffer vimBuffer, CallInfo callInfo, bool createEachTime)
{
try
{
Script<object> script;
if (!TryGetScript(vimBuffer, callInfo.Name, createEachTime, out script))
return;
var globals = new CSharpScriptGlobals(callInfo, vimBuffer);
var scriptState = await script.RunAsync(globals);
}
catch (CompilationErrorException ex)
{
if (_scripts.ContainsKey(callInfo.Name))
_scripts.Remove(callInfo.Name);
vimBuffer.VimBufferData.StatusUtil.OnError(string.Join(Environment.NewLine, ex.Diagnostics));
}
catch (Exception ex)
{
vimBuffer.VimBufferData.StatusUtil.OnError(ex.Message);
}
}
private static ScriptOptions GetScriptOptions(string scriptPath)
{
var ssr = ScriptSourceResolver.Default.WithBaseDirectory(scriptPath);
var baseDirectory = AppDomain.CurrentDomain.BaseDirectory;
var searchPaths = new string[]
{
+ baseDirectory,
Path.Combine(baseDirectory, "PublicAssemblies"),
Path.Combine(baseDirectory, "PrivateAssemblies"),
Path.Combine(baseDirectory, @"CommonExtensions\Microsoft\Editor"),
Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)
};
var smr = ScriptMetadataResolver.Default
.WithBaseDirectory(scriptPath)
.WithSearchPaths(searchPaths);
var asm = new Assembly[]
{
typeof(Vim.IVim).Assembly, // VimCore.dll
typeof(Vim.VisualStudio.Extensions).Assembly // Vim.VisualStudio.Shared.dll
};
var so = ScriptOptions.Default
.WithSourceResolver(ssr)
.WithMetadataResolver(smr)
.WithReferences(asm);
return so;
}
private bool TryGetScript(IVimBuffer vimBuffer, string scriptName, bool createEachTime, out Script<object> script)
{
if (!createEachTime && _scripts.TryGetValue(scriptName, out script))
return true;
string scriptPath = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
scriptPath = Path.Combine(scriptPath, ScriptFolder);
string scriptFilePath = Path.Combine(scriptPath, $"{scriptName}.csx");
if (!File.Exists(scriptFilePath))
{
vimBuffer.VimBufferData.StatusUtil.OnError("script file not found.");
script = null;
return false;
}
if (_scriptOptions == null)
_scriptOptions = GetScriptOptions(scriptPath);
script = CSharpScript.Create(File.ReadAllText(scriptFilePath), _scriptOptions, typeof(CSharpScriptGlobals));
_scripts[scriptName] = script;
return true;
}
#region ICSharpScriptExecutor
void ICSharpScriptExecutor.Execute(IVimBuffer vimBuffer, CallInfo callInfo, bool createEachTime)
{
var task = ExecuteAsync(vimBuffer, callInfo, createEachTime);
VimTrace.TraceInfo("CSharptScript:Execute {0}", callInfo.Name);
}
#endregion
}
}
|
VsVim/VsVim
|
c13fea4e61e4e14a80d4c340472a12b8665001bc
|
Use config directory in Deploy (#2944)
|
diff --git a/Scripts/Build.ps1 b/Scripts/Build.ps1
index 4395848..2f74940 100644
--- a/Scripts/Build.ps1
+++ b/Scripts/Build.ps1
@@ -1,349 +1,349 @@
param (
# Actions
[switch]$build = $false,
[switch]$test = $false,
[switch]$testExtra = $false,
[switch]$updateVsixVersion = $false,
[switch]$uploadVsix = $false,
[switch]$help = $false,
# Settings
[switch]$ci = $false,
[string]$config = "Debug",
[parameter(ValueFromRemainingArguments=$true)][string[]]$properties)
Set-StrictMode -version 2.0
$ErrorActionPreference="Stop"
[string]$rootDir = Split-Path -parent $MyInvocation.MyCommand.Definition
[string]$rootDir = Resolve-Path (Join-Path $rootDir "..")
[string]$binariesDir = Join-Path $rootDir "Binaries"
[string]$configDir = Join-Path $binariesDir $config
-[string]$deployDir = Join-Path $binariesDir "Deploy"
+[string]$deployDir = Join-Path (Join-Path $binariesDir "Deploy") $config
[string]$logsDir = Join-Path $binariesDir "Logs"
[string]$toolsDir = Join-Path $rootDir "Tools"
[string[]]$vsVersions = @("2017", "2019", "2022")
function Print-Usage() {
Write-Host "Actions:"
Write-Host " -build Build VsVim"
Write-Host " -test Run unit tests"
Write-Host " -testExtra Run extra verification"
Write-Host " -updateVsixVersion Update the VSIX manifest version"
Write-Host " -uploadVsix Upload the VSIX to the Open Gallery"
Write-Host ""
Write-Host "Settings:"
Write-Host " -ci True when running in CI"
Write-Host " -config <value> Build configuration: 'Debug' or 'Release'"
}
# Toggle between human readable messages and Azure Pipelines messages based on
# our current environment.
# https://docs.microsoft.com/en-us/azure/devops/pipelines/scripts/logging-commands?view=azure-devops&tabs=powershell
function Write-TaskError([string]$message) {
if ($ci) {
Write-Host "##vso[task.logissue type=error]$message"
}
else {
Write-Host $message
}
}
# Meant to mimic the OpenVsix Gallery script for changing the VSIX version based
# on the Azure DevOps build environment
function Update-VsixVersion() {
if ($env:BUILD_BUILDID -eq $null) {
throw "The environment variable %BUILD_BUILDID% is not set"
}
Write-Host "Updating VSIX version to include $($env:BUILD_BUILDID)"
foreach ($vsVersion in $vsVersions) {
Write-Host "Updating $vsVersion"
$vsixManifest = Join-Path $rootDir "Src/VsVim$($vsVersion)/source.extension.vsixmanifest"
[xml]$vsixXml = Get-Content $vsixManifest
$ns = New-Object System.Xml.XmlNamespaceManager $vsixXml.NameTable
$ns.AddNamespace("ns", $vsixXml.DocumentElement.NamespaceURI) | Out-Null
$attrVersion = $vsixXml.SelectSingleNode("//ns:Identity", $ns).Attributes["Version"]
[Version]$version = $attrVersion.Value
$version = New-Object Version ([int]$version.Major),([int]$version.Minor),$env:BUILD_BUILDID
$attrVersion.InnerText = $version
$vsixXml.Save($vsixManifest) | Out-Null
}
}
# Meant to mimic the OpenVsix Gallery script for uploading the VSIX
function Upload-Vsix() {
if ($env:BUILD_BUILDID -eq $null) {
throw "This is only meant to run in Azure DevOps"
}
Write-Host "Uploading VSIX to the Open Gallery"
foreach ($vsVersion in $vsVersions) {
Write-Host "Uploading $vsVersion"
$vsixFile = Join-Path $deployDir $vsVersion
$vsixFile = Join-Path $vsixFile "VsVim.vsix"
$vsixUploadEndpoint = "http://vsixgallery.com/api/upload"
$repoUrl = "https://github.com/VsVim/VsVim/"
[Reflection.Assembly]::LoadWithPartialName("System.Web") | Out-Null
$repo = [System.Web.HttpUtility]::UrlEncode($repoUrl)
$issueTracker = [System.Web.HttpUtility]::UrlEncode(($repoUrl + "issues/"))
[string]$url = ($vsixUploadEndpoint + "?repo=" + $repo + "&issuetracker=" + $issueTracker)
[byte[]]$bytes = [System.IO.File]::ReadAllBytes($vsixFile)
try {
$response = Invoke-WebRequest $url -Method Post -Body $bytes -UseBasicParsing
'OK' | Write-Host -ForegroundColor Green
}
catch{
'FAIL' | Write-TaskError
$_.Exception.Response.Headers["x-error"] | Write-TaskError
}
}
}
function Get-PackagesDir() {
$d = $null
if ($env:NUGET_PACKAGES -ne $null) {
$d = $env:NUGET_PACKAGES
}
else {
$d = Join-Path $env:UserProfile ".nuget\packages\"
}
Create-Directory $d
return $d
}
function Get-MSBuildPath() {
$vsWhere = Join-Path $toolsDir "vswhere.exe"
$vsInfo = Exec-Command $vsWhere "-latest -format json -requires Microsoft.Component.MSBuild" | Out-String | ConvertFrom-Json
# use first matching instance
$vsInfo = $vsInfo[0]
$vsInstallDir = $vsInfo.installationPath
$vsMajorVersion = $vsInfo.installationVersion.Split('.')[0]
$msbuildVersionDir = if ([int]$vsMajorVersion -lt 16) { "$vsMajorVersion.0" } else { "Current" }
return Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin\msbuild.exe"
}
# Test the contents of the Vsix to make sure it has all of the appropriate
# files
function Test-VsixContents() {
Write-Host "Verifying the Vsix Contents"
foreach ($vsVersion in $vsVersions) {
Write-Host "`tVerifying $vsVersion"
$vsixPath = Join-Path $deployDir $vsVersion
$vsixPath = Join-Path $vsixPath "VsVim.vsix"
if (-not (Test-Path $vsixPath)) {
throw "Vsix doesn't exist"
}
$expectedFiles = @(
"Colors.pkgdef",
"extension.vsixmanifest",
"License.txt",
"Vim.Core.dll",
"VsVim.dll",
"VsVim.pkgdef",
"VsVim_large.png",
"VsVim_small.png",
"VsVim_full.pdf",
"catalog.json",
"manifest.json",
"[Content_Types].xml")
# Make a folder to hold the foundFiles
$target = Join-Path ([IO.Path]::GetTempPath()) ([IO.Path]::GetRandomFileName())
Create-Directory $target
$zipUtil = Join-Path $rootDir "Tools\7za920\7za.exe"
Exec-Command $zipUtil "x -o$target $vsixPath" | Out-Null
$foundFiles = Get-ChildItem $target | %{ $_.Name }
if ($foundFiles.Count -ne $expectedFiles.Count) {
Write-TaskError "Found $($foundFiles.Count) but expected $($expectedFiles.Count)"
Write-TaskError "Wrong number of foundFiles in VSIX."
Write-TaskError "Extra foundFiles"
foreach ($file in $foundFiles) {
if (-not $expectedFiles.Contains($file)) {
Write-TaskError "`t$file"
}
}
Write-Host "Missing foundFiles"
foreach ($file in $expectedFiles) {
if (-not $foundFiles.Contains($file)) {
Write-TaskError "`t$file"
}
}
Write-TaskError "Location: $target"
}
}
foreach ($item in $expectedFiles) {
# Look for dummy foundFiles that made it into the VSIX instead of the
# actual DLL
$itemPath = Join-Path $target $item
if ($item.EndsWith("dll") -and ((get-item $itemPath).Length -lt 5kb)) {
throw "Small file detected $item in the zip file ($target)"
}
}
}
# Make sure that the version number is the same in all locations.
function Test-Version() {
Write-Host "Testing Version Numbers"
$version = $null;
foreach ($line in Get-Content "Src\VimCore\Constants.fs") {
if ($line -match 'let VersionNumber = "([\d.]*)"') {
$version = $matches[1]
break
}
}
if ($version -eq $null) {
throw "Couldn't determine the version from Constants.fs"
}
$foundPackageVersion = $false
foreach ($line in Get-Content "Src\VsVimShared\VsVimPackage.cs") {
if ($line -match 'productId: VimConstants.VersionNumber') {
$foundPackageVersion = $true
break
}
}
if (-not $foundPackageVersion) {
throw "Could not verify the version of VsVimPackage.cs"
}
foreach ($vsVersion in $vsVersions) {
$data = [xml](Get-Content "Src\VsVim$($vsVersion)\source.extension.vsixmanifest")
$manifestVersion = $data.PackageManifest.Metadata.Identity.Version
if ($manifestVersion -ne $version) {
throw "The version $version doesn't match up with the manifest version of $manifestVersion"
}
}
}
function Test-UnitTests() {
Write-Host "Running unit tests"
foreach ($vsVersion in $vsVersions) {
Write-Host "Running $vsVersion"
$resultsDir = Join-Path $binariesDir "xunitResults"
Create-Directory $resultsDir
$all = @(
"VimCoreTest$($vsVersion)\net472\Vim.Core.$($vsVersion).UnitTest.dll",
"VsVimTest$($vsVersion)\net472\Vim.VisualStudio.Shared.$($vsVersion).UnitTest.dll")
$xunit = Join-Path (Get-PackagesDir) "xunit.runner.console\2.4.1\tools\net472\xunit.console.x86.exe"
$anyFailed = $false
foreach ($filePath in $all) {
$filePath = Join-Path $configDir $filePath
$fileName = [IO.Path]::GetFileNameWithoutExtension($filePath)
$logFilePath = Join-Path $resultsDir "$($fileName).xml"
$arg = "$filePath -xml $logFilePath"
try {
Exec-Console $xunit $arg
}
catch {
$anyFailed = $true
}
}
}
if ($anyFailed) {
throw "Unit tests failed"
}
}
function Build-Solution(){
$msbuild = Get-MSBuildPath
Write-Host "Using MSBuild from $msbuild"
Write-Host "Building VsVim"
$binlogFilePath = Join-Path $logsDir "msbuild.binlog"
$args = "/nologo /restore /v:m /m /bl:$binlogFilePath /p:Configuration=$config VsVim.sln"
if ($ci) {
$args += " /p:DeployExtension=false"
}
Exec-Console $msbuild $args
Write-Host "Cleaning Vsix"
Create-Directory $deployDir
Push-Location $deployDir
try {
Remove-Item -re -fo "$deployDir\*"
foreach ($vsVersion in $vsVersions) {
Write-Host "`tCleaning $vsVersion"
$vsVersionDir = Join-Path $deployDir $vsVersion
Create-Directory $vsVersionDir
Set-Location $vsVersionDir
$sourcePath = Join-Path $configDir "VsVim$($vsVersion)\net472\VsVim.vsix"
Copy-Item $sourcePath "VsVim.orig.vsix"
Copy-Item $sourcePath "VsVim.vsix"
# Due to the way we build the VSIX there are many files included that we don't actually
# want to deploy. Here we will clear out those files and rebuild the VSIX without
# them
$cleanUtil = Join-Path $configDir "CleanVsix\net472\CleanVsix.exe"
Exec-Console $cleanUtil (Join-Path $vsVersionDir "VsVim.vsix")
Copy-Item "VsVim.vsix" "VsVim.zip"
Set-Location ..
}
}
finally {
Pop-Location
}
}
Push-Location $rootDir
try {
. "Scripts\Common-Utils.ps1"
if ($help -or ($properties -ne $null)) {
Print-Usage
exit 0
}
if ($updateVsixVersion) {
Update-VsixVersion
}
if ($build) {
Build-Solution
}
if ($test) {
Test-UnitTests
}
if ($testExtra) {
Test-VsixContents
Test-Version
}
if ($uploadVsix) {
Upload-Vsix
}
}
catch {
Write-TaskError "Error: $($_.Exception.Message)"
Write-TaskError $_.ScriptStackTrace
exit 1
}
finally {
Pop-Location
}
diff --git a/Src/VimCore/Constants.fs b/Src/VimCore/Constants.fs
index f834139..4b094ee 100644
--- a/Src/VimCore/Constants.fs
+++ b/Src/VimCore/Constants.fs
@@ -1,47 +1,47 @@
#light
namespace Vim
module VimConstants =
/// Content type which Vim hosts should create an IVimBuffer for
[<Literal>]
let ContentType = "text"
/// The decision of the content types on which an IVimBuffer should be created is a decision
/// which is left up to the host. The core Vim services such as tagging need to apply to any
/// situation in which an IVimBuffer is created. Hence they must apply to the most general
/// content type which is "any". The value "text" is insufficient in those circumstances because
/// it won't apply to projection buffers
[<Literal>]
let AnyContentType = "any"
[<Literal>]
let DefaultHistoryLength = 20
/// The default text width that FormatTextLines will use if the 'textwidth'
/// setting is zero (see vim ':help gq')
[<Literal>]
let DefaultFormatTextWidth = 79
[<Literal>]
let IncrementalSearchTagName = "vsvim_incrementalsearch"
[<Literal>]
let HighlightIncrementalSearchTagName = "vsvim_highlightsearch"
/// <summary>
/// Name of the main Key Processor
/// </summary>
[<Literal>]
let MainKeyProcessorName = "VsVim";
#if DEBUG
[<Literal>]
let VersionNumber = "2.10.99.99 Debug"
#else
[<Literal>]
- let VersionNumber = "2.10.0.4"
+ let VersionNumber = "2.10.0.5"
#endif
diff --git a/Src/VsVim2017/source.extension.vsixmanifest b/Src/VsVim2017/source.extension.vsixmanifest
index c7484a9..2a69fdb 100644
--- a/Src/VsVim2017/source.extension.vsixmanifest
+++ b/Src/VsVim2017/source.extension.vsixmanifest
@@ -1,28 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
<Metadata>
- <Identity Publisher="Jared Parsons" Version="2.10.0.4" Id="VsVim.Microsoft.ce6b18b9-bd0d-4da0-a312-250beeacdb54" Language="en-US" />
+ <Identity Publisher="Jared Parsons" Version="2.10.0.5" Id="VsVim.Microsoft.ce6b18b9-bd0d-4da0-a312-250beeacdb54" Language="en-US" />
<DisplayName>VsVim 2017</DisplayName>
<Description>VIM emulation layer for Visual Studio</Description>
<MoreInfo>https://github.com/VsVim/VsVim</MoreInfo>
<License>License.txt</License>
<Icon>VsVim_large.png</Icon>
<PreviewImage>VsVim_small.png</PreviewImage>
<Tags>vsvim</Tags>
</Metadata>
<Installation>
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[15.0,16.0)" />
<InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.IntegratedShell" />
<InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.Pro" />
<InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.Enterprise" />
</Installation>
<Assets>
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="VimCore" Path="|VimCore|" />
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="File" Path="Colors.pkgdef" />
</Assets>
<Prerequisites>
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
</Prerequisites>
</PackageManifest>
diff --git a/Src/VsVim2019/source.extension.vsixmanifest b/Src/VsVim2019/source.extension.vsixmanifest
index 3543e20..1cde633 100644
--- a/Src/VsVim2019/source.extension.vsixmanifest
+++ b/Src/VsVim2019/source.extension.vsixmanifest
@@ -1,28 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
<Metadata>
- <Identity Publisher="Jared Parsons" Version="2.10.0.4" Id="VsVim.Microsoft.e214908b-0458-4ae2-a583-4310f29687c3" Language="en-US" />
+ <Identity Publisher="Jared Parsons" Version="2.10.0.5" Id="VsVim.Microsoft.e214908b-0458-4ae2-a583-4310f29687c3" Language="en-US" />
<DisplayName>VsVim</DisplayName>
<Description>VIM emulation layer for Visual Studio</Description>
<MoreInfo>https://github.com/VsVim/VsVim</MoreInfo>
<License>License.txt</License>
<Icon>VsVim_large.png</Icon>
<PreviewImage>VsVim_small.png</PreviewImage>
<Tags>vsvim</Tags>
</Metadata>
<Installation>
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[16.0,17.0)" />
<InstallationTarget Version="[16.0,17.0)" Id="Microsoft.VisualStudio.IntegratedShell" />
<InstallationTarget Version="[16.0,17.0)" Id="Microsoft.VisualStudio.Pro" />
<InstallationTarget Version="[16.0,17.0)" Id="Microsoft.VisualStudio.Enterprise" />
</Installation>
<Assets>
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="VimCore" Path="|VimCore|" />
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="File" Path="Colors.pkgdef" />
</Assets>
<Prerequisites>
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[16.0,17.0)" DisplayName="Visual Studio core editor" />
</Prerequisites>
</PackageManifest>
diff --git a/Src/VsVim2022/source.extension.vsixmanifest b/Src/VsVim2022/source.extension.vsixmanifest
index 1bc768d..94e6e23 100644
--- a/Src/VsVim2022/source.extension.vsixmanifest
+++ b/Src/VsVim2022/source.extension.vsixmanifest
@@ -1,37 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
<Metadata>
<!-- DEV17_TODO -->
- <Identity Publisher="Jared Parsons" Version="2.10.0.4" Id="VsVim.Microsoft.e97cd707-324b-4e35-a669-eef8dae4b8cf" Language="en-US" />
+ <Identity Publisher="Jared Parsons" Version="2.10.0.5" Id="VsVim.Microsoft.e97cd707-324b-4e35-a669-eef8dae4b8cf" Language="en-US" />
<DisplayName>VsVim 2022</DisplayName>
<Description>VIM emulation layer for Visual Studio</Description>
<MoreInfo>https://github.com/VsVim/VsVim</MoreInfo>
<License>License.txt</License>
<Icon>VsVim_large.png</Icon>
<PreviewImage>VsVim_small.png</PreviewImage>
<Tags>vsvim</Tags>
</Metadata>
<Installation>
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0,18.0)">
<ProductArchitecture>amd64</ProductArchitecture>
</InstallationTarget>
<InstallationTarget Version="[17.0,18.0)" Id="Microsoft.VisualStudio.IntegratedShell">
<ProductArchitecture>amd64</ProductArchitecture>
</InstallationTarget>
<InstallationTarget Version="[17.0,18.0)" Id="Microsoft.VisualStudio.Pro">
<ProductArchitecture>amd64</ProductArchitecture>
</InstallationTarget>
<InstallationTarget Version="[17.0,18.0)" Id="Microsoft.VisualStudio.Enterprise">
<ProductArchitecture>amd64</ProductArchitecture>
</InstallationTarget>
</Installation>
<Assets>
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="VimCore" Path="|VimCore|" />
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="File" Path="Colors.pkgdef" />
</Assets>
<Prerequisites>
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[17.0,18.0)" DisplayName="Visual Studio core editor" />
</Prerequisites>
</PackageManifest>
|
VsVim/VsVim
|
6b9e65babfc285bd9a75443cf048b29d66c77733
|
Move to a flat shared project structure (#2943)
|
diff --git a/References/Vs2017/Vs2017.Build.targets b/References/Vs2017/Vs2017.Build.targets
index c73c8c3..d34d2ae 100644
--- a/References/Vs2017/Vs2017.Build.targets
+++ b/References/Vs2017/Vs2017.Build.targets
@@ -1,68 +1,66 @@
<Project>
- <Import Project="$(MSBuildThisFileDirectory)..\..\Src\VimEditorHost\VimEditorHost.projitems" Label="Shared" Condition="'$(VsVimProjectType)' == 'EditorHost'" />
-
<PropertyGroup>
<DefineConstants>$(DefineConstants);VS_SPECIFIC_2017</DefineConstants>
<DefineConstants Condition="'$(VsVimProjectType)' == 'EditorHost'">$(DefineConstants);VIM_SPECIFIC_TEST_HOST</DefineConstants>
</PropertyGroup>
<ItemGroup>
<!--
By using the 2.10.0.0 versions here this essentially limits VsVim to the 15.10 release. That is probably
okay as earlier versions of 15 are not commonly used (to my understanding). But if it became an issue could
do the work to get these down to 2.0.0.0
-->
<Reference Include="Microsoft.CodeAnalysis" Version="2.10.0.0" />
<Reference Include="Microsoft.CodeAnalysis.CSharp" Version="2.10.0.0" />
<Reference Include="Microsoft.CodeAnalysis.Scripting" Version="2.10.0.0" />
<Reference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="2.10.0.0" />
<Reference Include="Microsoft.VisualStudio.Text.Data, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.Text.Logic, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.Text.UI, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.Text.UI.Wpf, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.CoreUtility, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.ComponentModelHost, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.Editor, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.Threading, Version=15.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.Language.Intellisense, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.Language.NavigateTo.Interfaces, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.Language.StandardClassification, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="envdte, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="EnvDTE80, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.VisualStudio.Shell.15.0, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.Shell.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.VisualStudio.Shell.Interop.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.Shell.Interop.11.0, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.Shell.Interop.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.VisualStudio.TextManager.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.VisualStudio.TextManager.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.VisualStudio.TextManager.Interop.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="System.Collections.Immutable, Version=1.2.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
</ItemGroup>
<ItemGroup Condition="'$(VsVimProjectType)' == 'EditorHost'">
<Reference Include="Microsoft.VisualStudio.Setup.Configuration.Interop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.VisualStudio.TextManager.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.VisualStudio.Text.Internal, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.Platform.VSEditor, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.Platform.VSEditor.Interop, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.Validation, Version=15.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.Telemetry, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" />
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL" />
<None Include="$(MSBuildThisFileDirectory)App.config">
<Link>app.config</Link>
</None>
</ItemGroup>
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VsVimProjectType)' == 'Vsix' AND '$(VSToolsPath)' != ''" />
</Project>
diff --git a/References/Vs2019/Vs2019.Build.targets b/References/Vs2019/Vs2019.Build.targets
index 116745a..57aca74 100644
--- a/References/Vs2019/Vs2019.Build.targets
+++ b/References/Vs2019/Vs2019.Build.targets
@@ -1,38 +1,36 @@
<Project>
- <Import Project="$(MSBuildThisFileDirectory)..\..\Src\VimEditorHost\VimEditorHost.projitems" Label="Shared" Condition="'$(VsVimProjectType)' == 'EditorHost'" />
-
<PropertyGroup>
<DefineConstants>$(DefineConstants);VS_SPECIFIC_2019</DefineConstants>
<DefineConstants Condition="'$(VsVimProjectType)' == 'EditorHost'">$(DefineConstants);VIM_SPECIFIC_TEST_HOST</DefineConstants>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.VisualStudio.Sdk" Version="16.0.206" />
<PackageReference Include="Microsoft.VisualStudio.Sdk.EmbedInteropTypes" Version="15.0.36" ExcludeAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.0.0" />
<PackageReference Include="Microsoft.VisualStudio.TextManager.Interop.10.0" Version="16.7.30328.74" />
<!--
These are private assemblies and not typically considered as a part of the official VS SDK. But
they are needed for some of the window / tab management code hence are used here -->
<Reference Include="Microsoft.VisualStudio.Platform.WindowManagement, Version=16.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.Shell.ViewManager, Version=16.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.Diagnostics.Assert, Version=16.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
</ItemGroup>
<ItemGroup Condition="'$(VsVimProjectType)' == 'EditorHost'">
<Reference Include="Microsoft.VisualStudio.Setup.Configuration.Interop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.VisualStudio.Platform.VSEditor, Version=16.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.Text.Internal, Version=16.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.TextManager.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<None Include="$(MSBuildThisFileDirectory)App.config">
<Link>app.config</Link>
</None>
</ItemGroup>
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VsVimProjectType)' == 'Vsix' AND '$(VSToolsPath)' != ''" />
</Project>
diff --git a/References/Vs2022/Vs2022.Build.targets b/References/Vs2022/Vs2022.Build.targets
index d635595..09e1d73 100644
--- a/References/Vs2022/Vs2022.Build.targets
+++ b/References/Vs2022/Vs2022.Build.targets
@@ -1,35 +1,33 @@
<Project>
- <Import Project="$(MSBuildThisFileDirectory)..\..\Src\VimEditorHost\VimEditorHost.projitems" Label="Shared" Condition="'$(VsVimProjectType)' == 'EditorHost'" />
-
<PropertyGroup>
<DefineConstants>$(DefineConstants);VS_SPECIFIC_2022</DefineConstants>
<DefineConstants Condition="'$(VsVimProjectType)' == 'EditorHost'">$(DefineConstants);VIM_SPECIFIC_TEST_HOST</DefineConstants>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.VisualStudio.Sdk" Version="17.0.31902.203" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.0.0-1.final" />
<!--
These are private assemblies and not typically considered as a part of the official VS SDK. But
they are needed for some of the window / tab management code hence are used here -->
<Reference Include="Microsoft.VisualStudio.Platform.WindowManagement, Version=17.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.Shell.ViewManager, Version=17.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.Diagnostics.Assert, Version=17.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
</ItemGroup>
<ItemGroup Condition="'$(VsVimProjectType)' == 'EditorHost'">
<Reference Include="Microsoft.VisualStudio.Setup.Configuration.Interop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.VisualStudio.Platform.VSEditor, Version=17.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.Text.Internal, Version=17.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<None Include="$(MSBuildThisFileDirectory)App.config">
<Link>app.config</Link>
</None>
</ItemGroup>
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VsVimProjectType)' == 'Vsix' AND '$(VSToolsPath)' != ''" />
</Project>
diff --git a/Src/VimApp/VimApp.csproj b/Src/VimApp/VimApp.csproj
index 9c6fd7a..ea0fe5d 100644
--- a/Src/VimApp/VimApp.csproj
+++ b/Src/VimApp/VimApp.csproj
@@ -1,41 +1,42 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>VimApp</RootNamespace>
<AssemblyName>VimApp</AssemblyName>
<TargetFramework>net472</TargetFramework>
<DefineConstants>$(DefineConstants);VS_SPECIFIC_VIM_APP</DefineConstants>
<VsVimVisualStudioTargetVersion>17.0</VsVimVisualStudioTargetVersion>
<VsVimProjectType>EditorHost</VsVimProjectType>
<!-- Enabling tracked by https://github.com/VsVim/VsVim/issues/2904 -->
<RunAnalyzers>false</RunAnalyzers>
</PropertyGroup>
<ItemGroup>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Core" />
<Reference Include="System.Xaml" />
<Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup>
<ApplicationDefinition Include="App.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</ApplicationDefinition>
<Page Include="MainWindow.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\VimCore\VimCore.fsproj" />
<ProjectReference Include="..\VimTestUtils\VimTestUtils.csproj" />
<Reference Include="Microsoft.VisualStudio.Setup.Configuration.Interop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
</ItemGroup>
<Import Project="..\VimWpf\VimWpf.projitems" Label="Shared" />
+ <Import Project="..\VimEditorHost\VimEditorHost.projitems" Label="Shared" />
</Project>
diff --git a/Test/VimCoreTest2017/VimCoreTest2017.csproj b/Test/VimCoreTest2017/VimCoreTest2017.csproj
index f9ae372..d6f53ba 100644
--- a/Test/VimCoreTest2017/VimCoreTest2017.csproj
+++ b/Test/VimCoreTest2017/VimCoreTest2017.csproj
@@ -1,42 +1,43 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<PlatformTarget>x86</PlatformTarget>
<OutputType>Library</OutputType>
<RootNamespace>Vim.UnitTest</RootNamespace>
<AssemblyName>Vim.Core.2017.UnitTest</AssemblyName>
<TargetFramework>net472</TargetFramework>
<VsVimProjectType>EditorHost</VsVimProjectType>
<VsVimVisualStudioTargetVersion>15.0</VsVimVisualStudioTargetVersion>
<DefineConstants>$(DefineConstants);VS_UNIT_TEST_HOST</DefineConstants>
<!-- Enabling tracked by https://github.com/VsVim/VsVim/issues/2904 -->
<RunAnalyzers>false</RunAnalyzers>
</PropertyGroup>
<ItemGroup>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Core" />
<Reference Include="System.Data" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Xaml" />
<Reference Include="System.Xml" />
<Reference Include="WindowsBase" />
<Reference Include="Microsoft.VisualStudio.Setup.Configuration.Interop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.VisualStudio.TextManager.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<PackageReference Include="Castle.Core" Version="4.0.0-beta002" />
<PackageReference Include="Moq" Version="4.5.28" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="xunit.runner.console" Version="2.4.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Src\VimCore\VimCore.fsproj" />
<ProjectReference Include="..\..\Src\VimTestUtils\VimTestUtils.csproj" />
</ItemGroup>
<Import Project="..\..\Src\VimWpf\VimWpf.projitems" Label="Shared" />
+ <Import Project="..\..\Src\VimEditorHost\VimEditorHost.projitems" Label="Shared" />
<Import Project="..\VimCoreTest\VimCoreTest.projitems" Label="Shared" />
</Project>
diff --git a/Test/VimCoreTest2019/VimCoreTest2019.csproj b/Test/VimCoreTest2019/VimCoreTest2019.csproj
index 553cd59..a93d172 100644
--- a/Test/VimCoreTest2019/VimCoreTest2019.csproj
+++ b/Test/VimCoreTest2019/VimCoreTest2019.csproj
@@ -1,42 +1,43 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<PlatformTarget>x86</PlatformTarget>
<OutputType>Library</OutputType>
<RootNamespace>Vim.UnitTest</RootNamespace>
<AssemblyName>Vim.Core.2019.UnitTest</AssemblyName>
<TargetFramework>net472</TargetFramework>
<VsVimProjectType>EditorHost</VsVimProjectType>
<VsVimVisualStudioTargetVersion>16.0</VsVimVisualStudioTargetVersion>
<DefineConstants>$(DefineConstants);VS_UNIT_TEST_HOST</DefineConstants>
<!-- Enabling tracked by https://github.com/VsVim/VsVim/issues/2904 -->
<RunAnalyzers>false</RunAnalyzers>
</PropertyGroup>
<ItemGroup>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Core" />
<Reference Include="System.Data" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Xaml" />
<Reference Include="System.Xml" />
<Reference Include="WindowsBase" />
<Reference Include="Microsoft.VisualStudio.Setup.Configuration.Interop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.VisualStudio.TextManager.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<PackageReference Include="Castle.Core" Version="4.0.0-beta002" />
<PackageReference Include="Moq" Version="4.5.28" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="xunit.runner.console" Version="2.4.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Src\VimCore\VimCore.fsproj" />
<ProjectReference Include="..\..\Src\VimTestUtils\VimTestUtils.csproj" />
</ItemGroup>
<Import Project="..\..\Src\VimWpf\VimWpf.projitems" Label="Shared" />
+ <Import Project="..\..\Src\VimEditorHost\VimEditorHost.projitems" Label="Shared" />
<Import Project="..\VimCoreTest\VimCoreTest.projitems" Label="Shared" />
</Project>
diff --git a/Test/VimCoreTest2022/VimCoreTest2022.csproj b/Test/VimCoreTest2022/VimCoreTest2022.csproj
index 40218ec..82e7992 100644
--- a/Test/VimCoreTest2022/VimCoreTest2022.csproj
+++ b/Test/VimCoreTest2022/VimCoreTest2022.csproj
@@ -1,40 +1,41 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<RootNamespace>Vim.UnitTest</RootNamespace>
<AssemblyName>Vim.Core.2022.UnitTest</AssemblyName>
<TargetFramework>net472</TargetFramework>
<VsVimProjectType>EditorHost</VsVimProjectType>
<VsVimVisualStudioTargetVersion>17.0</VsVimVisualStudioTargetVersion>
<DefineConstants>$(DefineConstants);VS_UNIT_TEST_HOST</DefineConstants>
<!-- Enabling tracked by https://github.com/VsVim/VsVim/issues/2904 -->
<RunAnalyzers>false</RunAnalyzers>
</PropertyGroup>
<ItemGroup>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Core" />
<Reference Include="System.Data" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Xaml" />
<Reference Include="System.Xml" />
<Reference Include="WindowsBase" />
<Reference Include="Microsoft.VisualStudio.Setup.Configuration.Interop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<PackageReference Include="Castle.Core" Version="4.0.0-beta002" />
<PackageReference Include="Moq" Version="4.5.28" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="xunit.runner.console" Version="2.4.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Src\VimCore\VimCore.fsproj" />
<ProjectReference Include="..\..\Src\VimTestUtils\VimTestUtils.csproj" />
</ItemGroup>
<Import Project="..\..\Src\VimWpf\VimWpf.projitems" Label="Shared" />
+ <Import Project="..\..\Src\VimEditorHost\VimEditorHost.projitems" Label="Shared" />
<Import Project="..\VimCoreTest\VimCoreTest.projitems" Label="Shared" />
</Project>
diff --git a/Test/VsVimTest2017/VsVimTest2017.csproj b/Test/VsVimTest2017/VsVimTest2017.csproj
index 6ee3202..73abb14 100644
--- a/Test/VsVimTest2017/VsVimTest2017.csproj
+++ b/Test/VsVimTest2017/VsVimTest2017.csproj
@@ -1,38 +1,39 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<PlatformTarget>x86</PlatformTarget>
<OutputType>Library</OutputType>
<RootNamespace>Vim.VisualStudio.UnitTest</RootNamespace>
<AssemblyName>Vim.VisualStudio.Shared.2017.UnitTest</AssemblyName>
<TargetFramework>net472</TargetFramework>
<VsVimVisualStudioTargetVersion>15.0</VsVimVisualStudioTargetVersion>
<VsVimProjectType>EditorHost</VsVimProjectType>
<DefineConstants>$(DefineConstants);VS_UNIT_TEST_HOST</DefineConstants>
<!-- Enabling tracked by https://github.com/VsVim/VsVim/issues/2904 -->
<RunAnalyzers>false</RunAnalyzers>
</PropertyGroup>
<ItemGroup>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Core" />
<Reference Include="System.Data" />
<Reference Include="System.Xaml" />
<Reference Include="System.Xml" />
<Reference Include="WindowsBase" />
<PackageReference Include="Castle.Core" Version="4.0.0-beta002" />
<PackageReference Include="Moq" Version="4.5.28" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="xunit.runner.console" Version="2.4.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Src\VimCore\VimCore.fsproj" />
<ProjectReference Include="..\..\Src\VimTestUtils\VimTestUtils.csproj" />
<ProjectReference Include="..\..\Src\VsVim2017\VsVim2017.csproj" />
</ItemGroup>
+ <Import Project="..\..\Src\VimEditorHost\VimEditorHost.projitems" Label="Shared" />
<Import Project="..\VsVimSharedTest\VsVimSharedTest.projitems" Label="Shared" />
<Import Project="..\VimWpfTest\VimWpfTest.projitems" Label="Shared" />
</Project>
diff --git a/Test/VsVimTest2019/VsVimTest2019.csproj b/Test/VsVimTest2019/VsVimTest2019.csproj
index 5585554..c5d4904 100644
--- a/Test/VsVimTest2019/VsVimTest2019.csproj
+++ b/Test/VsVimTest2019/VsVimTest2019.csproj
@@ -1,41 +1,42 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<PlatformTarget>x86</PlatformTarget>
<OutputType>Library</OutputType>
<RootNamespace>Vim.VisualStudio.UnitTest</RootNamespace>
<AssemblyName>Vim.VisualStudio.Shared.2019.UnitTest</AssemblyName>
<TargetFramework>net472</TargetFramework>
<VsVimVisualStudioTargetVersion>16.0</VsVimVisualStudioTargetVersion>
<VsVimProjectType>EditorHost</VsVimProjectType>
<DefineConstants>$(DefineConstants);VS_UNIT_TEST_HOST</DefineConstants>
<!-- Enabling tracked by https://github.com/VsVim/VsVim/issues/2904 -->
<RunAnalyzers>false</RunAnalyzers>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.VisualStudio.Setup.Configuration.Interop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Core" />
<Reference Include="System.Data" />
<Reference Include="System.Xaml" />
<Reference Include="System.Xml" />
<Reference Include="WindowsBase" />
<PackageReference Include="Castle.Core" Version="4.0.0-beta002" />
<PackageReference Include="Moq" Version="4.5.28" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="xunit.runner.console" Version="2.4.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Src\VimCore\VimCore.fsproj" />
<ProjectReference Include="..\..\Src\VimTestUtils\VimTestUtils.csproj" />
<ProjectReference Include="..\..\Src\VsVim2019\VsVim2019.csproj" />
</ItemGroup>
+ <Import Project="..\..\Src\VimEditorHost\VimEditorHost.projitems" Label="Shared" />
<Import Project="..\VsVimSharedTest\VsVimSharedTest.projitems" Label="Shared" />
<Import Project="..\VimWpfTest\VimWpfTest.projitems" Label="Shared" />
</Project>
diff --git a/Test/VsVimTest2022/VsVimTest2022.csproj b/Test/VsVimTest2022/VsVimTest2022.csproj
index 0526347..a442ffd 100644
--- a/Test/VsVimTest2022/VsVimTest2022.csproj
+++ b/Test/VsVimTest2022/VsVimTest2022.csproj
@@ -1,40 +1,41 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<RootNamespace>Vim.VisualStudio.UnitTest</RootNamespace>
<AssemblyName>Vim.VisualStudio.Shared.2022.UnitTest</AssemblyName>
<TargetFramework>net472</TargetFramework>
<VsVimVisualStudioTargetVersion>17.0</VsVimVisualStudioTargetVersion>
<VsVimProjectType>EditorHost</VsVimProjectType>
<DefineConstants>$(DefineConstants);VS_UNIT_TEST_HOST</DefineConstants>
<!-- Enabling tracked by https://github.com/VsVim/VsVim/issues/2904 -->
<RunAnalyzers>false</RunAnalyzers>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.VisualStudio.Setup.Configuration.Interop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Core" />
<Reference Include="System.Data" />
<Reference Include="System.Xaml" />
<Reference Include="System.Xml" />
<Reference Include="WindowsBase" />
<PackageReference Include="Castle.Core" Version="4.0.0-beta002" />
<PackageReference Include="Moq" Version="4.5.28" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="xunit.runner.console" Version="2.4.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Src\VimCore\VimCore.fsproj" />
<ProjectReference Include="..\..\Src\VimTestUtils\VimTestUtils.csproj" />
<ProjectReference Include="..\..\Src\VsVim2022\VsVim2022.csproj" />
</ItemGroup>
- <Import Project="..\VsVimSharedTest\VsVimSharedTest.projitems" Label="Shared" />
+ <Import Project="..\..\Src\VimEditorHost\VimEditorHost.projitems" Label="Shared" />
+ <Import Project="..\VsVimSharedTest\VsVimSharedTest.projitems" Label="Share" />
<Import Project="..\VimWpfTest\VimWpfTest.projitems" Label="Shared" />
</Project>
diff --git a/VsVim.sln b/VsVim.sln
index 85d529e..fdcb245 100644
--- a/VsVim.sln
+++ b/VsVim.sln
@@ -1,448 +1,454 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.0.31512.422
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7CD56D22-AAAA-4A93-8D98-1A014D9A6D39}"
ProjectSection(SolutionItems) = preProject
appveyor.yml = appveyor.yml
CODE_OF_CONDUCT.md = CODE_OF_CONDUCT.md
CONTRIBUTING.md = CONTRIBUTING.md
Directory.Build.props = Directory.Build.props
Directory.Build.targets = Directory.Build.targets
License.txt = License.txt
README.ch.md = README.ch.md
README.md = README.md
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VimApp", "Src\VimApp\VimApp.csproj", "{8DB1C327-21A1-448B-A7A1-23EEF6BAA785}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CleanVsix", "Src\CleanVsix\CleanVsix.csproj", "{04DA2433-0F43-42C0-AD53-DAA7F1B22E2D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Documentation", "Documentation", "{E112A054-F81F-4775-B456-EA82B71C573A}"
ProjectSection(SolutionItems) = preProject
Documentation\CodingGuidelines.md = Documentation\CodingGuidelines.md
Documentation\CSharp scripting.md = Documentation\CSharp scripting.md
Documentation\Multiple Selections.md = Documentation\Multiple Selections.md
Documentation\older-drops.md = Documentation\older-drops.md
Documentation\Project Goals.md = Documentation\Project Goals.md
Documentation\release-notes.md = Documentation\release-notes.md
Documentation\Supported Features.md = Documentation\Supported Features.md
EndProjectSection
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "VimCore", "Src\VimCore\VimCore.fsproj", "{333D15E0-96F8-4B87-8B03-467220EED275}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VimMac", "Src\VimMac\VimMac.csproj", "{33887119-3C41-4D8B-9A54-14AE8B2212B1}"
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "VsVimShared", "Src\VsVimShared\VsVimShared.shproj", "{6DBED15C-FC2C-46E9-914D-685518573F0D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VsVim2017", "Src\VsVim2017\VsVim2017.csproj", "{2E2A2014-666C-4B22-83F2-4A94102247C6}"
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "VsVimSharedTest", "Test\VsVimSharedTest\VsVimSharedTest.shproj", "{5F7F6C25-D91C-4143-AC7D-DF29A0A831EF}"
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "VimEditorHost", "Src\VimEditorHost\VimEditorHost.shproj", "{5E2E483E-6D89-4C17-B4A6-7153654B06BF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VsVim2019", "Src\VsVim2019\VsVim2019.csproj", "{1AACC1AC-A8C6-4281-A080-91A4A3C5F21D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VsVimTest2017", "Test\VsVimTest2017\VsVimTest2017.csproj", "{E9FB3820-5279-4489-B9C7-6FDBF44F07F2}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VsVimTest2019", "Test\VsVimTest2019\VsVimTest2019.csproj", "{FF0EE51E-BF6D-4A81-A5D3-7EF572F68303}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VimTestUtils", "Src\VimTestUtils\VimTestUtils.csproj", "{AFA7BF34-3687-453F-80A0-46396ACE5E78}"
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "VimWpf", "Src\VimWpf\VimWpf.shproj", "{648972D9-1A17-46D8-80C6-6810C5B8B4AE}"
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "VimWpfTest", "Test\VimWpfTest\VimWpfTest.shproj", "{A24506E5-0602-4472-94D2-FB02772438A6}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VimCoreTest2017", "Test\VimCoreTest2017\VimCoreTest2017.csproj", "{D4E5690F-7D39-4429-8786-D135DAEC7BFE}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VimCoreTest2019", "Test\VimCoreTest2019\VimCoreTest2019.csproj", "{CDC4A709-78AB-4C1F-949E-39870F9657EC}"
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "VimCoreTest", "Test\VimCoreTest\VimCoreTest.shproj", "{1746BB8D-387D-40AB-A9F9-084A7A0676EA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VimCoreTest2022", "Test\VimCoreTest2022\VimCoreTest2022.csproj", "{7882DF47-5DD7-4BC3-B559-0A5C0FF10B6A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VsVim2022", "Src\VsVim2022\VsVim2022.csproj", "{E6552DEF-32C8-407C-9940-52A2CC54E521}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VsVimTest2022", "Test\VsVimTest2022\VsVimTest2022.csproj", "{0751FFC7-8DBA-4DBB-BCF6-AE29F4045B29}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
+ Src\VimEditorHost\VimEditorHost.projitems*{0751ffc7-8dba-4dbb-bcf6-ae29f4045b29}*SharedItemsImports = 5
Test\VimWpfTest\VimWpfTest.projitems*{0751ffc7-8dba-4dbb-bcf6-ae29f4045b29}*SharedItemsImports = 5
- Test\VsVimSharedTest\VsVimSharedTest.projitems*{0751ffc7-8dba-4dbb-bcf6-ae29f4045b29}*SharedItemsImports = 5
Test\VimCoreTest\VimCoreTest.projitems*{1746bb8d-387d-40ab-a9f9-084a7a0676ea}*SharedItemsImports = 13
Src\VimWpf\VimWpf.projitems*{1aacc1ac-a8c6-4281-a080-91a4a3c5f21d}*SharedItemsImports = 5
Src\VsVimShared\VsVimShared.projitems*{1aacc1ac-a8c6-4281-a080-91a4a3c5f21d}*SharedItemsImports = 5
Src\VimWpf\VimWpf.projitems*{2e2a2014-666c-4b22-83f2-4a94102247c6}*SharedItemsImports = 5
Src\VsVimShared\VsVimShared.projitems*{2e2a2014-666c-4b22-83f2-4a94102247c6}*SharedItemsImports = 5
Src\VimEditorHost\VimEditorHost.projitems*{5e2e483e-6d89-4c17-b4a6-7153654b06bf}*SharedItemsImports = 13
Test\VsVimSharedTest\VsVimSharedTest.projitems*{5f7f6c25-d91c-4143-ac7d-df29a0a831ef}*SharedItemsImports = 13
Src\VimWpf\VimWpf.projitems*{648972d9-1a17-46d8-80c6-6810c5b8b4ae}*SharedItemsImports = 13
Src\VsVimShared\VsVimShared.projitems*{6dbed15c-fc2c-46e9-914d-685518573f0d}*SharedItemsImports = 13
+ Src\VimEditorHost\VimEditorHost.projitems*{7882df47-5dd7-4bc3-b559-0a5c0ff10b6a}*SharedItemsImports = 5
Src\VimWpf\VimWpf.projitems*{7882df47-5dd7-4bc3-b559-0a5c0ff10b6a}*SharedItemsImports = 5
Test\VimCoreTest\VimCoreTest.projitems*{7882df47-5dd7-4bc3-b559-0a5c0ff10b6a}*SharedItemsImports = 5
+ Src\VimEditorHost\VimEditorHost.projitems*{8db1c327-21a1-448b-a7a1-23eef6baa785}*SharedItemsImports = 5
Src\VimWpf\VimWpf.projitems*{8db1c327-21a1-448b-a7a1-23eef6baa785}*SharedItemsImports = 5
Test\VimWpfTest\VimWpfTest.projitems*{a24506e5-0602-4472-94d2-fb02772438a6}*SharedItemsImports = 13
+ Src\VimEditorHost\VimEditorHost.projitems*{cdc4a709-78ab-4c1f-949e-39870f9657ec}*SharedItemsImports = 5
Src\VimWpf\VimWpf.projitems*{cdc4a709-78ab-4c1f-949e-39870f9657ec}*SharedItemsImports = 5
Test\VimCoreTest\VimCoreTest.projitems*{cdc4a709-78ab-4c1f-949e-39870f9657ec}*SharedItemsImports = 5
+ Src\VimEditorHost\VimEditorHost.projitems*{d4e5690f-7d39-4429-8786-d135daec7bfe}*SharedItemsImports = 5
Src\VimWpf\VimWpf.projitems*{d4e5690f-7d39-4429-8786-d135daec7bfe}*SharedItemsImports = 5
Test\VimCoreTest\VimCoreTest.projitems*{d4e5690f-7d39-4429-8786-d135daec7bfe}*SharedItemsImports = 5
Src\VimWpf\VimWpf.projitems*{e6552def-32c8-407c-9940-52a2cc54e521}*SharedItemsImports = 5
Src\VsVimShared\VsVimShared.projitems*{e6552def-32c8-407c-9940-52a2cc54e521}*SharedItemsImports = 5
+ Src\VimEditorHost\VimEditorHost.projitems*{e9fb3820-5279-4489-b9c7-6fdbf44f07f2}*SharedItemsImports = 5
Test\VimWpfTest\VimWpfTest.projitems*{e9fb3820-5279-4489-b9c7-6fdbf44f07f2}*SharedItemsImports = 5
Test\VsVimSharedTest\VsVimSharedTest.projitems*{e9fb3820-5279-4489-b9c7-6fdbf44f07f2}*SharedItemsImports = 5
+ Src\VimEditorHost\VimEditorHost.projitems*{ff0ee51e-bf6d-4a81-a5d3-7ef572f68303}*SharedItemsImports = 5
Test\VimWpfTest\VimWpfTest.projitems*{ff0ee51e-bf6d-4a81-a5d3-7ef572f68303}*SharedItemsImports = 5
Test\VsVimSharedTest\VsVimSharedTest.projitems*{ff0ee51e-bf6d-4a81-a5d3-7ef572f68303}*SharedItemsImports = 5
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|Mixed Platforms = Debug|Mixed Platforms
Debug|x86 = Debug|x86
DebugMac|Any CPU = DebugMac|Any CPU
DebugMac|Mixed Platforms = DebugMac|Mixed Platforms
DebugMac|x86 = DebugMac|x86
Release|Any CPU = Release|Any CPU
Release|Mixed Platforms = Release|Mixed Platforms
Release|x86 = Release|x86
ReleaseMac|Any CPU = ReleaseMac|Any CPU
ReleaseMac|Mixed Platforms = ReleaseMac|Mixed Platforms
ReleaseMac|x86 = ReleaseMac|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{8DB1C327-21A1-448B-A7A1-23EEF6BAA785}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8DB1C327-21A1-448B-A7A1-23EEF6BAA785}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8DB1C327-21A1-448B-A7A1-23EEF6BAA785}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{8DB1C327-21A1-448B-A7A1-23EEF6BAA785}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{8DB1C327-21A1-448B-A7A1-23EEF6BAA785}.Debug|x86.ActiveCfg = Debug|Any CPU
{8DB1C327-21A1-448B-A7A1-23EEF6BAA785}.Debug|x86.Build.0 = Debug|Any CPU
{8DB1C327-21A1-448B-A7A1-23EEF6BAA785}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
{8DB1C327-21A1-448B-A7A1-23EEF6BAA785}.DebugMac|Mixed Platforms.ActiveCfg = Debug|Any CPU
{8DB1C327-21A1-448B-A7A1-23EEF6BAA785}.DebugMac|Mixed Platforms.Build.0 = Debug|Any CPU
{8DB1C327-21A1-448B-A7A1-23EEF6BAA785}.DebugMac|x86.ActiveCfg = Debug|Any CPU
{8DB1C327-21A1-448B-A7A1-23EEF6BAA785}.DebugMac|x86.Build.0 = Debug|Any CPU
{8DB1C327-21A1-448B-A7A1-23EEF6BAA785}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8DB1C327-21A1-448B-A7A1-23EEF6BAA785}.Release|Any CPU.Build.0 = Release|Any CPU
{8DB1C327-21A1-448B-A7A1-23EEF6BAA785}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{8DB1C327-21A1-448B-A7A1-23EEF6BAA785}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{8DB1C327-21A1-448B-A7A1-23EEF6BAA785}.Release|x86.ActiveCfg = Release|Any CPU
{8DB1C327-21A1-448B-A7A1-23EEF6BAA785}.Release|x86.Build.0 = Release|Any CPU
{8DB1C327-21A1-448B-A7A1-23EEF6BAA785}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
{8DB1C327-21A1-448B-A7A1-23EEF6BAA785}.ReleaseMac|Mixed Platforms.ActiveCfg = Release|Any CPU
{8DB1C327-21A1-448B-A7A1-23EEF6BAA785}.ReleaseMac|Mixed Platforms.Build.0 = Release|Any CPU
{8DB1C327-21A1-448B-A7A1-23EEF6BAA785}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
{8DB1C327-21A1-448B-A7A1-23EEF6BAA785}.ReleaseMac|x86.Build.0 = Release|Any CPU
{04DA2433-0F43-42C0-AD53-DAA7F1B22E2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{04DA2433-0F43-42C0-AD53-DAA7F1B22E2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{04DA2433-0F43-42C0-AD53-DAA7F1B22E2D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{04DA2433-0F43-42C0-AD53-DAA7F1B22E2D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{04DA2433-0F43-42C0-AD53-DAA7F1B22E2D}.Debug|x86.ActiveCfg = Debug|Any CPU
{04DA2433-0F43-42C0-AD53-DAA7F1B22E2D}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
{04DA2433-0F43-42C0-AD53-DAA7F1B22E2D}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
{04DA2433-0F43-42C0-AD53-DAA7F1B22E2D}.DebugMac|Mixed Platforms.ActiveCfg = Debug|Any CPU
{04DA2433-0F43-42C0-AD53-DAA7F1B22E2D}.DebugMac|Mixed Platforms.Build.0 = Debug|Any CPU
{04DA2433-0F43-42C0-AD53-DAA7F1B22E2D}.DebugMac|x86.ActiveCfg = Debug|Any CPU
{04DA2433-0F43-42C0-AD53-DAA7F1B22E2D}.DebugMac|x86.Build.0 = Debug|Any CPU
{04DA2433-0F43-42C0-AD53-DAA7F1B22E2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{04DA2433-0F43-42C0-AD53-DAA7F1B22E2D}.Release|Any CPU.Build.0 = Release|Any CPU
{04DA2433-0F43-42C0-AD53-DAA7F1B22E2D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{04DA2433-0F43-42C0-AD53-DAA7F1B22E2D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{04DA2433-0F43-42C0-AD53-DAA7F1B22E2D}.Release|x86.ActiveCfg = Release|Any CPU
{04DA2433-0F43-42C0-AD53-DAA7F1B22E2D}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
{04DA2433-0F43-42C0-AD53-DAA7F1B22E2D}.ReleaseMac|Mixed Platforms.ActiveCfg = Release|Any CPU
{04DA2433-0F43-42C0-AD53-DAA7F1B22E2D}.ReleaseMac|Mixed Platforms.Build.0 = Release|Any CPU
{04DA2433-0F43-42C0-AD53-DAA7F1B22E2D}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
{04DA2433-0F43-42C0-AD53-DAA7F1B22E2D}.ReleaseMac|x86.Build.0 = Release|Any CPU
{333D15E0-96F8-4B87-8B03-467220EED275}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{333D15E0-96F8-4B87-8B03-467220EED275}.Debug|Any CPU.Build.0 = Debug|Any CPU
{333D15E0-96F8-4B87-8B03-467220EED275}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{333D15E0-96F8-4B87-8B03-467220EED275}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{333D15E0-96F8-4B87-8B03-467220EED275}.Debug|x86.ActiveCfg = Debug|Any CPU
{333D15E0-96F8-4B87-8B03-467220EED275}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
{333D15E0-96F8-4B87-8B03-467220EED275}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
{333D15E0-96F8-4B87-8B03-467220EED275}.DebugMac|Mixed Platforms.ActiveCfg = Debug|Any CPU
{333D15E0-96F8-4B87-8B03-467220EED275}.DebugMac|Mixed Platforms.Build.0 = Debug|Any CPU
{333D15E0-96F8-4B87-8B03-467220EED275}.DebugMac|x86.ActiveCfg = Debug|Any CPU
{333D15E0-96F8-4B87-8B03-467220EED275}.DebugMac|x86.Build.0 = Debug|Any CPU
{333D15E0-96F8-4B87-8B03-467220EED275}.Release|Any CPU.ActiveCfg = Release|Any CPU
{333D15E0-96F8-4B87-8B03-467220EED275}.Release|Any CPU.Build.0 = Release|Any CPU
{333D15E0-96F8-4B87-8B03-467220EED275}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{333D15E0-96F8-4B87-8B03-467220EED275}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{333D15E0-96F8-4B87-8B03-467220EED275}.Release|x86.ActiveCfg = Release|Any CPU
{333D15E0-96F8-4B87-8B03-467220EED275}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
{333D15E0-96F8-4B87-8B03-467220EED275}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
{333D15E0-96F8-4B87-8B03-467220EED275}.ReleaseMac|Mixed Platforms.ActiveCfg = Release|Any CPU
{333D15E0-96F8-4B87-8B03-467220EED275}.ReleaseMac|Mixed Platforms.Build.0 = Release|Any CPU
{333D15E0-96F8-4B87-8B03-467220EED275}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
{333D15E0-96F8-4B87-8B03-467220EED275}.ReleaseMac|x86.Build.0 = Release|Any CPU
{33887119-3C41-4D8B-9A54-14AE8B2212B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{33887119-3C41-4D8B-9A54-14AE8B2212B1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{33887119-3C41-4D8B-9A54-14AE8B2212B1}.Debug|x86.ActiveCfg = Debug|Any CPU
{33887119-3C41-4D8B-9A54-14AE8B2212B1}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
{33887119-3C41-4D8B-9A54-14AE8B2212B1}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
{33887119-3C41-4D8B-9A54-14AE8B2212B1}.DebugMac|Mixed Platforms.ActiveCfg = Debug|Any CPU
{33887119-3C41-4D8B-9A54-14AE8B2212B1}.DebugMac|Mixed Platforms.Build.0 = Debug|Any CPU
{33887119-3C41-4D8B-9A54-14AE8B2212B1}.DebugMac|x86.ActiveCfg = Debug|Any CPU
{33887119-3C41-4D8B-9A54-14AE8B2212B1}.DebugMac|x86.Build.0 = Debug|Any CPU
{33887119-3C41-4D8B-9A54-14AE8B2212B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{33887119-3C41-4D8B-9A54-14AE8B2212B1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{33887119-3C41-4D8B-9A54-14AE8B2212B1}.Release|x86.ActiveCfg = Release|Any CPU
{33887119-3C41-4D8B-9A54-14AE8B2212B1}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
{33887119-3C41-4D8B-9A54-14AE8B2212B1}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
{33887119-3C41-4D8B-9A54-14AE8B2212B1}.ReleaseMac|Mixed Platforms.ActiveCfg = Release|Any CPU
{33887119-3C41-4D8B-9A54-14AE8B2212B1}.ReleaseMac|Mixed Platforms.Build.0 = Release|Any CPU
{33887119-3C41-4D8B-9A54-14AE8B2212B1}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
{33887119-3C41-4D8B-9A54-14AE8B2212B1}.ReleaseMac|x86.Build.0 = Release|Any CPU
{2E2A2014-666C-4B22-83F2-4A94102247C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2E2A2014-666C-4B22-83F2-4A94102247C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2E2A2014-666C-4B22-83F2-4A94102247C6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{2E2A2014-666C-4B22-83F2-4A94102247C6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{2E2A2014-666C-4B22-83F2-4A94102247C6}.Debug|x86.ActiveCfg = Debug|Any CPU
{2E2A2014-666C-4B22-83F2-4A94102247C6}.Debug|x86.Build.0 = Debug|Any CPU
{2E2A2014-666C-4B22-83F2-4A94102247C6}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
{2E2A2014-666C-4B22-83F2-4A94102247C6}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
{2E2A2014-666C-4B22-83F2-4A94102247C6}.DebugMac|Mixed Platforms.ActiveCfg = Debug|Any CPU
{2E2A2014-666C-4B22-83F2-4A94102247C6}.DebugMac|Mixed Platforms.Build.0 = Debug|Any CPU
{2E2A2014-666C-4B22-83F2-4A94102247C6}.DebugMac|x86.ActiveCfg = Debug|Any CPU
{2E2A2014-666C-4B22-83F2-4A94102247C6}.DebugMac|x86.Build.0 = Debug|Any CPU
{2E2A2014-666C-4B22-83F2-4A94102247C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2E2A2014-666C-4B22-83F2-4A94102247C6}.Release|Any CPU.Build.0 = Release|Any CPU
{2E2A2014-666C-4B22-83F2-4A94102247C6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{2E2A2014-666C-4B22-83F2-4A94102247C6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{2E2A2014-666C-4B22-83F2-4A94102247C6}.Release|x86.ActiveCfg = Release|Any CPU
{2E2A2014-666C-4B22-83F2-4A94102247C6}.Release|x86.Build.0 = Release|Any CPU
{2E2A2014-666C-4B22-83F2-4A94102247C6}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
{2E2A2014-666C-4B22-83F2-4A94102247C6}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
{2E2A2014-666C-4B22-83F2-4A94102247C6}.ReleaseMac|Mixed Platforms.ActiveCfg = Release|Any CPU
{2E2A2014-666C-4B22-83F2-4A94102247C6}.ReleaseMac|Mixed Platforms.Build.0 = Release|Any CPU
{2E2A2014-666C-4B22-83F2-4A94102247C6}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
{2E2A2014-666C-4B22-83F2-4A94102247C6}.ReleaseMac|x86.Build.0 = Release|Any CPU
{1AACC1AC-A8C6-4281-A080-91A4A3C5F21D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1AACC1AC-A8C6-4281-A080-91A4A3C5F21D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1AACC1AC-A8C6-4281-A080-91A4A3C5F21D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{1AACC1AC-A8C6-4281-A080-91A4A3C5F21D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{1AACC1AC-A8C6-4281-A080-91A4A3C5F21D}.Debug|x86.ActiveCfg = Debug|Any CPU
{1AACC1AC-A8C6-4281-A080-91A4A3C5F21D}.Debug|x86.Build.0 = Debug|Any CPU
{1AACC1AC-A8C6-4281-A080-91A4A3C5F21D}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
{1AACC1AC-A8C6-4281-A080-91A4A3C5F21D}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
{1AACC1AC-A8C6-4281-A080-91A4A3C5F21D}.DebugMac|Mixed Platforms.ActiveCfg = Debug|Any CPU
{1AACC1AC-A8C6-4281-A080-91A4A3C5F21D}.DebugMac|Mixed Platforms.Build.0 = Debug|Any CPU
{1AACC1AC-A8C6-4281-A080-91A4A3C5F21D}.DebugMac|x86.ActiveCfg = Debug|Any CPU
{1AACC1AC-A8C6-4281-A080-91A4A3C5F21D}.DebugMac|x86.Build.0 = Debug|Any CPU
{1AACC1AC-A8C6-4281-A080-91A4A3C5F21D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1AACC1AC-A8C6-4281-A080-91A4A3C5F21D}.Release|Any CPU.Build.0 = Release|Any CPU
{1AACC1AC-A8C6-4281-A080-91A4A3C5F21D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{1AACC1AC-A8C6-4281-A080-91A4A3C5F21D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{1AACC1AC-A8C6-4281-A080-91A4A3C5F21D}.Release|x86.ActiveCfg = Release|Any CPU
{1AACC1AC-A8C6-4281-A080-91A4A3C5F21D}.Release|x86.Build.0 = Release|Any CPU
{1AACC1AC-A8C6-4281-A080-91A4A3C5F21D}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
{1AACC1AC-A8C6-4281-A080-91A4A3C5F21D}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
{1AACC1AC-A8C6-4281-A080-91A4A3C5F21D}.ReleaseMac|Mixed Platforms.ActiveCfg = Release|Any CPU
{1AACC1AC-A8C6-4281-A080-91A4A3C5F21D}.ReleaseMac|Mixed Platforms.Build.0 = Release|Any CPU
{1AACC1AC-A8C6-4281-A080-91A4A3C5F21D}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
{1AACC1AC-A8C6-4281-A080-91A4A3C5F21D}.ReleaseMac|x86.Build.0 = Release|Any CPU
{E9FB3820-5279-4489-B9C7-6FDBF44F07F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E9FB3820-5279-4489-B9C7-6FDBF44F07F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E9FB3820-5279-4489-B9C7-6FDBF44F07F2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{E9FB3820-5279-4489-B9C7-6FDBF44F07F2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{E9FB3820-5279-4489-B9C7-6FDBF44F07F2}.Debug|x86.ActiveCfg = Debug|Any CPU
{E9FB3820-5279-4489-B9C7-6FDBF44F07F2}.Debug|x86.Build.0 = Debug|Any CPU
{E9FB3820-5279-4489-B9C7-6FDBF44F07F2}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
{E9FB3820-5279-4489-B9C7-6FDBF44F07F2}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
{E9FB3820-5279-4489-B9C7-6FDBF44F07F2}.DebugMac|Mixed Platforms.ActiveCfg = Debug|Any CPU
{E9FB3820-5279-4489-B9C7-6FDBF44F07F2}.DebugMac|Mixed Platforms.Build.0 = Debug|Any CPU
{E9FB3820-5279-4489-B9C7-6FDBF44F07F2}.DebugMac|x86.ActiveCfg = Debug|Any CPU
{E9FB3820-5279-4489-B9C7-6FDBF44F07F2}.DebugMac|x86.Build.0 = Debug|Any CPU
{E9FB3820-5279-4489-B9C7-6FDBF44F07F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E9FB3820-5279-4489-B9C7-6FDBF44F07F2}.Release|Any CPU.Build.0 = Release|Any CPU
{E9FB3820-5279-4489-B9C7-6FDBF44F07F2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{E9FB3820-5279-4489-B9C7-6FDBF44F07F2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{E9FB3820-5279-4489-B9C7-6FDBF44F07F2}.Release|x86.ActiveCfg = Release|Any CPU
{E9FB3820-5279-4489-B9C7-6FDBF44F07F2}.Release|x86.Build.0 = Release|Any CPU
{E9FB3820-5279-4489-B9C7-6FDBF44F07F2}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
{E9FB3820-5279-4489-B9C7-6FDBF44F07F2}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
{E9FB3820-5279-4489-B9C7-6FDBF44F07F2}.ReleaseMac|Mixed Platforms.ActiveCfg = Release|Any CPU
{E9FB3820-5279-4489-B9C7-6FDBF44F07F2}.ReleaseMac|Mixed Platforms.Build.0 = Release|Any CPU
{E9FB3820-5279-4489-B9C7-6FDBF44F07F2}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
{E9FB3820-5279-4489-B9C7-6FDBF44F07F2}.ReleaseMac|x86.Build.0 = Release|Any CPU
{FF0EE51E-BF6D-4A81-A5D3-7EF572F68303}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FF0EE51E-BF6D-4A81-A5D3-7EF572F68303}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FF0EE51E-BF6D-4A81-A5D3-7EF572F68303}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{FF0EE51E-BF6D-4A81-A5D3-7EF572F68303}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{FF0EE51E-BF6D-4A81-A5D3-7EF572F68303}.Debug|x86.ActiveCfg = Debug|Any CPU
{FF0EE51E-BF6D-4A81-A5D3-7EF572F68303}.Debug|x86.Build.0 = Debug|Any CPU
{FF0EE51E-BF6D-4A81-A5D3-7EF572F68303}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
{FF0EE51E-BF6D-4A81-A5D3-7EF572F68303}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
{FF0EE51E-BF6D-4A81-A5D3-7EF572F68303}.DebugMac|Mixed Platforms.ActiveCfg = Debug|Any CPU
{FF0EE51E-BF6D-4A81-A5D3-7EF572F68303}.DebugMac|Mixed Platforms.Build.0 = Debug|Any CPU
{FF0EE51E-BF6D-4A81-A5D3-7EF572F68303}.DebugMac|x86.ActiveCfg = Debug|Any CPU
{FF0EE51E-BF6D-4A81-A5D3-7EF572F68303}.DebugMac|x86.Build.0 = Debug|Any CPU
{FF0EE51E-BF6D-4A81-A5D3-7EF572F68303}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FF0EE51E-BF6D-4A81-A5D3-7EF572F68303}.Release|Any CPU.Build.0 = Release|Any CPU
{FF0EE51E-BF6D-4A81-A5D3-7EF572F68303}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{FF0EE51E-BF6D-4A81-A5D3-7EF572F68303}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{FF0EE51E-BF6D-4A81-A5D3-7EF572F68303}.Release|x86.ActiveCfg = Release|Any CPU
{FF0EE51E-BF6D-4A81-A5D3-7EF572F68303}.Release|x86.Build.0 = Release|Any CPU
{FF0EE51E-BF6D-4A81-A5D3-7EF572F68303}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
{FF0EE51E-BF6D-4A81-A5D3-7EF572F68303}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
{FF0EE51E-BF6D-4A81-A5D3-7EF572F68303}.ReleaseMac|Mixed Platforms.ActiveCfg = Release|Any CPU
{FF0EE51E-BF6D-4A81-A5D3-7EF572F68303}.ReleaseMac|Mixed Platforms.Build.0 = Release|Any CPU
{FF0EE51E-BF6D-4A81-A5D3-7EF572F68303}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
{FF0EE51E-BF6D-4A81-A5D3-7EF572F68303}.ReleaseMac|x86.Build.0 = Release|Any CPU
{AFA7BF34-3687-453F-80A0-46396ACE5E78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AFA7BF34-3687-453F-80A0-46396ACE5E78}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AFA7BF34-3687-453F-80A0-46396ACE5E78}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{AFA7BF34-3687-453F-80A0-46396ACE5E78}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{AFA7BF34-3687-453F-80A0-46396ACE5E78}.Debug|x86.ActiveCfg = Debug|Any CPU
{AFA7BF34-3687-453F-80A0-46396ACE5E78}.Debug|x86.Build.0 = Debug|Any CPU
{AFA7BF34-3687-453F-80A0-46396ACE5E78}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
{AFA7BF34-3687-453F-80A0-46396ACE5E78}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
{AFA7BF34-3687-453F-80A0-46396ACE5E78}.DebugMac|Mixed Platforms.ActiveCfg = Debug|Any CPU
{AFA7BF34-3687-453F-80A0-46396ACE5E78}.DebugMac|Mixed Platforms.Build.0 = Debug|Any CPU
{AFA7BF34-3687-453F-80A0-46396ACE5E78}.DebugMac|x86.ActiveCfg = Debug|Any CPU
{AFA7BF34-3687-453F-80A0-46396ACE5E78}.DebugMac|x86.Build.0 = Debug|Any CPU
{AFA7BF34-3687-453F-80A0-46396ACE5E78}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AFA7BF34-3687-453F-80A0-46396ACE5E78}.Release|Any CPU.Build.0 = Release|Any CPU
{AFA7BF34-3687-453F-80A0-46396ACE5E78}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{AFA7BF34-3687-453F-80A0-46396ACE5E78}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{AFA7BF34-3687-453F-80A0-46396ACE5E78}.Release|x86.ActiveCfg = Release|Any CPU
{AFA7BF34-3687-453F-80A0-46396ACE5E78}.Release|x86.Build.0 = Release|Any CPU
{AFA7BF34-3687-453F-80A0-46396ACE5E78}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
{AFA7BF34-3687-453F-80A0-46396ACE5E78}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
{AFA7BF34-3687-453F-80A0-46396ACE5E78}.ReleaseMac|Mixed Platforms.ActiveCfg = Release|Any CPU
{AFA7BF34-3687-453F-80A0-46396ACE5E78}.ReleaseMac|Mixed Platforms.Build.0 = Release|Any CPU
{AFA7BF34-3687-453F-80A0-46396ACE5E78}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
{AFA7BF34-3687-453F-80A0-46396ACE5E78}.ReleaseMac|x86.Build.0 = Release|Any CPU
{D4E5690F-7D39-4429-8786-D135DAEC7BFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D4E5690F-7D39-4429-8786-D135DAEC7BFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D4E5690F-7D39-4429-8786-D135DAEC7BFE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{D4E5690F-7D39-4429-8786-D135DAEC7BFE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{D4E5690F-7D39-4429-8786-D135DAEC7BFE}.Debug|x86.ActiveCfg = Debug|Any CPU
{D4E5690F-7D39-4429-8786-D135DAEC7BFE}.Debug|x86.Build.0 = Debug|Any CPU
{D4E5690F-7D39-4429-8786-D135DAEC7BFE}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
{D4E5690F-7D39-4429-8786-D135DAEC7BFE}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
{D4E5690F-7D39-4429-8786-D135DAEC7BFE}.DebugMac|Mixed Platforms.ActiveCfg = Debug|Any CPU
{D4E5690F-7D39-4429-8786-D135DAEC7BFE}.DebugMac|Mixed Platforms.Build.0 = Debug|Any CPU
{D4E5690F-7D39-4429-8786-D135DAEC7BFE}.DebugMac|x86.ActiveCfg = Debug|Any CPU
{D4E5690F-7D39-4429-8786-D135DAEC7BFE}.DebugMac|x86.Build.0 = Debug|Any CPU
{D4E5690F-7D39-4429-8786-D135DAEC7BFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D4E5690F-7D39-4429-8786-D135DAEC7BFE}.Release|Any CPU.Build.0 = Release|Any CPU
{D4E5690F-7D39-4429-8786-D135DAEC7BFE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{D4E5690F-7D39-4429-8786-D135DAEC7BFE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{D4E5690F-7D39-4429-8786-D135DAEC7BFE}.Release|x86.ActiveCfg = Release|Any CPU
{D4E5690F-7D39-4429-8786-D135DAEC7BFE}.Release|x86.Build.0 = Release|Any CPU
{D4E5690F-7D39-4429-8786-D135DAEC7BFE}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
{D4E5690F-7D39-4429-8786-D135DAEC7BFE}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
{D4E5690F-7D39-4429-8786-D135DAEC7BFE}.ReleaseMac|Mixed Platforms.ActiveCfg = Release|Any CPU
{D4E5690F-7D39-4429-8786-D135DAEC7BFE}.ReleaseMac|Mixed Platforms.Build.0 = Release|Any CPU
{D4E5690F-7D39-4429-8786-D135DAEC7BFE}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
{D4E5690F-7D39-4429-8786-D135DAEC7BFE}.ReleaseMac|x86.Build.0 = Release|Any CPU
{CDC4A709-78AB-4C1F-949E-39870F9657EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CDC4A709-78AB-4C1F-949E-39870F9657EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CDC4A709-78AB-4C1F-949E-39870F9657EC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{CDC4A709-78AB-4C1F-949E-39870F9657EC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{CDC4A709-78AB-4C1F-949E-39870F9657EC}.Debug|x86.ActiveCfg = Debug|Any CPU
{CDC4A709-78AB-4C1F-949E-39870F9657EC}.Debug|x86.Build.0 = Debug|Any CPU
{CDC4A709-78AB-4C1F-949E-39870F9657EC}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
{CDC4A709-78AB-4C1F-949E-39870F9657EC}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
{CDC4A709-78AB-4C1F-949E-39870F9657EC}.DebugMac|Mixed Platforms.ActiveCfg = Debug|Any CPU
{CDC4A709-78AB-4C1F-949E-39870F9657EC}.DebugMac|Mixed Platforms.Build.0 = Debug|Any CPU
{CDC4A709-78AB-4C1F-949E-39870F9657EC}.DebugMac|x86.ActiveCfg = Debug|Any CPU
{CDC4A709-78AB-4C1F-949E-39870F9657EC}.DebugMac|x86.Build.0 = Debug|Any CPU
{CDC4A709-78AB-4C1F-949E-39870F9657EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CDC4A709-78AB-4C1F-949E-39870F9657EC}.Release|Any CPU.Build.0 = Release|Any CPU
{CDC4A709-78AB-4C1F-949E-39870F9657EC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{CDC4A709-78AB-4C1F-949E-39870F9657EC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{CDC4A709-78AB-4C1F-949E-39870F9657EC}.Release|x86.ActiveCfg = Release|Any CPU
{CDC4A709-78AB-4C1F-949E-39870F9657EC}.Release|x86.Build.0 = Release|Any CPU
{CDC4A709-78AB-4C1F-949E-39870F9657EC}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
{CDC4A709-78AB-4C1F-949E-39870F9657EC}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
{CDC4A709-78AB-4C1F-949E-39870F9657EC}.ReleaseMac|Mixed Platforms.ActiveCfg = Release|Any CPU
{CDC4A709-78AB-4C1F-949E-39870F9657EC}.ReleaseMac|Mixed Platforms.Build.0 = Release|Any CPU
{CDC4A709-78AB-4C1F-949E-39870F9657EC}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
{CDC4A709-78AB-4C1F-949E-39870F9657EC}.ReleaseMac|x86.Build.0 = Release|Any CPU
{7882DF47-5DD7-4BC3-B559-0A5C0FF10B6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7882DF47-5DD7-4BC3-B559-0A5C0FF10B6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7882DF47-5DD7-4BC3-B559-0A5C0FF10B6A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{7882DF47-5DD7-4BC3-B559-0A5C0FF10B6A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{7882DF47-5DD7-4BC3-B559-0A5C0FF10B6A}.Debug|x86.ActiveCfg = Debug|Any CPU
{7882DF47-5DD7-4BC3-B559-0A5C0FF10B6A}.Debug|x86.Build.0 = Debug|Any CPU
{7882DF47-5DD7-4BC3-B559-0A5C0FF10B6A}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
{7882DF47-5DD7-4BC3-B559-0A5C0FF10B6A}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
{7882DF47-5DD7-4BC3-B559-0A5C0FF10B6A}.DebugMac|Mixed Platforms.ActiveCfg = Debug|Any CPU
{7882DF47-5DD7-4BC3-B559-0A5C0FF10B6A}.DebugMac|Mixed Platforms.Build.0 = Debug|Any CPU
{7882DF47-5DD7-4BC3-B559-0A5C0FF10B6A}.DebugMac|x86.ActiveCfg = Debug|Any CPU
{7882DF47-5DD7-4BC3-B559-0A5C0FF10B6A}.DebugMac|x86.Build.0 = Debug|Any CPU
{7882DF47-5DD7-4BC3-B559-0A5C0FF10B6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7882DF47-5DD7-4BC3-B559-0A5C0FF10B6A}.Release|Any CPU.Build.0 = Release|Any CPU
{7882DF47-5DD7-4BC3-B559-0A5C0FF10B6A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{7882DF47-5DD7-4BC3-B559-0A5C0FF10B6A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{7882DF47-5DD7-4BC3-B559-0A5C0FF10B6A}.Release|x86.ActiveCfg = Release|Any CPU
{7882DF47-5DD7-4BC3-B559-0A5C0FF10B6A}.Release|x86.Build.0 = Release|Any CPU
{7882DF47-5DD7-4BC3-B559-0A5C0FF10B6A}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
{7882DF47-5DD7-4BC3-B559-0A5C0FF10B6A}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
{7882DF47-5DD7-4BC3-B559-0A5C0FF10B6A}.ReleaseMac|Mixed Platforms.ActiveCfg = Release|Any CPU
{7882DF47-5DD7-4BC3-B559-0A5C0FF10B6A}.ReleaseMac|Mixed Platforms.Build.0 = Release|Any CPU
{7882DF47-5DD7-4BC3-B559-0A5C0FF10B6A}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
{7882DF47-5DD7-4BC3-B559-0A5C0FF10B6A}.ReleaseMac|x86.Build.0 = Release|Any CPU
{E6552DEF-32C8-407C-9940-52A2CC54E521}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E6552DEF-32C8-407C-9940-52A2CC54E521}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E6552DEF-32C8-407C-9940-52A2CC54E521}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{E6552DEF-32C8-407C-9940-52A2CC54E521}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{E6552DEF-32C8-407C-9940-52A2CC54E521}.Debug|x86.ActiveCfg = Debug|Any CPU
{E6552DEF-32C8-407C-9940-52A2CC54E521}.Debug|x86.Build.0 = Debug|Any CPU
{E6552DEF-32C8-407C-9940-52A2CC54E521}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
{E6552DEF-32C8-407C-9940-52A2CC54E521}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
{E6552DEF-32C8-407C-9940-52A2CC54E521}.DebugMac|Mixed Platforms.ActiveCfg = Debug|Any CPU
{E6552DEF-32C8-407C-9940-52A2CC54E521}.DebugMac|Mixed Platforms.Build.0 = Debug|Any CPU
{E6552DEF-32C8-407C-9940-52A2CC54E521}.DebugMac|x86.ActiveCfg = Debug|Any CPU
{E6552DEF-32C8-407C-9940-52A2CC54E521}.DebugMac|x86.Build.0 = Debug|Any CPU
{E6552DEF-32C8-407C-9940-52A2CC54E521}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E6552DEF-32C8-407C-9940-52A2CC54E521}.Release|Any CPU.Build.0 = Release|Any CPU
{E6552DEF-32C8-407C-9940-52A2CC54E521}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{E6552DEF-32C8-407C-9940-52A2CC54E521}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{E6552DEF-32C8-407C-9940-52A2CC54E521}.Release|x86.ActiveCfg = Release|Any CPU
{E6552DEF-32C8-407C-9940-52A2CC54E521}.Release|x86.Build.0 = Release|Any CPU
{E6552DEF-32C8-407C-9940-52A2CC54E521}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
{E6552DEF-32C8-407C-9940-52A2CC54E521}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
{E6552DEF-32C8-407C-9940-52A2CC54E521}.ReleaseMac|Mixed Platforms.ActiveCfg = Release|Any CPU
{E6552DEF-32C8-407C-9940-52A2CC54E521}.ReleaseMac|Mixed Platforms.Build.0 = Release|Any CPU
{E6552DEF-32C8-407C-9940-52A2CC54E521}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
{E6552DEF-32C8-407C-9940-52A2CC54E521}.ReleaseMac|x86.Build.0 = Release|Any CPU
{0751FFC7-8DBA-4DBB-BCF6-AE29F4045B29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0751FFC7-8DBA-4DBB-BCF6-AE29F4045B29}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0751FFC7-8DBA-4DBB-BCF6-AE29F4045B29}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{0751FFC7-8DBA-4DBB-BCF6-AE29F4045B29}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{0751FFC7-8DBA-4DBB-BCF6-AE29F4045B29}.Debug|x86.ActiveCfg = Debug|Any CPU
{0751FFC7-8DBA-4DBB-BCF6-AE29F4045B29}.Debug|x86.Build.0 = Debug|Any CPU
{0751FFC7-8DBA-4DBB-BCF6-AE29F4045B29}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
{0751FFC7-8DBA-4DBB-BCF6-AE29F4045B29}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
{0751FFC7-8DBA-4DBB-BCF6-AE29F4045B29}.DebugMac|Mixed Platforms.ActiveCfg = Debug|Any CPU
{0751FFC7-8DBA-4DBB-BCF6-AE29F4045B29}.DebugMac|Mixed Platforms.Build.0 = Debug|Any CPU
{0751FFC7-8DBA-4DBB-BCF6-AE29F4045B29}.DebugMac|x86.ActiveCfg = Debug|Any CPU
{0751FFC7-8DBA-4DBB-BCF6-AE29F4045B29}.DebugMac|x86.Build.0 = Debug|Any CPU
{0751FFC7-8DBA-4DBB-BCF6-AE29F4045B29}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0751FFC7-8DBA-4DBB-BCF6-AE29F4045B29}.Release|Any CPU.Build.0 = Release|Any CPU
{0751FFC7-8DBA-4DBB-BCF6-AE29F4045B29}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{0751FFC7-8DBA-4DBB-BCF6-AE29F4045B29}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{0751FFC7-8DBA-4DBB-BCF6-AE29F4045B29}.Release|x86.ActiveCfg = Release|Any CPU
{0751FFC7-8DBA-4DBB-BCF6-AE29F4045B29}.Release|x86.Build.0 = Release|Any CPU
{0751FFC7-8DBA-4DBB-BCF6-AE29F4045B29}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
{0751FFC7-8DBA-4DBB-BCF6-AE29F4045B29}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
{0751FFC7-8DBA-4DBB-BCF6-AE29F4045B29}.ReleaseMac|Mixed Platforms.ActiveCfg = Release|Any CPU
{0751FFC7-8DBA-4DBB-BCF6-AE29F4045B29}.ReleaseMac|Mixed Platforms.Build.0 = Release|Any CPU
{0751FFC7-8DBA-4DBB-BCF6-AE29F4045B29}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
{0751FFC7-8DBA-4DBB-BCF6-AE29F4045B29}.ReleaseMac|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{E112A054-F81F-4775-B456-EA82B71C573A} = {7CD56D22-AAAA-4A93-8D98-1A014D9A6D39}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {E627ED8F-1A4B-4324-826C-77B96CB9CB83}
EndGlobalSection
GlobalSection(TestCaseManagementSettings) = postSolution
CategoryFile = VsVim.vsmdi
EndGlobalSection
EndGlobal
|
VsVim/VsVim
|
a549ec60e35b1ffdd8dfd1f2d60d1e4b3cd6701e
|
Move to VS2022 RTM Packages (#2940)
|
diff --git a/Directory.Build.props b/Directory.Build.props
index a6a51ce..75f9a72 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,49 +1,49 @@
<Project>
<Import Project="$(MSBuildThisFileDirectory)\Binaries\User.props" Condition="Exists('$(MSBuildThisFileDirectory)\Binaries\User.props')" />
<PropertyGroup>
<RepoPath>$(MSBuildThisFileDirectory)</RepoPath>
<DebugType>full</DebugType>
<BinariesPath>$(RepoPath)Binaries\</BinariesPath>
<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
<OutputPath>$(BinariesPath)$(Configuration)\$(MSBuildProjectName)</OutputPath>
<BaseIntermediateOutputPath>$(BinariesPath)obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
- <MicrosoftVsSdkBuildToolsVersion>17.0.2155-preview2</MicrosoftVsSdkBuildToolsVersion>
+ <MicrosoftVsSdkBuildToolsVersion>17.0.5232</MicrosoftVsSdkBuildToolsVersion>
<!-- Standard Calculation of NuGet package location -->
<NuGetPackageRoot Condition="'$(NuGetPackageRoot)' == ''">$(NUGET_PACKAGES)</NuGetPackageRoot> <!-- Respect environment variable if set -->
<NuGetPackageRoot Condition="'$(NuGetPackageRoot)' == '' AND '$(OS)' == 'Windows_NT'">$(UserProfile)/.nuget/packages/</NuGetPackageRoot>
<NuGetPackageRoot Condition="'$(NuGetPackageRoot)' == '' AND '$(OS)' != 'Windows_NT'">$(HOME)/.nuget/packages/</NuGetPackageRoot>
</PropertyGroup>
<!--
When building WPF projects MSBuild will create a temporary project with an extension of
tmp_proj. In that case the SDK is unable to determine the target language and cannot pick
the correct import. Need to set it explicitly here.
See https://github.com/dotnet/project-system/issues/1467
-->
<PropertyGroup Condition="'$(MSBuildProjectExtension)' == '.tmp_proj'">
<Language>C#</Language>
<LanguageTargets>$(MSBuildToolsPath)\Microsoft.CSharp.targets</LanguageTargets>
</PropertyGroup>
<PropertyGroup>
<ReferencePath>$(ReferencePath);$(MSBuildThisFileDirectory)References\Common</ReferencePath>
<ReferencePath>$(ReferencePath);$(MSBuildThisFileDirectory)References\Vs2017</ReferencePath>
<ReferencePath>$(ReferencePath);$(MSBuildThisFileDirectory)References\Vs2019</ReferencePath>
<ReferencePath>$(ReferencePath);$(MSBuildThisFileDirectory)References\Vs2022</ReferencePath>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildThisFileDirectory)</SolutionDir>
<!-- This controls the places MSBuild will consult to resolve assembly references. This is
kept as minimal as possible to make our build reliable from machine to machine. Global
locations such as GAC, AssemblyFoldersEx, etc ... are deliberately removed from this
list as they will not be the same from machine to machine -->
<AssemblySearchPaths>
{TargetFrameworkDirectory};
{RawFileName};
$(ReferencePath);
</AssemblySearchPaths>
</PropertyGroup>
</Project>
diff --git a/References/Vs2022/Microsoft.VisualStudio.Diagnostics.Assert.dll b/References/Vs2022/Microsoft.VisualStudio.Diagnostics.Assert.dll
index 0741fca..eda463c 100644
Binary files a/References/Vs2022/Microsoft.VisualStudio.Diagnostics.Assert.dll and b/References/Vs2022/Microsoft.VisualStudio.Diagnostics.Assert.dll differ
diff --git a/References/Vs2022/Microsoft.VisualStudio.Platform.VSEditor.dll b/References/Vs2022/Microsoft.VisualStudio.Platform.VSEditor.dll
index c104dd3..ab75dc3 100644
Binary files a/References/Vs2022/Microsoft.VisualStudio.Platform.VSEditor.dll and b/References/Vs2022/Microsoft.VisualStudio.Platform.VSEditor.dll differ
diff --git a/References/Vs2022/Microsoft.VisualStudio.Platform.WindowManagement.dll b/References/Vs2022/Microsoft.VisualStudio.Platform.WindowManagement.dll
index 7ba6da7..4abae98 100644
Binary files a/References/Vs2022/Microsoft.VisualStudio.Platform.WindowManagement.dll and b/References/Vs2022/Microsoft.VisualStudio.Platform.WindowManagement.dll differ
diff --git a/References/Vs2022/Microsoft.VisualStudio.Shell.ViewManager.dll b/References/Vs2022/Microsoft.VisualStudio.Shell.ViewManager.dll
index e3bfade..327bc14 100644
Binary files a/References/Vs2022/Microsoft.VisualStudio.Shell.ViewManager.dll and b/References/Vs2022/Microsoft.VisualStudio.Shell.ViewManager.dll differ
diff --git a/References/Vs2022/Microsoft.VisualStudio.Text.Internal.dll b/References/Vs2022/Microsoft.VisualStudio.Text.Internal.dll
index d729dce..08bdf8f 100644
Binary files a/References/Vs2022/Microsoft.VisualStudio.Text.Internal.dll and b/References/Vs2022/Microsoft.VisualStudio.Text.Internal.dll differ
diff --git a/References/Vs2022/Vs2022.Build.targets b/References/Vs2022/Vs2022.Build.targets
index 30b0d33..d635595 100644
--- a/References/Vs2022/Vs2022.Build.targets
+++ b/References/Vs2022/Vs2022.Build.targets
@@ -1,35 +1,35 @@
<Project>
<Import Project="$(MSBuildThisFileDirectory)..\..\Src\VimEditorHost\VimEditorHost.projitems" Label="Shared" Condition="'$(VsVimProjectType)' == 'EditorHost'" />
<PropertyGroup>
<DefineConstants>$(DefineConstants);VS_SPECIFIC_2022</DefineConstants>
<DefineConstants Condition="'$(VsVimProjectType)' == 'EditorHost'">$(DefineConstants);VIM_SPECIFIC_TEST_HOST</DefineConstants>
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.VisualStudio.Sdk" Version="17.0.31827.390" />
+ <PackageReference Include="Microsoft.VisualStudio.Sdk" Version="17.0.31902.203" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.0.0-1.final" />
<!--
These are private assemblies and not typically considered as a part of the official VS SDK. But
they are needed for some of the window / tab management code hence are used here -->
<Reference Include="Microsoft.VisualStudio.Platform.WindowManagement, Version=17.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.Shell.ViewManager, Version=17.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.Diagnostics.Assert, Version=17.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
</ItemGroup>
<ItemGroup Condition="'$(VsVimProjectType)' == 'EditorHost'">
<Reference Include="Microsoft.VisualStudio.Setup.Configuration.Interop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.VisualStudio.Platform.VSEditor, Version=17.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.Text.Internal, Version=17.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<None Include="$(MSBuildThisFileDirectory)App.config">
<Link>app.config</Link>
</None>
</ItemGroup>
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VsVimProjectType)' == 'Vsix' AND '$(VSToolsPath)' != ''" />
</Project>
diff --git a/References/Vs2022/update.ps1 b/References/Vs2022/update.ps1
index 1fd25d5..bb9cfb5 100644
--- a/References/Vs2022/update.ps1
+++ b/References/Vs2022/update.ps1
@@ -1,12 +1,12 @@
-$src = "C:\Program Files\Microsoft Visual Studio\2022\Public Preview"
+$src = "C:\Program Files\Microsoft Visual Studio\2022\Enterprise"
$all = @(
"Common7\IDE\Microsoft.VisualStudio.Platform.WindowManagement.dll",
"Common7\IDE\Microsoft.VisualStudio.Shell.ViewManager.dll",
"Common7\IDE\PrivateAssemblies\Microsoft.VisualStudio.Diagnostics.Assert.dll",
"Common7\IDE\CommonExtensions\Microsoft\Editor\Microsoft.VisualStudio.Platform.VSEditor.dll",
"Common7\IDE\CommonExtensions\Microsoft\Editor\Microsoft.VisualStudio.Text.Internal.dll"
)
foreach ($item in $all) {
Copy-Item (Join-Path $src $item)
}
\ No newline at end of file
diff --git a/Src/VimCore/Constants.fs b/Src/VimCore/Constants.fs
index 267bdee..f834139 100644
--- a/Src/VimCore/Constants.fs
+++ b/Src/VimCore/Constants.fs
@@ -1,47 +1,47 @@
#light
namespace Vim
module VimConstants =
/// Content type which Vim hosts should create an IVimBuffer for
[<Literal>]
let ContentType = "text"
/// The decision of the content types on which an IVimBuffer should be created is a decision
/// which is left up to the host. The core Vim services such as tagging need to apply to any
/// situation in which an IVimBuffer is created. Hence they must apply to the most general
/// content type which is "any". The value "text" is insufficient in those circumstances because
/// it won't apply to projection buffers
[<Literal>]
let AnyContentType = "any"
[<Literal>]
let DefaultHistoryLength = 20
/// The default text width that FormatTextLines will use if the 'textwidth'
/// setting is zero (see vim ':help gq')
[<Literal>]
let DefaultFormatTextWidth = 79
[<Literal>]
let IncrementalSearchTagName = "vsvim_incrementalsearch"
[<Literal>]
let HighlightIncrementalSearchTagName = "vsvim_highlightsearch"
/// <summary>
/// Name of the main Key Processor
/// </summary>
[<Literal>]
let MainKeyProcessorName = "VsVim";
#if DEBUG
[<Literal>]
let VersionNumber = "2.10.99.99 Debug"
#else
[<Literal>]
- let VersionNumber = "2.10.0.3"
+ let VersionNumber = "2.10.0.4"
#endif
diff --git a/Src/VsVim2017/source.extension.vsixmanifest b/Src/VsVim2017/source.extension.vsixmanifest
index 08a6533..c7484a9 100644
--- a/Src/VsVim2017/source.extension.vsixmanifest
+++ b/Src/VsVim2017/source.extension.vsixmanifest
@@ -1,28 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
<Metadata>
- <Identity Publisher="Jared Parsons" Version="2.10.0.3" Id="VsVim.Microsoft.ce6b18b9-bd0d-4da0-a312-250beeacdb54" Language="en-US" />
+ <Identity Publisher="Jared Parsons" Version="2.10.0.4" Id="VsVim.Microsoft.ce6b18b9-bd0d-4da0-a312-250beeacdb54" Language="en-US" />
<DisplayName>VsVim 2017</DisplayName>
<Description>VIM emulation layer for Visual Studio</Description>
<MoreInfo>https://github.com/VsVim/VsVim</MoreInfo>
<License>License.txt</License>
<Icon>VsVim_large.png</Icon>
<PreviewImage>VsVim_small.png</PreviewImage>
<Tags>vsvim</Tags>
</Metadata>
<Installation>
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[15.0,16.0)" />
<InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.IntegratedShell" />
<InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.Pro" />
<InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.Enterprise" />
</Installation>
<Assets>
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="VimCore" Path="|VimCore|" />
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="File" Path="Colors.pkgdef" />
</Assets>
<Prerequisites>
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
</Prerequisites>
</PackageManifest>
diff --git a/Src/VsVim2019/source.extension.vsixmanifest b/Src/VsVim2019/source.extension.vsixmanifest
index bc6b00f..3543e20 100644
--- a/Src/VsVim2019/source.extension.vsixmanifest
+++ b/Src/VsVim2019/source.extension.vsixmanifest
@@ -1,28 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
<Metadata>
- <Identity Publisher="Jared Parsons" Version="2.10.0.3" Id="VsVim.Microsoft.e214908b-0458-4ae2-a583-4310f29687c3" Language="en-US" />
+ <Identity Publisher="Jared Parsons" Version="2.10.0.4" Id="VsVim.Microsoft.e214908b-0458-4ae2-a583-4310f29687c3" Language="en-US" />
<DisplayName>VsVim</DisplayName>
<Description>VIM emulation layer for Visual Studio</Description>
<MoreInfo>https://github.com/VsVim/VsVim</MoreInfo>
<License>License.txt</License>
<Icon>VsVim_large.png</Icon>
<PreviewImage>VsVim_small.png</PreviewImage>
<Tags>vsvim</Tags>
</Metadata>
<Installation>
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[16.0,17.0)" />
<InstallationTarget Version="[16.0,17.0)" Id="Microsoft.VisualStudio.IntegratedShell" />
<InstallationTarget Version="[16.0,17.0)" Id="Microsoft.VisualStudio.Pro" />
<InstallationTarget Version="[16.0,17.0)" Id="Microsoft.VisualStudio.Enterprise" />
</Installation>
<Assets>
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="VimCore" Path="|VimCore|" />
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="File" Path="Colors.pkgdef" />
</Assets>
<Prerequisites>
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[16.0,17.0)" DisplayName="Visual Studio core editor" />
</Prerequisites>
</PackageManifest>
diff --git a/Src/VsVim2022/source.extension.vsixmanifest b/Src/VsVim2022/source.extension.vsixmanifest
index 5baeb0f..1bc768d 100644
--- a/Src/VsVim2022/source.extension.vsixmanifest
+++ b/Src/VsVim2022/source.extension.vsixmanifest
@@ -1,37 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
<Metadata>
<!-- DEV17_TODO -->
- <Identity Publisher="Jared Parsons" Version="2.10.0.3" Id="VsVim.Microsoft.e97cd707-324b-4e35-a669-eef8dae4b8cf" Language="en-US" />
+ <Identity Publisher="Jared Parsons" Version="2.10.0.4" Id="VsVim.Microsoft.e97cd707-324b-4e35-a669-eef8dae4b8cf" Language="en-US" />
<DisplayName>VsVim 2022</DisplayName>
<Description>VIM emulation layer for Visual Studio</Description>
<MoreInfo>https://github.com/VsVim/VsVim</MoreInfo>
<License>License.txt</License>
<Icon>VsVim_large.png</Icon>
<PreviewImage>VsVim_small.png</PreviewImage>
<Tags>vsvim</Tags>
</Metadata>
<Installation>
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0,18.0)">
<ProductArchitecture>amd64</ProductArchitecture>
</InstallationTarget>
<InstallationTarget Version="[17.0,18.0)" Id="Microsoft.VisualStudio.IntegratedShell">
<ProductArchitecture>amd64</ProductArchitecture>
</InstallationTarget>
<InstallationTarget Version="[17.0,18.0)" Id="Microsoft.VisualStudio.Pro">
<ProductArchitecture>amd64</ProductArchitecture>
</InstallationTarget>
<InstallationTarget Version="[17.0,18.0)" Id="Microsoft.VisualStudio.Enterprise">
<ProductArchitecture>amd64</ProductArchitecture>
</InstallationTarget>
</Installation>
<Assets>
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="VimCore" Path="|VimCore|" />
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="File" Path="Colors.pkgdef" />
</Assets>
<Prerequisites>
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[17.0,18.0)" DisplayName="Visual Studio core editor" />
</Prerequisites>
</PackageManifest>
|
VsVim/VsVim
|
e2a86d0bcea616da3410ace63815b6a36d4f6b45
|
Work around IntelliCode handling Escape
|
diff --git a/Src/VsVimShared/Implementation/IntelliCode/IntelliCodeCommandTarget.cs b/Src/VsVimShared/Implementation/IntelliCode/IntelliCodeCommandTarget.cs
index a9efc4d..9f7e1dc 100644
--- a/Src/VsVimShared/Implementation/IntelliCode/IntelliCodeCommandTarget.cs
+++ b/Src/VsVimShared/Implementation/IntelliCode/IntelliCodeCommandTarget.cs
@@ -1,128 +1,162 @@
#nullable enable
#if VS_SPECIFIC_2019 || VS_SPECIFIC_2022
using System;
using System.Collections.Generic;
using System.Text;
using System.Linq;
using Vim.VisualStudio;
using Microsoft.VisualStudio.Language.Intellisense.AsyncCompletion;
using Vim;
using System.ComponentModel.Composition;
using Microsoft.VisualStudio.Utilities;
using Microsoft.VisualStudio.OLE.Interop;
using Microsoft.VisualStudio.Text.Editor;
using System.Reflection;
using System.Diagnostics;
+using Microsoft.VisualStudio.Text;
namespace Vim.VisualStudio.Implementation.IntelliCode
{
internal sealed class IntelliCodeCommandTarget : ICommandTarget
{
- private object? _cascadingCompletionSource;
- private bool _lookedForCascadingCompletionSource;
+ private (object CascadingCompletionSource, FieldInfo CurrentPrediction, FieldInfo CompletionState)? _data;
+ private bool _lookedForData;
internal IVimBufferCoordinator VimBufferCoordinator { get; }
internal IAsyncCompletionBroker AsyncCompletionBroker { get; }
+ internal ITextDocumentFactoryService TextDocumentFactoryService { get; }
internal IVimBuffer VimBuffer => VimBufferCoordinator.VimBuffer;
internal ITextView TextView => VimBuffer.TextView;
internal object? CascadingCompletionSource
{
get
{
- if (!_lookedForCascadingCompletionSource)
- {
- _lookedForCascadingCompletionSource = true;
- _cascadingCompletionSource = TextView
- .Properties
- .PropertyList
- .Where(pair => pair.Key is Type { Name: "CascadingCompletionSource" })
- .Select(x => x.Value)
- .FirstOrDefault();
- }
-
- return _cascadingCompletionSource;
+ EnsureLookedForData();
+ return _data?.CascadingCompletionSource;
}
}
internal IntelliCodeCommandTarget(
IVimBufferCoordinator vimBufferCoordinator,
- IAsyncCompletionBroker asyncCompletionBroker)
+ IAsyncCompletionBroker asyncCompletionBroker,
+ ITextDocumentFactoryService textDocumentFactoryService)
{
VimBufferCoordinator = vimBufferCoordinator;
AsyncCompletionBroker = asyncCompletionBroker;
+ TextDocumentFactoryService = textDocumentFactoryService;
+ }
+
+ private void EnsureLookedForData()
+ {
+ if (_lookedForData)
+ {
+ return;
+ }
+
+ _lookedForData = true;
+ try
+ {
+ var cascadingCompletionSource = TextView
+ .Properties
+ .PropertyList
+ .Where(pair => pair.Key is Type { Name: "CascadingCompletionSource" })
+ .Select(x => x.Value)
+ .FirstOrDefault();
+ if (cascadingCompletionSource is object)
+ {
+ var type = cascadingCompletionSource.GetType();
+ var currentPrediction = type.GetField("_currentPrediction", BindingFlags.NonPublic | BindingFlags.Instance);
+ var completionState = type.GetField("_completionState", BindingFlags.NonPublic | BindingFlags.Instance);
+ if (currentPrediction is object && completionState is object)
+ {
+ _data = (cascadingCompletionSource, currentPrediction, completionState);
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ VimTrace.TraceInfo($"IntelliCodeCommandTarget::EnsureLookedForData error {ex.Message}");
+ Debug.Assert(false);
+ }
+ }
+
+ private bool IsIntelliCodeHandlingEscape()
+ {
+ EnsureLookedForData();
+ if (_data is { } data)
+ {
+ try
+ {
+ var completionState = data.CompletionState.GetValue(data.CascadingCompletionSource);
+ var currentPrediction = data.CurrentPrediction.GetValue(data.CascadingCompletionSource);
+ return completionState is object || currentPrediction is object;
+ }
+ catch (Exception ex)
+ {
+ VimTrace.TraceInfo($"IntelliCodeCommandTarget::IsIntelliCodeHandlingEscape error {ex.Message}");
+ Debug.Assert(false);
+ }
+ }
+
+ return false;
}
private bool Exec(EditCommand editCommand, out Action? preAction, out Action? postAction)
{
preAction = null;
postAction = null;
return false;
}
private CommandStatus QueryStatus(EditCommand editCommand)
{
if (editCommand.HasKeyInput &&
editCommand.KeyInput == KeyInputUtil.EscapeKey &&
VimBuffer.CanProcess(editCommand.KeyInput) &&
- IsIntelliCodeLineCompletionEnabled())
+ IsIntelliCodeHandlingEscape())
{
+ VimTrace.TraceInfo($"IntelliCodeCommandTarget::QueryStatus handling escape");
VimBuffer.Process(editCommand.KeyInput);
}
return CommandStatus.PassOn;
}
- private bool IsIntelliCodeLineCompletionEnabled()
- {
- if (CascadingCompletionSource is not { } source)
- {
- return false;
- }
-
- try
- {
- var property = source.GetType().GetProperty("ShowGrayText", BindingFlags.NonPublic | BindingFlags.Instance);
- var value = property.GetValue(source, null);
- return value is bool b && b;
- }
- catch (Exception)
- {
- Debug.Assert(false);
- return false;
- }
- }
-
#region ICommandTarget
bool ICommandTarget.Exec(EditCommand editCommand, out Action? preAction, out Action? postAction) =>
Exec(editCommand, out preAction, out postAction);
CommandStatus ICommandTarget.QueryStatus(EditCommand editCommand) =>
QueryStatus(editCommand);
#endregion
}
[Export(typeof(ICommandTargetFactory))]
[Name("IntelliCode Command Target")]
[Order(Before = VsVimConstants.StandardCommandTargetName)]
internal sealed class IntelliCodeCommandTargetFactory : ICommandTargetFactory
{
internal IAsyncCompletionBroker AsyncCompletionBroker { get; }
+ internal ITextDocumentFactoryService TextDocumentFactoryService { get; }
[ImportingConstructor]
- public IntelliCodeCommandTargetFactory(IAsyncCompletionBroker asyncCompletionBroker)
+ public IntelliCodeCommandTargetFactory(
+ IAsyncCompletionBroker asyncCompletionBroker,
+ ITextDocumentFactoryService textDocumentFactoryService)
{
AsyncCompletionBroker = asyncCompletionBroker;
+ TextDocumentFactoryService = textDocumentFactoryService;
}
ICommandTarget ICommandTargetFactory.CreateCommandTarget(IOleCommandTarget nextCommandTarget, IVimBufferCoordinator vimBufferCoordinator) =>
- new IntelliCodeCommandTarget(vimBufferCoordinator, AsyncCompletionBroker);
+ new IntelliCodeCommandTarget(vimBufferCoordinator, AsyncCompletionBroker, TextDocumentFactoryService);
}
}
#elif VS_SPECIFIC_2017
#else
#error Unsupported configurationi
#endif
|
VsVim/VsVim
|
e4e315d35db4cfd710d53ecaebb5dce00ea542a5
|
Increment version numbers
|
diff --git a/Src/VimCore/Constants.fs b/Src/VimCore/Constants.fs
index 5f64c6f..267bdee 100644
--- a/Src/VimCore/Constants.fs
+++ b/Src/VimCore/Constants.fs
@@ -1,47 +1,47 @@
#light
namespace Vim
module VimConstants =
/// Content type which Vim hosts should create an IVimBuffer for
[<Literal>]
let ContentType = "text"
/// The decision of the content types on which an IVimBuffer should be created is a decision
/// which is left up to the host. The core Vim services such as tagging need to apply to any
/// situation in which an IVimBuffer is created. Hence they must apply to the most general
/// content type which is "any". The value "text" is insufficient in those circumstances because
/// it won't apply to projection buffers
[<Literal>]
let AnyContentType = "any"
[<Literal>]
let DefaultHistoryLength = 20
/// The default text width that FormatTextLines will use if the 'textwidth'
/// setting is zero (see vim ':help gq')
[<Literal>]
let DefaultFormatTextWidth = 79
[<Literal>]
let IncrementalSearchTagName = "vsvim_incrementalsearch"
[<Literal>]
let HighlightIncrementalSearchTagName = "vsvim_highlightsearch"
/// <summary>
/// Name of the main Key Processor
/// </summary>
[<Literal>]
let MainKeyProcessorName = "VsVim";
#if DEBUG
[<Literal>]
let VersionNumber = "2.10.99.99 Debug"
#else
[<Literal>]
- let VersionNumber = "2.10.0.2"
+ let VersionNumber = "2.10.0.3"
#endif
diff --git a/Src/VsVim2017/source.extension.vsixmanifest b/Src/VsVim2017/source.extension.vsixmanifest
index 0f52431..08a6533 100644
--- a/Src/VsVim2017/source.extension.vsixmanifest
+++ b/Src/VsVim2017/source.extension.vsixmanifest
@@ -1,28 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
<Metadata>
- <Identity Publisher="Jared Parsons" Version="2.10.0.2" Id="VsVim.Microsoft.ce6b18b9-bd0d-4da0-a312-250beeacdb54" Language="en-US" />
+ <Identity Publisher="Jared Parsons" Version="2.10.0.3" Id="VsVim.Microsoft.ce6b18b9-bd0d-4da0-a312-250beeacdb54" Language="en-US" />
<DisplayName>VsVim 2017</DisplayName>
<Description>VIM emulation layer for Visual Studio</Description>
<MoreInfo>https://github.com/VsVim/VsVim</MoreInfo>
<License>License.txt</License>
<Icon>VsVim_large.png</Icon>
<PreviewImage>VsVim_small.png</PreviewImage>
<Tags>vsvim</Tags>
</Metadata>
<Installation>
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[15.0,16.0)" />
<InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.IntegratedShell" />
<InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.Pro" />
<InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.Enterprise" />
</Installation>
<Assets>
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="VimCore" Path="|VimCore|" />
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="File" Path="Colors.pkgdef" />
</Assets>
<Prerequisites>
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
</Prerequisites>
</PackageManifest>
diff --git a/Src/VsVim2019/source.extension.vsixmanifest b/Src/VsVim2019/source.extension.vsixmanifest
index 0b31994..bc6b00f 100644
--- a/Src/VsVim2019/source.extension.vsixmanifest
+++ b/Src/VsVim2019/source.extension.vsixmanifest
@@ -1,28 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
<Metadata>
- <Identity Publisher="Jared Parsons" Version="2.10.0.2" Id="VsVim.Microsoft.e214908b-0458-4ae2-a583-4310f29687c3" Language="en-US" />
+ <Identity Publisher="Jared Parsons" Version="2.10.0.3" Id="VsVim.Microsoft.e214908b-0458-4ae2-a583-4310f29687c3" Language="en-US" />
<DisplayName>VsVim</DisplayName>
<Description>VIM emulation layer for Visual Studio</Description>
<MoreInfo>https://github.com/VsVim/VsVim</MoreInfo>
<License>License.txt</License>
<Icon>VsVim_large.png</Icon>
<PreviewImage>VsVim_small.png</PreviewImage>
<Tags>vsvim</Tags>
</Metadata>
<Installation>
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[16.0,17.0)" />
<InstallationTarget Version="[16.0,17.0)" Id="Microsoft.VisualStudio.IntegratedShell" />
<InstallationTarget Version="[16.0,17.0)" Id="Microsoft.VisualStudio.Pro" />
<InstallationTarget Version="[16.0,17.0)" Id="Microsoft.VisualStudio.Enterprise" />
</Installation>
<Assets>
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="VimCore" Path="|VimCore|" />
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="File" Path="Colors.pkgdef" />
</Assets>
<Prerequisites>
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[16.0,17.0)" DisplayName="Visual Studio core editor" />
</Prerequisites>
</PackageManifest>
diff --git a/Src/VsVim2022/source.extension.vsixmanifest b/Src/VsVim2022/source.extension.vsixmanifest
index 59e0a95..5baeb0f 100644
--- a/Src/VsVim2022/source.extension.vsixmanifest
+++ b/Src/VsVim2022/source.extension.vsixmanifest
@@ -1,37 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
<Metadata>
<!-- DEV17_TODO -->
- <Identity Publisher="Jared Parsons" Version="2.10.0.2" Id="VsVim.Microsoft.e97cd707-324b-4e35-a669-eef8dae4b8cf" Language="en-US" />
+ <Identity Publisher="Jared Parsons" Version="2.10.0.3" Id="VsVim.Microsoft.e97cd707-324b-4e35-a669-eef8dae4b8cf" Language="en-US" />
<DisplayName>VsVim 2022</DisplayName>
<Description>VIM emulation layer for Visual Studio</Description>
<MoreInfo>https://github.com/VsVim/VsVim</MoreInfo>
<License>License.txt</License>
<Icon>VsVim_large.png</Icon>
<PreviewImage>VsVim_small.png</PreviewImage>
<Tags>vsvim</Tags>
</Metadata>
<Installation>
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0,18.0)">
<ProductArchitecture>amd64</ProductArchitecture>
</InstallationTarget>
<InstallationTarget Version="[17.0,18.0)" Id="Microsoft.VisualStudio.IntegratedShell">
<ProductArchitecture>amd64</ProductArchitecture>
</InstallationTarget>
<InstallationTarget Version="[17.0,18.0)" Id="Microsoft.VisualStudio.Pro">
<ProductArchitecture>amd64</ProductArchitecture>
</InstallationTarget>
<InstallationTarget Version="[17.0,18.0)" Id="Microsoft.VisualStudio.Enterprise">
<ProductArchitecture>amd64</ProductArchitecture>
</InstallationTarget>
</Installation>
<Assets>
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="VimCore" Path="|VimCore|" />
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="File" Path="Colors.pkgdef" />
</Assets>
<Prerequisites>
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[17.0,18.0)" DisplayName="Visual Studio core editor" />
</Prerequisites>
</PackageManifest>
|
VsVim/VsVim
|
06d4ba5a5279b24d4ac8740bc104ef8373250250
|
Fix test failures
|
diff --git a/Src/VimApp/MainWindow.xaml b/Src/VimApp/MainWindow.xaml
index 0f320a7..71151e0 100644
--- a/Src/VimApp/MainWindow.xaml
+++ b/Src/VimApp/MainWindow.xaml
@@ -1,40 +1,41 @@
<Window x:Class="VimApp.MainWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Title="VsVim" Height="350" Width="525">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Menu IsMainMenu="True" Grid.Row="0">
<MenuItem Header="File">
<MenuItem Header="Open" Click="OnOpenClick" />
<MenuItem Header="New Tab" Click="OnNewTabClick" />
</MenuItem>
<MenuItem Header="Custom">
<MenuItem Header="Issue 1074">
<MenuItem Header="Set Scenario" Click="OnLeaderSetClick" />
<MenuItem Header="type ö" Click="OnLeaderTypeClick" />
</MenuItem>
<MenuItem Header="Issue 1479" Click="OnAddUndoSelectionChangeClick" />
<MenuItem Header="Set Scenario" Click="OnLeaderSetClick" />
<MenuItem Header="type ö" Click="OnLeaderTypeClick" />
<MenuItem Header="Insert Control Characters" Click="OnInsertControlCharactersClick" />
+ <MenuItem Header="Run Custom Scenario" Click="OnCustomScenarioClick" />
<MenuItem Header="Run GC" Click="OnRunGarbageCollectorClick" />
</MenuItem>
<MenuItem Header="Options">
<MenuItem Name="_displayNewLinesMenuItem" Header="Display New Lines" IsCheckable="True" IsChecked="False" Checked="OnDisplayNewLinesChecked" Unchecked="OnDisplayNewLinesChecked" />
</MenuItem>
</Menu>
<DockPanel LastChildFill="True" Name="_dockPanel" Grid.Row="1">
<TabControl Name="_tabControl">
</TabControl>
</DockPanel>
</Grid>
</Window>
diff --git a/Src/VimApp/MainWindow.xaml.cs b/Src/VimApp/MainWindow.xaml.cs
index d4392d7..237cc5a 100644
--- a/Src/VimApp/MainWindow.xaml.cs
+++ b/Src/VimApp/MainWindow.xaml.cs
@@ -1,425 +1,451 @@
using System.Collections.Generic;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Media;
using Microsoft.VisualStudio.Text;
using Microsoft.VisualStudio.Text.Editor;
using Microsoft.VisualStudio.Text.Editor.OptionsExtensionMethods;
using System.Diagnostics;
using System.Linq;
using Vim;
using Vim.UI.Wpf;
using Vim.Extensions;
using System.Text;
using System;
using Microsoft.VisualStudio.Text.Classification;
using Microsoft.VisualStudio.Text.Formatting;
using System.Collections.ObjectModel;
using Microsoft.Win32;
using Microsoft.VisualStudio.Utilities;
using IOPath = System.IO.Path;
using Vim.EditorHost;
using Microsoft.VisualStudio.Text.Operations;
namespace VimApp
{
/// <summary>
/// Interaction logic for MainWindow.xaml
/// </summary>
public partial class MainWindow : Window
{
#region SelectAllOnUndoPrimitive
private sealed class SelectAllOnUndoRedoPrimitive : ITextUndoPrimitive
{
private readonly ITextView _textView;
internal SelectAllOnUndoRedoPrimitive(ITextView textView)
{
_textView = textView;
}
private void SelectAll()
{
var textSnapshot = _textView.TextBuffer.CurrentSnapshot;
var span = new SnapshotSpan(textSnapshot, 0, textSnapshot.Length);
_textView.Selection.Select(span, isReversed: false);
}
public bool CanRedo
{
get { return true; }
}
public bool CanUndo
{
get { return true; }
}
public ITextUndoTransaction Parent
{
get;
set;
}
public bool CanMerge(ITextUndoPrimitive older)
{
return false;
}
public ITextUndoPrimitive Merge(ITextUndoPrimitive older)
{
throw new NotImplementedException();
}
public void Do()
{
SelectAll();
}
public void Undo()
{
SelectAll();
}
}
#endregion
private readonly VimComponentHost _vimComponentHost;
private readonly IClassificationFormatMapService _classificationFormatMapService;
private readonly IVimAppOptions _vimAppOptions;
private readonly IVimWindowManager _vimWindowManager;
private readonly VimEditorHost _editorHost;
private readonly IEditorOperationsFactoryService _editorOperationsFactoryService;
private readonly ITextUndoHistoryRegistry _textUndoHistoryRegistry;
internal IVimWindow ActiveVimWindowOpt
{
get
{
var tabItem = (TabItem)_tabControl.SelectedItem;
if (tabItem != null)
{
return _vimWindowManager.GetVimWindow(tabItem);
}
return null;
}
}
internal IVimBuffer ActiveVimBufferOpt
{
get
{
var tabInfo = ActiveVimWindowOpt;
var found = tabInfo.VimViewInfoList.FirstOrDefault(x => x.TextViewHost.TextView.HasAggregateFocus);
return found?.VimBuffer;
}
}
internal TabControl TabControl
{
get { return _tabControl; }
}
public MainWindow()
{
InitializeComponent();
#if DEBUG
VimTrace.TraceSwitch.Level = TraceLevel.Verbose;
#endif
_vimComponentHost = new VimComponentHost();
_editorHost = _vimComponentHost.EditorHost;
_classificationFormatMapService = _vimComponentHost.CompositionContainer.GetExportedValue<IClassificationFormatMapService>();
_vimAppOptions = _vimComponentHost.CompositionContainer.GetExportedValue<IVimAppOptions>();
_vimWindowManager = _vimComponentHost.CompositionContainer.GetExportedValue<IVimWindowManager>();
_editorOperationsFactoryService = _vimComponentHost.CompositionContainer.GetExportedValue<IEditorOperationsFactoryService>();
_textUndoHistoryRegistry = _vimComponentHost.CompositionContainer.GetExportedValue<ITextUndoHistoryRegistry>();
var vimAppHost = _vimComponentHost.CompositionContainer.GetExportedValue<VimAppHost>();
vimAppHost.MainWindow = this;
vimAppHost.VimWindowManager = _vimWindowManager;
_vimWindowManager.VimWindowCreated += OnVimWindowCreated;
// Create the initial view to display
AddNewTab("Empty Doc");
}
protected override void OnClosed(EventArgs e)
{
base.OnClosed(e);
_vimComponentHost.Vim.SaveSessionData();
}
internal IWpfTextView CreateTextView(ITextBuffer textBuffer)
{
return CreateTextView(
textBuffer,
PredefinedTextViewRoles.PrimaryDocument,
PredefinedTextViewRoles.Document,
PredefinedTextViewRoles.Editable,
PredefinedTextViewRoles.Interactive,
PredefinedTextViewRoles.Structured,
PredefinedTextViewRoles.Analyzable);
}
internal IWpfTextView CreateTextView(ITextBuffer textBuffer, params string[] roles)
{
var textViewRoleSet = _vimComponentHost.EditorHost.TextEditorFactoryService.CreateTextViewRoleSet(roles);
var textView = _vimComponentHost.EditorHost.TextEditorFactoryService.CreateTextView(
textBuffer,
textViewRoleSet);
textView.GotAggregateFocus += delegate
{
var hasFocus = textView.HasAggregateFocus;
};
return textView;
}
/// <summary>
/// Create an ITextViewHost instance for the active ITextBuffer
/// </summary>
internal IWpfTextViewHost CreateTextViewHost(IWpfTextView textView)
{
textView.Options.SetOptionValue(DefaultTextViewOptions.UseVisibleWhitespaceId, true);
var textViewHost = _vimComponentHost.EditorHost.TextEditorFactoryService.CreateTextViewHost(textView, setFocus: true);
var classificationFormatMap = _classificationFormatMapService.GetClassificationFormatMap(textViewHost.TextView);
classificationFormatMap.DefaultTextProperties = TextFormattingRunProperties.CreateTextFormattingRunProperties(
new Typeface(Constants.FontFamily, FontStyles.Normal, FontWeights.Normal, FontStretches.Normal),
Constants.FontSize,
Colors.Black);
return textViewHost;
}
internal void AddNewTab(string name)
{
var textBuffer = _vimComponentHost.EditorHost.TextBufferFactoryService.CreateTextBuffer();
var textView = CreateTextView(textBuffer);
AddNewTab(name, textView);
}
internal void AddNewTab(string name, IWpfTextView textView)
{
var textViewHost = CreateTextViewHost(textView);
var tabItem = new TabItem();
var vimWindow = _vimWindowManager.CreateVimWindow(tabItem);
tabItem.Header = name;
tabItem.Content = textViewHost.HostControl;
_tabControl.Items.Add(tabItem);
vimWindow.AddVimViewInfo(textViewHost);
}
private Grid BuildGrid(ReadOnlyCollection<IVimViewInfo> viewInfoList)
{
var grid = BuildGridCore(viewInfoList);
var row = 0;
for (var i = 0; i < viewInfoList.Count; i++)
{
var viewInfo = viewInfoList[i];
var textViewHost = viewInfo.TextViewHost;
var control = textViewHost.HostControl;
control.SetValue(Grid.RowProperty, row++);
control.SetValue(Grid.ColumnProperty, 0);
grid.Children.Add(control);
if (i + 1 < viewInfoList.Count)
{
var splitter = new GridSplitter
{
ResizeDirection = GridResizeDirection.Rows,
HorizontalAlignment = HorizontalAlignment.Stretch,
VerticalAlignment = VerticalAlignment.Stretch,
ShowsPreview = true
};
splitter.SetValue(Grid.RowProperty, row++);
splitter.SetValue(Grid.ColumnProperty, 0);
splitter.Height = 5;
splitter.Background = Brushes.Black;
grid.Children.Add(splitter);
}
}
return grid;
}
/// <summary>
/// Build up the grid to contain the ITextView instances that we are splitting into
/// </summary>
private Grid BuildGridCore(ReadOnlyCollection<IVimViewInfo> viewInfoList)
{
var grid = new Grid();
for (var i = 0; i < viewInfoList.Count; i++)
{
// Build up the row for the host control
var hostRow = new RowDefinition
{
Height = new GridLength(1, GridUnitType.Star)
};
grid.RowDefinitions.Add(hostRow);
// Build up the splitter if this isn't the last control in the list
if (i + 1 < viewInfoList.Count)
{
var splitterRow = new RowDefinition
{
Height = new GridLength(0, GridUnitType.Auto)
};
grid.RowDefinitions.Add(splitterRow);
}
}
return grid;
}
private UIElement CreateWindowContent(IVimWindow vimWindow)
{
var viewInfoList = vimWindow.VimViewInfoList;
if (viewInfoList.Count == 0)
{
var textBlock = new TextBlock
{
Text = "No buffer associated with this window"
};
return textBlock;
}
if (viewInfoList.Count == 1)
{
return viewInfoList[0].TextViewHost.HostControl;
}
return BuildGrid(viewInfoList);
}
private void OnRunGarbageCollectorClick(object sender, EventArgs e)
{
for (var i = 0; i < 15; i++)
{
Dispatcher.DoEvents();
GC.Collect(2, GCCollectionMode.Forced);
GC.WaitForPendingFinalizers();
GC.Collect(2, GCCollectionMode.Forced);
GC.Collect();
}
}
private void OnVimWindowChanged(IVimWindow vimWindow)
{
vimWindow.TabItem.Content = null;
foreach (var vimViewInfo in vimWindow.VimViewInfoList)
{
var textViewHost = vimViewInfo.TextViewHost;
var parent = LogicalTreeHelper.GetParent(textViewHost.HostControl);
if (parent is Grid grid)
{
grid.Children.Remove(textViewHost.HostControl);
continue;
}
if (parent is TabItem tabItem)
{
tabItem.Content = null;
continue;
}
}
vimWindow.TabItem.Content = CreateWindowContent(vimWindow);
}
private void OnVimWindowCreated(object sender, VimWindowEventArgs e)
{
e.VimWindow.Changed += (sender2, e2 ) => OnVimWindowChanged(e.VimWindow);
}
#region Issue 1074 Helpers
private void OnLeaderSetClick(object sender, RoutedEventArgs e)
{
ActiveVimBufferOpt.Process(@":let mapleader='ö'", enter: true);
ActiveVimBufferOpt.Process(@":nmap <Leader>x ihit it<Esc>", enter: true);
}
private void OnLeaderTypeClick(object sender, RoutedEventArgs e)
{
ActiveVimBufferOpt.Process(@"ö", enter: false);
}
#endregion
+ private void OnCustomScenarioClick(object sender, RoutedEventArgs e)
+ {
+ var vimBuffer = ActiveVimBufferOpt;
+ var textView = vimBuffer.TextView;
+ var textBuffer = textView.TextBuffer;
+
+ // Scenario here
+ textBuffer.SetText("trucker", "\tcat");
+ var blockSpan = new BlockSpan(textBuffer.GetPoint(1), tabStop: 2, spaces: 2, height: 2);
+ var visualSpan = VisualSpan.NewBlock(blockSpan);
+ visualSpan.Select(textView, SearchPath.Forward);
+ /*
+ DoEvents();
+
+ // It may seem odd for the second span to start on column 1 since the tab is partially
+ // included in the line. However Visual Studio has this behavior. It won't select a
+ // character at the start / end of a selection unless it's completely included
+ var spans = new[]
+ {
+ _textBuffer.GetLineSpan(0, 1, 2),
+ _textBuffer.GetLineSpan(1, 1, 1)
+ };
+ Assert.Equal(spans, _textView.Selection.SelectedSpans);
+ */
+ }
+
private void OnInsertControlCharactersClick(object sender, RoutedEventArgs e)
{
var builder = new StringBuilder();
builder.AppendLine("Begin");
for (var i = 0; i < 32; i++)
{
builder.AppendFormat("{0} - {1}{2}", i, (char)i, Environment.NewLine);
}
builder.AppendLine("End");
ActiveVimBufferOpt.TextBuffer.Insert(0, builder.ToString());
}
private void OnDisplayNewLinesChecked(object sender, RoutedEventArgs e)
{
_vimAppOptions.DisplayNewLines = _displayNewLinesMenuItem.IsChecked;
}
private void OnOpenClick(object sender, EventArgs e)
{
var openFileDialog = new OpenFileDialog
{
CheckFileExists = true
};
if ((bool)openFileDialog.ShowDialog(this))
{
// TODO: Get a real content type
var filePath = openFileDialog.FileName;
var fileName = IOPath.GetFileName(filePath);
var textDocumentFactoryService = _editorHost.CompositionContainer.GetExportedValue<ITextDocumentFactoryService>();
var textDocument = textDocumentFactoryService.CreateAndLoadTextDocument(filePath, _editorHost.ContentTypeRegistryService.GetContentType("text"));
var wpfTextView = CreateTextView(textDocument.TextBuffer);
AddNewTab(fileName, wpfTextView);
}
}
private void OnNewTabClick(object sender, RoutedEventArgs e)
{
// TODO: Move the title to IVimWindow
var name = $"Empty Doc {_vimWindowManager.VimWindowList.Count + 1}";
AddNewTab(name);
}
/// <summary>
/// Add the repro for Issue 1479. Essentially create a undo where the primitive will change
/// selection on undo
/// </summary>
private void OnAddUndoSelectionChangeClick(object sender, RoutedEventArgs e)
{
var vimBuffer = ActiveVimBufferOpt;
if (vimBuffer == null)
{
return;
}
if (!_textUndoHistoryRegistry.TryGetHistory(vimBuffer.TextBuffer, out ITextUndoHistory textUndoHistory))
{
return;
}
using (var transaction = textUndoHistory.CreateTransaction("Issue 1479"))
{
transaction.AddUndo(new SelectAllOnUndoRedoPrimitive(vimBuffer.TextView));
vimBuffer.TextBuffer.Insert(0, "Added selection primitive for issue 1479" + Environment.NewLine);
transaction.Complete();
}
}
}
}
diff --git a/Src/VimCore/Modes_Insert_Components.fs b/Src/VimCore/Modes_Insert_Components.fs
index b700fee..038b356 100644
--- a/Src/VimCore/Modes_Insert_Components.fs
+++ b/Src/VimCore/Modes_Insert_Components.fs
@@ -1,422 +1,436 @@
#light
namespace Vim.Modes.Insert
open Microsoft.VisualStudio.Text
open Microsoft.VisualStudio.Text.Editor
open Microsoft.VisualStudio.Text.Operations
open Microsoft.VisualStudio.Utilities
open Vim
/// Used to track and accumulate the changes to ITextView instance
type internal ITextChangeTracker =
/// Associated ITextView
abstract TextView: ITextView
/// Whether or not change tracking is currently enabled. Disabling the tracking will
/// cause the current change to be completed
abstract TrackCurrentChange: bool with get, set
/// Whether we should suppress updating last change marks
abstract SuppressLastChangeMarks: bool with get, set
/// Current change
abstract CurrentChange: TextChange option
/// Complete the current change if there is one
abstract CompleteChange: unit -> unit
/// Clear out the current change without completing it
abstract ClearChange: unit -> unit
/// Start tracking the effective change
abstract StartTrackingEffectiveChange: unit -> unit
/// Whether the effective change is a simple insert
abstract IsEffectiveChangeInsert: bool
/// A span representing the active insert region of the effective change
abstract EffectiveChange: SnapshotSpan option
/// Stop tracking the effective change
abstract StopTrackingEffectiveChange: unit -> unit
/// Raised when a change is completed
[<CLIEvent>]
abstract ChangeCompleted: IDelegateEvent<System.EventHandler<TextChangeEventArgs>>
/// Data relating to an effective change
type EffectiveChangeData = {
// The current snapshot
Snapshot: ITextSnapshot
/// The left edge of the active insert region
LeftEdge: int
/// The right edge of the active insert region
RightEdge: int
/// The total number of characters deleted to the left of the active insert region
LeftDeletions: int
/// The total number of character deleted to the right of the active insert region
RightDeletions: int
}
/// Used to track changes to an individual IVimBuffer
type internal TextChangeTracker
(
_vimTextBuffer: IVimTextBuffer,
_textView: ITextView,
_operations: ICommonOperations
) as this =
static let Key = System.Object()
let _bag = DisposableBag()
let _changeCompletedEvent = StandardEvent<TextChangeEventArgs>()
/// Tracks the current active text change. This will grow as the user edits
let mutable _currentTextChange: (TextChange * ITextChange) option = None
/// Whether or not tracking is currently enabled
let mutable _trackCurrentChange = false
/// Whether we should suppress updating last change marks.
/// Insert mode turns this off and manages the marks itself
let mutable _suppressLastChangeMarks = false
let mutable (_effectiveChangeData: EffectiveChangeData option) = None
+ let mutable _caretPointInChanging : SnapshotPoint option = None
+
do
// Listen to text buffer change events in order to track edits. Don't respond to changes
// while disabled though
_textView.TextBuffer.Changed
|> Observable.subscribe (fun args -> this.OnTextChanged args)
|> _bag.Add
+ _textView.TextBuffer.Changing
+ |> Observable.subscribe (fun args -> this.OnTextChanging args)
+ |> _bag.Add
+
// Dispose handlers when the text view is closed.
_textView.Closed
|> Event.add (fun _ -> _bag.DisposeAll())
member x.CurrentChange =
match _currentTextChange with
| None -> None
| Some (change,_) -> Some change
member x.TrackCurrentChange
with get () = _trackCurrentChange
and set value =
if _trackCurrentChange <> value then
_currentTextChange <- None
_trackCurrentChange <- value
/// The change is completed. Raises the changed event and resets the current text change
/// state
member x.CompleteChange() =
match _currentTextChange with
| None ->
()
| Some (change, _) ->
_currentTextChange <- None
let args = TextChangeEventArgs(change)
_changeCompletedEvent.Trigger x args
/// Clear out the current change without completing it
member x.ClearChange() =
_currentTextChange <- None
/// Start tracking the effective change
member x.StartTrackingEffectiveChange() =
let caretPoint = TextViewUtil.GetCaretPoint _textView
_effectiveChangeData <-
Some {
Snapshot = caretPoint.Snapshot
LeftEdge = caretPoint.Position
RightEdge = caretPoint.Position
LeftDeletions = 0
RightDeletions = 0
}
/// Whether the effective change is a simple insert
member x.IsEffectiveChangeInsert =
match _effectiveChangeData with
| Some data ->
data.LeftDeletions = 0 && data.RightDeletions = 0
| None ->
false
/// A span representing the active insert region of the effective change
member x.EffectiveChange =
let snapshot = _textView.TextBuffer.CurrentSnapshot
match _effectiveChangeData with
| Some data when data.Snapshot = snapshot ->
SnapshotSpan(snapshot, data.LeftEdge, data.RightEdge - data.LeftEdge)
|> Some
| _ ->
None
/// Stop tracking the effective change
member x.StopTrackingEffectiveChange() =
_effectiveChangeData <- None
/// Convert the ITextChange value into a TextChange instance. This will not handle any special
/// edit patterns and simply does a raw adjustment
member x.ConvertBufferChange (beforeSnapshot: ITextSnapshot) (change: ITextChange) =
let convert () =
let getDelete () =
- let caretPoint = TextViewUtil.GetCaretPoint _textView
+ let caretPoint =
+ match _caretPointInChanging with
+ | Some point when point.Snapshot = beforeSnapshot -> point
+ | _ -> TextViewUtil.GetCaretPoint _textView
+
let isCaretAtStart =
caretPoint.Snapshot = beforeSnapshot &&
caretPoint.Position = change.OldPosition
if isCaretAtStart then
TextChange.DeleteRight change.OldLength
else
TextChange.DeleteLeft change.OldLength
if change.OldText.Length = 0 then
// This is a straight insert operation
TextChange.Insert change.NewText
elif change.NewText.Length = 0 then
// This is a straight delete operation
getDelete()
else
// This is a delete + insert combination
let left = getDelete()
let right = TextChange.Insert change.NewText
TextChange.Combination (left, right)
// Look for the pattern where tabs are used to replace spaces. When there are spaces in
// the ITextBuffer and tabs are enabled and the user hits <Tab> the spaces will be deleted
// and replaced with tabs. The result of the edit though should be recorded as simply
// tabs
if change.OldText.Length > 0 && StringUtil.IsBlanks change.NewText && StringUtil.IsBlanks change.OldText then
let spacesToColumn =
SnapshotUtil.GetPoint beforeSnapshot change.OldSpan.Start
|> _operations.GetSpacesToPoint
let oldText = _operations.NormalizeBlanks change.OldText spacesToColumn
let newText = _operations.NormalizeBlanks change.NewText spacesToColumn
if newText.StartsWith oldText then
let diffText = newText.Substring(oldText.Length)
TextChange.Insert diffText
else
convert ()
else
convert ()
+ member x.OnTextChanging (args: TextContentChangingEventArgs) =
+ _caretPointInChanging <- Some (TextViewUtil.GetCaretPoint _textView)
+
member x.OnTextChanged (args: TextContentChangedEventArgs) =
if x.TrackCurrentChange then
x.UpdateCurrentChange args
if _effectiveChangeData.IsSome then
x.UpdateEffectiveChange args
x.UpdateMarks args
+ _caretPointInChanging <- None
member x.UpdateCurrentChange (args: TextContentChangedEventArgs) =
// At this time we only support contiguous changes (or rather a single change)
if args.Changes.Count = 1 then
let newBufferChange = args.Changes.Item(0)
let newTextChange = x.ConvertBufferChange args.Before newBufferChange
match _currentTextChange with
| None -> _currentTextChange <- Some (newTextChange, newBufferChange)
| Some (oldTextChange, oldBufferChange) -> x.MergeChange oldTextChange oldBufferChange newTextChange newBufferChange
else
x.CompleteChange()
/// Update the last edit point and last change marks based on the latest change to the
/// ITextBuffer. Note that this isn't necessarily a vim originated edit. Can be done
/// by another Visual Studio operation but we still treat it like a Vim edit.
member x.UpdateMarks (args: TextContentChangedEventArgs) =
if args.Changes.Count = 1 then
let change = args.Changes.Item(0)
let position =
if change.Delta > 0 && change.NewEnd > 0 then
change.NewEnd - 1
else
change.NewPosition
let point = SnapshotPoint(args.After, position)
_vimTextBuffer.LastEditPoint <- Some point
// If we not suppressing change marks, automatically update the
// last change start and end positions.
if not _suppressLastChangeMarks then
let oldSpan = SnapshotSpan(args.Before, change.OldSpan)
let newSpan = SnapshotSpan(args.After, change.NewSpan)
_operations.RecordLastChange oldSpan newSpan
else
// When there are multiple changes it is usually the result of a
// projection buffer edit coming from a web page edit. For now
// that's unsupported. Another possible cause is an extension that
// mass-edits line endings, e.g. see issue #2440.
//
// If we do nothing, the automatic tracking will correctly update
// the previous last edit point in its own text change handler.
()
/// Attempt to merge the change operations together
member x.MergeChange oldTextChange (oldChange: ITextChange) newTextChange (newChange: ITextChange) =
// First step is to determine if we can merge the changes. Essentially we need to ensure that
// the changes are occurring at the same point in the ITextBuffer
let canMerge =
if newChange.OldText.Length = 0 then
// This is a pure insert so it must occur at the end of the last ITextChange
// in order to be valid
oldChange.NewEnd = newChange.OldPosition
elif newChange.NewText.Length = 0 then
// This is a pure delete operation. The delete must start from the end of the
// previous change
oldChange.NewEnd = newChange.OldEnd
elif newChange.Delta >= 0 && oldChange.NewEnd = newChange.OldPosition then
// Replace just after the previous edit
true
else
// This is a replace operation. Easiest way to check is to see if the delta applied
// to the previous end puts us in the correct end position
oldChange.NewEnd - newChange.OldText.Length = newChange.OldPosition
if canMerge then
// Change is legal. Merge it with the existing one and move on
let mergedChange = TextChange.CreateReduced oldTextChange newTextChange
_currentTextChange <- Some (mergedChange, newChange)
else
// If we can't merge then the previous change is complete and we can switch our focus to
// the new TextChange value
x.CompleteChange()
_currentTextChange <- Some (newTextChange, newChange)
member x.UpdateEffectiveChange (args: TextContentChangedEventArgs) =
VimTrace.TraceInfo("OnTextChange: {0}", args.Changes.Count)
VimTrace.TraceInfo("OnTextChange: caret position = {0}", _textView.Caret.Position.BufferPosition.Position)
for i = 0 to args.Changes.Count - 1 do
VimTrace.TraceInfo("OnTextChange: change {0}", i)
let change = args.Changes.[i]
VimTrace.TraceInfo("OnTextChange: old = '{0}', new = '{1}'", StringUtil.GetDisplayString(change.OldText), StringUtil.GetDisplayString(change.NewText))
VimTrace.TraceInfo("OnTextChange: old = '{0}', new = '{1}'", change.OldSpan, change.NewSpan)
match _effectiveChangeData with
| Some data when data.Snapshot = args.Before ->
let snapshot = args.After
let caretPosition = _textView.Caret.Position
let virtualSpaces = caretPosition.VirtualSpaces
let mutable leftEdge = data.LeftEdge
let mutable rightEdge = data.RightEdge
let mutable leftDeletions = data.LeftDeletions
let mutable rightDeletions = data.RightDeletions
// Process the changes in reverse order so that offsets relative to
// the previous snapshot are valid for each change.
for i = args.Changes.Count - 1 downto 0 do
let change = args.Changes.[i]
// Adjust the active region based on the change.
if
args.Before = caretPosition.BufferPosition.Snapshot
&& virtualSpaces > 0
&& change.OldSpan.Start = leftEdge
&& change.OldSpan.End = leftEdge
&& change.NewText.Length >= virtualSpaces
&& change.NewText.Substring(0, virtualSpaces) |> StringUtil.IsBlanks
then
// An insertion moved the caret from virtual space to
// non-virtual space. Exclude the virtual spaces from the
// active region so that if the effective change is
// repeated the virtual spaces don't get double inserted.
leftEdge <- leftEdge + virtualSpaces
rightEdge <- rightEdge + change.Delta
elif change.OldSpan.End < leftEdge then
// Change entirely precedes the active region so shift the
// edges by the delta.
leftEdge <- leftEdge + change.Delta
rightEdge <- rightEdge + change.Delta
elif change.OldSpan.Start > rightEdge then
// Change entirely follows the active region, so we can
// ignore it.
()
elif change.OldSpan.Start >= leftEdge && change.OldSpan.End <= rightEdge then
// Change falls completely within the active region so
// shift the right edge.
rightEdge <- rightEdge + change.Delta
else
// Change is neither a subsest nor disjoint with the active
// region. Handle overlap.
// Check for deletions to the left.
if change.OldSpan.Start < leftEdge then
let deleted = leftEdge - change.OldSpan.Start
leftEdge <- change.OldSpan.Start
leftDeletions <- leftDeletions + deleted
// Check for deletions to the right.
if change.OldSpan.End > rightEdge then
let deleted = change.OldSpan.End - rightEdge
rightEdge <- change.OldSpan.End + change.Delta
rightDeletions <- rightDeletions + deleted
else
rightEdge <- rightEdge + change.Delta
// Update the effective change data.
_effectiveChangeData <-
if leftEdge >= 0 && leftEdge <= rightEdge && rightEdge <= snapshot.Length then
Some {
Snapshot = snapshot
LeftEdge = leftEdge
RightEdge = rightEdge
LeftDeletions = leftDeletions
RightDeletions = rightDeletions
}
else
// Something went wrong.
VimTrace.TraceError("OnTextChange: Effective change corrupted:")
let message = "LeftEdge = {0}, RightEdge = {1}, Length = {2}"
VimTrace.TraceError(message, leftEdge, rightEdge, snapshot.Length)
None
| _ ->
()
static member GetTextChangeTracker (bufferData: IVimBufferData) (commonOperationsFactory: ICommonOperationsFactory) =
let textView = bufferData.TextView
textView.Properties.GetOrCreateSingletonProperty(Key, (fun () ->
let operations = commonOperationsFactory.GetCommonOperations bufferData
TextChangeTracker(bufferData.VimTextBuffer, textView, operations)))
interface ITextChangeTracker with
member x.TextView = _textView
member x.TrackCurrentChange
with get () = x.TrackCurrentChange
and set value = x.TrackCurrentChange <- value
member x.SuppressLastChangeMarks
with get () = _suppressLastChangeMarks
and set value = _suppressLastChangeMarks <- value
member x.CurrentChange = x.CurrentChange
member x.CompleteChange () = x.CompleteChange ()
member x.ClearChange () = x.ClearChange ()
member x.StartTrackingEffectiveChange () = x.StartTrackingEffectiveChange ()
member x.IsEffectiveChangeInsert = x.IsEffectiveChangeInsert
member x.EffectiveChange = x.EffectiveChange
member x.StopTrackingEffectiveChange () = x.StopTrackingEffectiveChange ()
[<CLIEvent>]
member x.ChangeCompleted = _changeCompletedEvent.Publish
diff --git a/Src/VsVimShared/DebugUtil.cs b/Src/VimWpf/Implementation/Misc/DebugUtil.cs
similarity index 88%
rename from Src/VsVimShared/DebugUtil.cs
rename to Src/VimWpf/Implementation/Misc/DebugUtil.cs
index 590debc..d7bbeb2 100644
--- a/Src/VsVimShared/DebugUtil.cs
+++ b/Src/VimWpf/Implementation/Misc/DebugUtil.cs
@@ -1,85 +1,88 @@
using Microsoft.VisualStudio.Language.Intellisense;
using Microsoft.VisualStudio.Text;
using Microsoft.VisualStudio.Text.Editor;
using Microsoft.VisualStudio.Utilities;
using System;
using System.Collections.Generic;
using System.ComponentModel.Composition;
using System.Linq;
using System.Text;
#if DEBUG
-namespace Vim.VisualStudio
+namespace Vim.UI.Wpf.Implementation.Misc
{
/// <summary>
/// This type exists purely to help during active debugging of VsVim.
/// </summary>
[Export(typeof(IWpfTextViewCreationListener))]
[ContentType(VimConstants.ContentType)]
[TextViewRole(PredefinedTextViewRoles.Editable)]
internal sealed class DebugUtil : IWpfTextViewCreationListener
{
private readonly object _trackedKey = new object();
private readonly ICompletionBroker _completionBroker;
private readonly HashSet<IWpfTextView> _trackedTextViews = new HashSet<IWpfTextView>();
[ImportingConstructor]
internal DebugUtil(ICompletionBroker completionBroker)
{
_completionBroker = completionBroker;
}
private void OnTextViewCreated(IWpfTextView textView)
{
if (!_trackedTextViews.Add(textView))
{
return;
}
textView.Selection.SelectionChanged += delegate { OnSelectionChanged(textView); };
textView.TextBuffer.Changed += delegate { OnTextViewChanged(textView); };
textView.Closed += delegate { _trackedTextViews.Remove(textView); };
}
private void OnTextViewChanged(IWpfTextView textView)
{
foreach (var session in _completionBroker.GetSessions(textView))
{
if (session.Properties.ContainsProperty(_trackedKey))
{
continue;
}
session.Properties.AddProperty(_trackedKey, null);
session.Dismissed += delegate { OnCompletionSessionDismissed(session); };
}
}
private void Use<T>(T p)
{
}
private void OnSelectionChanged(IWpfTextView textView)
{
- var span = textView.Selection.StreamSelectionSpan;
- var text = span.GetText();
+ var text = textView
+ .Selection
+ .SelectedSpans
+ .Select(x => x.GetText())
+ .Aggregate((x, y) => x + y);
Use(text);
}
private void OnCompletionSessionDismissed(ICompletionSession session)
{
}
#region IWfTextViewCreationListener
void IWpfTextViewCreationListener.TextViewCreated(IWpfTextView textView)
{
OnTextViewCreated(textView);
}
#endregion
}
}
#endif
diff --git a/Src/VimWpf/VimWpf.projitems b/Src/VimWpf/VimWpf.projitems
index e14e397..b7e017c 100644
--- a/Src/VimWpf/VimWpf.projitems
+++ b/Src/VimWpf/VimWpf.projitems
@@ -1,104 +1,105 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<MSBuildAllProjects Condition="'$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' < '16.0'">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
<HasSharedItems>true</HasSharedItems>
<SharedGUID>648972d9-1a17-46d8-80c6-6810c5b8b4ae</SharedGUID>
</PropertyGroup>
<PropertyGroup Label="Configuration">
<Import_RootNamespace>VimWpf</Import_RootNamespace>
</PropertyGroup>
<ItemGroup>
<Compile Include="$(MSBuildThisFileDirectory)Constants.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Extensions.cs" />
<Compile Include="$(MSBuildThisFileDirectory)IBlockCaret.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ICommandMarginUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)IControlCharUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)IDirectoryUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)IJoinableTaskFactoryProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)IKeyUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)IMarkDisplayUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\BlockCaret\BlockCaret.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\BlockCaret\BlockCaretController.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\BlockCaret\BlockCaretFactoryService.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\BlockCaret\BlockCaretFormatDefinition.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\BlockCaret\PrimaryCaretFormatDefinition.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\BlockCaret\SecondaryCaretFormatDefinition.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\CharDisplay\CharDisplayTaggerSource.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\CharDisplay\CharDisplayTaggerSourceFactory.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\CharDisplay\ControlCharFormatDefinition.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\CharDisplay\ControlCharUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\CommandMargin\CommandMargin.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\CommandMargin\CommandMarginControl.xaml.cs">
<DependentUpon>CommandMarginControl.xaml</DependentUpon>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)Implementation\CommandMargin\CommandMarginController.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\CommandMargin\CommandMarginFormatDefinition.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\CommandMargin\CommandMarginProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\CommandMargin\CommandMarginResources.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\CommandMargin\CommandMarginUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Directory\DirectoryContentType.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Directory\DirectoryFormatDefinition.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Directory\DirectoryKeyProcessor.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Directory\DirectoryKeyProcessorProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Directory\DirectoryTaggerSource.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Directory\DirectoryTaggerSourceFactory.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Directory\DirectoryUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\ImeCoordinator\ImeCoordinator.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\MarkGlyph\MarkDisplayUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\MarkGlyph\MarkGlyphFactory.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\MarkGlyph\MarkGlyphFactoryProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\MarkGlyph\MarkGlyphTag.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\MarkGlyph\MarkGlyphTaggerSource.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\MarkGlyph\MarkGlyphTaggerSourceFactory.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\AlternateKeyUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\ClipboardDevice.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\DebugUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\DisplayWindowBroker.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\EditorFormatDefinitions.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\KeyboardDeviceImpl.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\KeyMappingTimeoutHandler.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\MouseDeviceImpl.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Mouse\VimMouseProcessor.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Mouse\VimMouseProcessorProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\MultiSelection\MultiSelectionUtilFactory.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Paste\PasteAdornment.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Paste\PasteController.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Paste\PasteFactoryService.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\RelativeLineNumbers\ILineFormatTracker.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\RelativeLineNumbers\Line.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\RelativeLineNumbers\LineNumberDrawer.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\RelativeLineNumbers\LineNumberFormatTracker.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\RelativeLineNumbers\LineNumbersCalculator.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\RelativeLineNumbers\LineNumbersTracker.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\RelativeLineNumbers\LineNumberTextSource.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\RelativeLineNumbers\LineNumberVisual.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\RelativeLineNumbers\LineNumberVisualStore.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\RelativeLineNumbers\RelativeLineNumbersMargin.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\RelativeLineNumbers\RelativeLineNumbersMarginFactory.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\RelativeLineNumbers\Util\TextViewExtensions.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\RelativeLineNumbers\Util\TextViewLineExtensions.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\RelativeLineNumbers\VerticalCanvasMargin.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\WordCompletion\Async\WordAsyncCompletionSession.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\WordCompletion\Async\WordAsyncCompletionSessionFactory.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\WordCompletion\Async\WordAsyncCompletionSource.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\WordCompletion\Async\WordAsyncCompletionSourceProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\WordCompletion\Extensions.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\WordCompletion\Legacy\WordLegacyCompletionPresenterProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\WordCompletion\Legacy\WordLegacyCompletionSession.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\WordCompletion\Legacy\WordLegacyCompletionSessionFactory.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\WordCompletion\Legacy\WordLegacyCompletionSet.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\WordCompletion\Legacy\WordLegacyCompletionSource.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\WordCompletion\Legacy\WordLegacyCompletionSourceProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\WordCompletion\VimWordCompletionData.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\WordCompletion\VimWordCompletionUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)NativeMethods.cs" />
<Compile Include="$(MSBuildThisFileDirectory)VimHost.cs" />
<Compile Include="$(MSBuildThisFileDirectory)VimKeyProcessor.cs" />
</ItemGroup>
<ItemGroup>
<Page Include="$(MSBuildThisFileDirectory)Implementation\CommandMargin\CommandMarginControl.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/Src/VsVimShared/VsVimShared.projitems b/Src/VsVimShared/VsVimShared.projitems
index 8a65b0a..6c1045c 100644
--- a/Src/VsVimShared/VsVimShared.projitems
+++ b/Src/VsVimShared/VsVimShared.projitems
@@ -1,166 +1,165 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<MSBuildAllProjects Condition="'$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' < '16.0'">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
<HasSharedItems>true</HasSharedItems>
<SharedGUID>6dbed15c-fc2c-46e9-914d-685518573f0d</SharedGUID>
</PropertyGroup>
<PropertyGroup Label="Configuration">
<Import_RootNamespace>VsVimShared</Import_RootNamespace>
</PropertyGroup>
<ItemGroup>
<Compile Include="$(MSBuildThisFileDirectory)CommandKeyBinding.cs" />
<Compile Include="$(MSBuildThisFileDirectory)CommandKeyBindingSnapshot.cs" />
<Compile Include="$(MSBuildThisFileDirectory)CommandListSnapshot.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Constants.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)DebugUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)EditCommand.cs" />
<Compile Include="$(MSBuildThisFileDirectory)EditCommandKind.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Extensions.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Guids.cs" />
<Compile Include="$(MSBuildThisFileDirectory)HostFactory.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ICommandDispatcher.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ICommandTarget.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ICSharpScriptExecutor.cs" />
<Compile Include="$(MSBuildThisFileDirectory)IExtensionAdapter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)IExternalEditAdapter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)IKeyBindingService.cs" />
<Compile Include="$(MSBuildThisFileDirectory)IKeyboardOptionsProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\ConflictingKey\ConflictingKeyBindingMargin.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\ConflictingKey\ConflictingKeyBindingMarginControl.xaml.cs">
<DependentUpon>ConflictingKeyBindingMarginControl.xaml</DependentUpon>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)Implementation\ConflictingKey\ConflictingKeyBindingMarginProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\CSharpScript\CSharpScriptExecutor.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\CSharpScript\CSharpScriptGlobals.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\EditorFormatDefinitions.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\ExternalEdit\ExternalEditMonitor.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\ExternalEdit\ExternalEditorManager.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\ExternalEdit\SnippetExternalEditAdapter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\InlineRename\IInlineRenameUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\InlineRename\InlineRenameListenerFactory.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\InlineRename\InlineRenameUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\IntelliCode\IntelliCodeCommandTarget.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\CSharpAdapter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\ExtensionAdapterBroker.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\FallbackKeyProcessor.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\FallbackKeyProcessorProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\KeyBindingService.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\MindScape.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\PowerToolsUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\ReportDesignerUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\ScopeData.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\StandardCommandTarget.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\StatusBarAdapter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\TextManager.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\UnwantedSelectionHandler.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\VimBufferCoordinator.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\VisualStudioCommandDispatcher.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\VsAdapter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\VsVimKeyProcessor.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Misc\VsVimKeyProcessorProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\NavigateTo\IThreadCommunicator.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\NavigateTo\NavigateToItemProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\NavigateTo\NavigateToItemProviderFactory.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\OptionPages\ComboBoxTemplateSelector.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\OptionPages\DefaultOptionPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\OptionPages\KeyBindingData.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\OptionPages\KeyBindingHandledByOption.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\OptionPages\KeyboardOptionPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\OptionPages\KeyboardOptionsProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\OptionPages\KeyboardSettingsControl.xaml.cs">
<DependentUpon>KeyboardSettingsControl.xaml</DependentUpon>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)Implementation\PowerShellTools\IPowerShellToolsUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\PowerShellTools\PowerShellToolsExtensionAdapter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\PowerShellTools\PowerShellToolsUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\ReSharper\IResharperUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\ReSharper\ReSharperExtensionAdapter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\ReSharper\ReSharperExternalEditAdapter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\ReSharper\ReSharperKeyUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\ReSharper\ReSharperTagDetector.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\ReSharper\ReSharperUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\ReSharper\ReSharperVersion.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\ReSharper\ResharperVersionutility.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Settings\SettingSerializer.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Settings\VimApplicationSettings.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\Settings\VimCollectionSettingsStore.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\ToastNotification\ToastControl.xaml.cs">
<DependentUpon>ToastControl.xaml</DependentUpon>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)Implementation\ToastNotification\ToastNotificationService.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\ToastNotification\ToastNotificationServiceProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\UpgradeNotification\ErrorBanner.xaml.cs">
<DependentUpon>ErrorBanner.xaml</DependentUpon>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)Implementation\UpgradeNotification\LinkBanner.xaml.cs">
<DependentUpon>LinkBanner.xaml</DependentUpon>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)Implementation\UpgradeNotification\VimRcLoadNotificationMarginProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\VisualAssist\IVisualAssistUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\VisualAssist\VisualAssistExtensionAdapter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\VisualAssist\VisualAssistKeyProcessor.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\VisualAssist\VisualAssistMargin.xaml.cs">
<DependentUpon>VisualAssistMargin.xaml</DependentUpon>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)Implementation\VisualAssist\VisualAssistSelectionAdapter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Implementation\VisualAssist\VisualAssistUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)IReportDesignerUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)WindowFrameState.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ITextManager.cs" />
<Compile Include="$(MSBuildThisFileDirectory)IToastNotifaction.cs" />
<Compile Include="$(MSBuildThisFileDirectory)IVimApplicationSettings.cs" />
<Compile Include="$(MSBuildThisFileDirectory)IVimBufferCoordinator.cs" />
<Compile Include="$(MSBuildThisFileDirectory)IVsAdapter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)KeyBinding.cs" />
<Compile Include="$(MSBuildThisFileDirectory)KeyStroke.cs" />
<Compile Include="$(MSBuildThisFileDirectory)NativeMethods.cs" />
<Compile Include="$(MSBuildThisFileDirectory)OleCommandData.cs" />
<Compile Include="$(MSBuildThisFileDirectory)OleCommandUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)PkgCmdID.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Resources.Designer.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Result.cs" />
<Compile Include="$(MSBuildThisFileDirectory)VimExtensionAdapter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)VisualStudioVersion.cs" />
<Compile Include="$(MSBuildThisFileDirectory)VsCommandTarget.cs" />
<Compile Include="$(MSBuildThisFileDirectory)VsFilterKeysAdapter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)VsVimHost.cs" />
<Compile Include="$(MSBuildThisFileDirectory)VsVimJoinableTaskFactoryProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)VsVimPackage.cs" />
</ItemGroup>
<ItemGroup>
<Page Include="$(MSBuildThisFileDirectory)Implementation\ConflictingKey\ConflictingKeyBindingMarginControl.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="$(MSBuildThisFileDirectory)Implementation\OptionPages\KeyboardSettingsControl.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="$(MSBuildThisFileDirectory)Implementation\ToastNotification\ToastControl.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="$(MSBuildThisFileDirectory)Implementation\UpgradeNotification\ErrorBanner.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="$(MSBuildThisFileDirectory)Implementation\UpgradeNotification\LinkBanner.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="$(MSBuildThisFileDirectory)Implementation\VisualAssist\VisualAssistMargin.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="$(MSBuildThisFileDirectory)VSPackage.resx">
<MergeWithCTO>true</MergeWithCTO>
<ManifestResourceName>VSPackage</ManifestResourceName>
</EmbeddedResource>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/Test/VimCoreTest/MemoryLeakTest.cs b/Test/VimCoreTest/MemoryLeakTest.cs
index 5b700eb..84403b8 100644
--- a/Test/VimCoreTest/MemoryLeakTest.cs
+++ b/Test/VimCoreTest/MemoryLeakTest.cs
@@ -1,97 +1,97 @@
using System;
using System.Windows.Threading;
using Xunit;
using Microsoft.VisualStudio.Text.Editor;
using Microsoft.VisualStudio.Text;
using Vim.EditorHost;
+using System.Runtime.CompilerServices;
namespace Vim.UnitTest
{
/// <summary>
/// Used for detecting leaks in our components
/// </summary>
public sealed class MemoryLeakTest : VimTestBase
{
private void RunGarbageCollector()
{
for (var i = 0; i < 15; i++)
{
Dispatcher.CurrentDispatcher.DoEvents();
GC.Collect();
GC.WaitForPendingFinalizers();
GC.Collect();
}
}
private void ClearUndoHistory(ITextBuffer textBuffer)
{
Assert.True(BasicUndoHistoryRegistry.TryGetBasicUndoHistory(textBuffer, out IBasicUndoHistory basicUndoHistory));
basicUndoHistory.Clear();
}
- private void DoWork(Action action)
- {
- action();
- }
+ [MethodImpl(MethodImplOptions.NoInlining)]
+ private WeakReference DoWork(Func<WeakReference> func) => func();
/// <summary>
/// Ensure the undo history doesn't keep the ITextView alive due to a simple transaction
/// </summary>
[WpfFact]
public void UndoTransactionSimple()
{
- var textBuffer = CreateTextBuffer("");
- var textView = TextEditorFactoryService.CreateTextView(textBuffer);
- var weakTextView = new WeakReference(textView);
- DoWork(
+ var weakReference = DoWork(
() =>
{
+ var textBuffer = CreateTextBuffer("");
+ var textView = TextEditorFactoryService.CreateTextView(textBuffer);
+ var weakTextView = new WeakReference(textView);
var undoManager = TextBufferUndoManagerProvider.GetTextBufferUndoManager(textBuffer);
using (var transaction = undoManager.TextBufferUndoHistory.CreateTransaction("Test Edit"))
{
textBuffer.SetText("hello world");
transaction.Complete();
}
+ textView.Close();
+ return weakTextView;
});
- textView.Close();
- textView = null;
RunGarbageCollector();
- Assert.Null(weakTextView.Target);
+ Assert.Null(weakReference.Target);
}
/// <summary>
/// Ensure the undo history doesn't keep the ITextView alive after an undo primitive
/// surrounding the caret is added to the undo stack
/// </summary>
[WpfFact]
public void UndoTransactionWithCaretPrimitive()
{
- var textBuffer = CreateTextBuffer("");
- var textView = TextEditorFactoryService.CreateTextView(textBuffer);
- var weakTextView = new WeakReference(textView);
- DoWork(
+ var weakReference = DoWork(
() =>
{
+ var textBuffer = CreateTextBuffer("");
+ var textView = TextEditorFactoryService.CreateTextView(textBuffer);
+ var weakTextView = new WeakReference(textView);
var undoManager = TextBufferUndoManagerProvider.GetTextBufferUndoManager(textBuffer);
using (var transaction = undoManager.TextBufferUndoHistory.CreateTransaction("Test Edit"))
{
var operations = EditorOperationsFactoryService.GetEditorOperations(textView);
operations.AddBeforeTextBufferChangePrimitive();
textBuffer.SetText("hello world");
transaction.Complete();
}
- });
+ textView.Close();
- textView.Close();
- textView = null;
+ // The AddBeforeTextBufferChangePrimitive put the ITextView into the undo stack
+ // so we need to clear it out here
+ ClearUndoHistory(textBuffer);
+
+ return weakTextView;
+ });
- // The AddBeforeTextBufferChangePrimitive put the ITextView into the undo stack
- // so we need to clear it out here
- ClearUndoHistory(textBuffer);
RunGarbageCollector();
- Assert.Null(weakTextView.Target);
+ Assert.Null(weakReference.Target);
}
}
}
diff --git a/Test/VimCoreTest/TextChangeTrackerTest.cs b/Test/VimCoreTest/TextChangeTrackerTest.cs
index d2fa534..7e4adfc 100644
--- a/Test/VimCoreTest/TextChangeTrackerTest.cs
+++ b/Test/VimCoreTest/TextChangeTrackerTest.cs
@@ -1,282 +1,286 @@
using Vim.EditorHost;
using Microsoft.VisualStudio.Text;
using Microsoft.VisualStudio.Text.Editor;
using Moq;
using Vim.Extensions;
using Vim.Modes.Insert;
using Xunit;
namespace Vim.UnitTest
{
public sealed class TextChangeTrackerTest : VimTestBase
{
private MockRepository _factory;
private ITextBuffer _textBuffer;
private ITextView _textView;
private Mock<IVimTextBuffer> _vimTextBuffer;
private Mock<ICommonOperations> _operations;
private TextChangeTracker _trackerRaw;
private ITextChangeTracker _tracker;
private TextChange _lastChange;
private void Create(params string[] lines)
{
_textView = CreateTextView(lines);
_textBuffer = _textView.TextBuffer;
_factory = new MockRepository(MockBehavior.Loose);
_operations = _factory.Create<ICommonOperations>(MockBehavior.Strict);
_operations.Setup(x => x.RecordLastChange(It.IsAny<SnapshotSpan>(), It.IsAny<SnapshotSpan>()));
_operations.Setup(x => x.RecordLastYank(It.IsAny<SnapshotSpan>()));
_vimTextBuffer = _factory.Create<IVimTextBuffer>(MockBehavior.Strict);
_vimTextBuffer.SetupProperty(x => x.LastEditPoint);
_vimTextBuffer.SetupProperty(x => x.LastChangeOrYankStart);
_vimTextBuffer.SetupProperty(x => x.LastChangeOrYankEnd);
_trackerRaw = new TextChangeTracker(_vimTextBuffer.Object, _textView, _operations.Object)
{
TrackCurrentChange = true
};
_tracker = _trackerRaw;
_tracker.ChangeCompleted += (sender, args) => { _lastChange = args.TextChange; };
}
/// <summary>
/// Make sure that no tracking occurs when we are disabled
/// </summary>
[WpfFact]
public void DontTrackWhenDisabled()
{
Create("");
_tracker.TrackCurrentChange = false;
_textBuffer.Insert(0, "a");
Assert.Null(_lastChange);
Assert.True(_tracker.CurrentChange.IsNone());
}
/// <summary>
/// Make sure we clear out the text when disabling. Don't want a change to persist across
/// several enabled sessions
/// </summary>
[WpfFact]
public void DisableShouldClearCurrentChange()
{
Create("");
_textBuffer.Insert(0, "a");
_tracker.TrackCurrentChange = false;
Assert.Null(_lastChange);
Assert.True(_tracker.CurrentChange.IsNone());
}
[WpfFact]
public void TypeForward1()
{
Create("the quick brown fox");
_textBuffer.Insert(0, "a");
Assert.Null(_lastChange);
Assert.Equal(TextChange.NewInsert("a"), _tracker.CurrentChange.Value);
}
[WpfFact]
public void TypeForward2()
{
Create("the quick brown fox");
_textBuffer.Insert(0, "a");
_textBuffer.Insert(1, "b");
Assert.Null(_lastChange);
Assert.Equal(TextChange.NewInsert("ab"), _tracker.CurrentChange.Value);
}
[WpfFact]
public void TypeForward3()
{
Create("the quick brown fox");
_textBuffer.Insert(0, "a");
_textBuffer.Insert(1, "b");
_textBuffer.Insert(2, "c");
Assert.Null(_lastChange);
Assert.Equal(TextChange.NewInsert("abc"), _tracker.CurrentChange.Value);
}
[WpfFact]
public void TypeForward_AddMany1()
{
Create("the quick brown fox");
_textBuffer.Insert(0, "a");
_textBuffer.Insert(1, "bcd");
Assert.Null(_lastChange);
Assert.Equal(TextChange.NewInsert("abcd"), _tracker.CurrentChange.Value);
}
[WpfFact]
public void TypeForward_AddMany2()
{
Create("the quick brown fox");
_textBuffer.Insert(0, "ab");
_textBuffer.Insert(2, "cde");
Assert.Null(_lastChange);
Assert.Equal(TextChange.NewInsert("abcde"), _tracker.CurrentChange.Value);
}
[WpfFact]
public void Delete1()
{
Create("the quick brown fox");
_textBuffer.Insert(0, "ab");
_textBuffer.Delete(new Span(1, 1));
Assert.Null(_lastChange);
Assert.Equal(TextChange.NewInsert("a"), _tracker.CurrentChange.Value);
}
[WpfFact]
public void Delete2()
{
Create("the quick brown fox");
_textBuffer.Insert(0, "abc");
_textBuffer.Delete(new Span(2, 1));
_textBuffer.Delete(new Span(1, 1));
Assert.Null(_lastChange);
Assert.Equal(TextChange.NewInsert("a"), _tracker.CurrentChange.Value);
}
[WpfFact]
public void Delete3()
{
Create("the quick brown fox");
_textBuffer.Insert(0, "abc");
_textBuffer.Delete(new Span(2, 1));
Assert.Null(_lastChange);
Assert.Equal(TextChange.NewInsert("ab"), _tracker.CurrentChange.Value);
}
[WpfFact]
public void Delete4()
{
Create("the quick brown fox");
_textBuffer.Delete(new Span(2, 1));
Assert.Null(_lastChange);
Assert.Equal(TextChange.NewDeleteLeft(1), _tracker.CurrentChange.Value);
}
[WpfFact]
public void Delete5()
{
Create("the quick brown fox");
_textBuffer.Delete(new Span(2, 2));
Assert.Null(_lastChange);
Assert.Equal(TextChange.NewDeleteLeft(2), _tracker.CurrentChange.Value);
}
/// <summary>
/// Deleting backwards should join the deletes
/// </summary>
[WpfFact]
public void Delete6()
{
Create("the quick brown fox");
_textBuffer.Delete(new Span(2, 1));
_textBuffer.Delete(new Span(1, 1));
Assert.Null(_lastChange);
Assert.Equal(TextChange.NewDeleteLeft(2), _tracker.CurrentChange.Value);
}
/// <summary>
/// Make sure that it can detect a delete right vs. a delete left
/// </summary>
[WpfFact]
public void DeleteRight_Simple()
{
Create("cat dog");
+ _textView.Caret.PositionChanged += delegate
+ {
+ System.Console.WriteLine("");
+ };
_textBuffer.Delete(new Span(0, 3));
Assert.True(_tracker.CurrentChange.Value.IsDeleteRight(3));
}
/// <summary>
/// Don't treat a caret to the right of the start as a delete right
/// </summary>
[WpfFact]
public void DeleteRight_FromMiddle()
{
Create("cat dog");
_textView.MoveCaretTo(1);
_textBuffer.Delete(new Span(0, 3));
Assert.True(_tracker.CurrentChange.Value.IsDeleteLeft(3));
}
/// <summary>
/// When spaces are in the buffer and tabs are hit and used Visual Studio will often convert
/// spaces to tabs. Without interpreting the line it looks like X spaces are deleted and 2
/// tabs are inserted when really it's just a conversion and should show up as a single tab
/// insert
/// </summary>
[WpfFact]
public void Special_SpaceToTab()
{
Create(" hello");
_operations.Setup(x => x.GetSpacesToPoint(It.IsAny<SnapshotPoint>())).Returns(0);
_operations.Setup(x => x.NormalizeBlanks(" ", 0)).Returns("\t");
_operations.Setup(x => x.NormalizeBlanks("\t\t", 0)).Returns("\t\t");
_textBuffer.Replace(new Span(0, 4), "\t\t");
Assert.Equal(TextChange.NewInsert("\t"), _tracker.CurrentChange.Value);
}
/// <summary>
/// Make sure a straight forward replace is handled properly
/// </summary>
[WpfFact]
public void Replace_Complete()
{
Create("cat");
_textView.MoveCaretTo(1);
_textBuffer.Replace(new Span(0, 3), "dog");
var change = _tracker.CurrentChange.Value;
Assert.True(change.IsCombination);
Assert.True(change.AsCombination().Left.IsDeleteLeft(3));
Assert.True(change.AsCombination().Right.IsInsert("dog"));
}
/// <summary>
/// Replace a set of text with a smaller set of text
/// </summary>
[WpfFact]
public void Replace_Small()
{
Create("house");
_textView.MoveCaretTo(1);
_textBuffer.Replace(new Span(0, 5), "dog");
var change = _tracker.CurrentChange.Value;
Assert.True(change.IsCombination);
Assert.True(change.AsCombination().Left.IsDeleteLeft(5));
Assert.True(change.AsCombination().Right.IsInsert("dog"));
}
/// <summary>
/// Replace a set of text with a bigger set of text
/// </summary>
[WpfFact]
public void Replace_Big()
{
Create("dog");
_textView.MoveCaretTo(1);
_textBuffer.Replace(new Span(0, 3), "house");
var change = _tracker.CurrentChange.Value;
Assert.True(change.IsCombination);
Assert.True(change.AsCombination().Left.IsDeleteLeft(3));
Assert.True(change.AsCombination().Right.IsInsert("house"));
}
/// <summary>
/// A replace which occurs after an insert should be merged
/// </summary>
[WpfFact]
public void Merge_ReplaceAfterInsert()
{
Create("dog");
_textBuffer.Replace(new Span(0, 0), "i");
Assert.True(_tracker.CurrentChange.Value.IsInsert);
_textBuffer.Replace(new Span(1, 3), "cat");
var change = _trackerRaw.CurrentChange.Value;
Assert.True(change.IsCombination);
Assert.True(change.AsCombination().Left.IsInsert("i"));
Assert.True(change.AsCombination().Right.IsCombination);
}
}
}
diff --git a/Test/VimCoreTest/VisualSpanTest.cs b/Test/VimCoreTest/VisualSpanTest.cs
index 292151b..adc3ebf 100644
--- a/Test/VimCoreTest/VisualSpanTest.cs
+++ b/Test/VimCoreTest/VisualSpanTest.cs
@@ -1,561 +1,575 @@
using System;
using System.Collections.Generic;
using Vim.EditorHost;
using Microsoft.VisualStudio.Text;
using Microsoft.VisualStudio.Text.Editor;
using Xunit;
using Vim.Extensions;
namespace Vim.UnitTest
{
public abstract class VisualSpanTest : VimTestBase
{
private IVimBuffer _vimBuffer;
private ITextView _textView;
private ITextBuffer _textBuffer;
protected virtual void Create(params string[] lines)
{
_vimBuffer = CreateVimBuffer(lines);
_textView = _vimBuffer.TextView;
_textBuffer = _textView.TextBuffer;
}
public abstract class CreateForSelectionTest : VisualSpanTest
{
public sealed class CharacterTest : CreateForSelectionTest
{
[WpfFact]
public void IncludeLineBreak()
{
Create("cat", "dog");
_textView.Selection.Select(_textBuffer.GetPoint(0), _textBuffer.GetPoint(5));
DoEvents();
var visualSpan = VisualSpan.CreateForSelection(_textView, VisualKind.Character, tabStop: 4);
var characterSpan = visualSpan.AsCharacter().CharacterSpan;
Assert.True(characterSpan.IncludeLastLineLineBreak);
Assert.Equal(1, characterSpan.LineCount);
}
[WpfFact]
public void EndsInEmptyLineCase()
{
Create("cat", "", "dog");
_textView.Selection.Select(_textBuffer.GetPoint(0), _textBuffer.GetPoint(6));
DoEvents();
Assert.Equal(1, _textView.Selection.StreamSelectionSpan.End.Position.GetContainingLine().LineNumber);
var visualSpan = VisualSpan.CreateForSelection(_textView, VisualKind.Character, tabStop: 4);
var characterSpan = visualSpan.AsCharacter().CharacterSpan;
Assert.Equal(2, characterSpan.LineCount);
Assert.True(characterSpan.IncludeLastLineLineBreak);
}
/// <summary>
/// An empty selection should produce an empty VisualSpan for character
/// </summary>
[WpfFact]
public void Empty()
{
Create("hello world");
var visualSpan = VisualSpan.CreateForSelection(_textView, VisualKind.Character, _vimBuffer.LocalSettings.TabStop);
Assert.Equal(0, visualSpan.EditSpan.OverarchingSpan.Length);
}
/// <summary>
/// Creating a virtual span for a selection doesn't depend on the contents of the line
/// </summary>
/// <param name="line1"></param>
[WpfTheory]
[InlineData("")]
[InlineData("a")]
[InlineData("ab")]
[InlineData("abc")]
[InlineData("abcd")]
[InlineData("abcde")]
public void Virtual(string line1)
{
Create(line1, "");
var point1 = _textBuffer.GetVirtualPointInLine(0, 0);
var point2 = _textBuffer.GetVirtualPointInLine(0, 4);
var span = new VirtualSnapshotSpan(point1, point2);
_textView.Selection.Select(point1, point2);
DoEvents();
var visualSpan = VisualSpan.CreateForVirtualSelection(_textView, VisualKind.Character, tabStop: 4, useVirtualSpace: true);
Assert.Equal(point1, visualSpan.AsCharacter().CharacterSpan.VirtualStart);
Assert.Equal(point2, visualSpan.AsCharacter().CharacterSpan.VirtualEnd);
Assert.Equal(span.Length, visualSpan.AsCharacter().CharacterSpan.VirtualLength);
}
}
public sealed class LineTest : CreateForSelectionTest
{
/// <summary>
/// An empty selection should still produce a complete line selection for line
/// </summary>
[WpfFact]
public void Empty()
{
Create("hello world");
var visualSpan = VisualSpan.CreateForSelection(_textView, VisualKind.Line, _vimBuffer.LocalSettings.TabStop);
Assert.Equal(_textBuffer.GetLineRange(0), visualSpan.AsLine().LineRange);
}
}
public sealed class BlockTest : CreateForSelectionTest
{
/// <summary>
/// Visual Span respects vim semantics here and hence will change an empty selection
/// into one with at least a single space
/// </summary>
[WpfFact]
public void Empty()
{
Create("hello world");
var visualSpan = VisualSpan.CreateForSelection(_textView, VisualKind.Block, _vimBuffer.LocalSettings.TabStop);
var blockSpan = new BlockSpan(_textBuffer.GetPoint(0), tabStop: _vimBuffer.LocalSettings.TabStop, spaces: 1, height: 1);
Assert.Equal(blockSpan, visualSpan.AsBlock().BlockSpan);
}
}
}
public abstract class CreateForSelectionPointsTest : VisualSpanTest
{
public sealed class BlockTest : CreateForSelectionPointsTest
{
/// <summary>
/// Ensure creating a VisualSpan for an empty points results in an a 1 space block
/// selection
/// </summary>
[WpfFact]
public void Empty()
{
Create("dog cat");
var point = _textBuffer.GetPoint(2);
var visualSpan = VisualSpan.CreateForSelectionPoints(VisualKind.Block, point, point, _vimBuffer.LocalSettings.TabStop);
var blockSpan = new BlockSpan(point, _vimBuffer.LocalSettings.TabStop, spaces: 1, height: 1);
Assert.Equal(blockSpan, visualSpan.AsBlock().BlockSpan);
}
[WpfFact]
public void Backwards()
{
Create("big cat", "big dog");
var visualSpan = VisualSpan.CreateForSelectionPoints(VisualKind.Block, _textBuffer.GetPoint(2), _textBuffer.GetPoint(0), _vimBuffer.LocalSettings.TabStop);
var blockSpan = new BlockSpan(_textBuffer.GetPoint(0), _vimBuffer.LocalSettings.TabStop, 2, 1);
Assert.Equal(blockSpan, visualSpan.AsBlock().BlockSpan);
}
/// <summary>
/// Make sure that we properly handle the backward block selection which spans
/// multiple lines
/// </summary>
[WpfFact]
public void BackwardsMultipleLines()
{
Create("big cat", "big dog");
var visualSpan = VisualSpan.CreateForSelectionPoints(VisualKind.Block, _textBuffer.GetPoint(2), _textBuffer.GetPointInLine(1, 1), _vimBuffer.LocalSettings.TabStop);
var blockSpan = new BlockSpan(_textBuffer.GetPoint(1), _vimBuffer.LocalSettings.TabStop, 1, 2);
Assert.Equal(blockSpan, visualSpan.AsBlock().BlockSpan);
}
/// <summary>
/// Make sure that we properly handle the forward block selection which spans
/// multiple lines
/// </summary>
[WpfFact]
public void ForwardsMultipleLines()
{
Create("big cat", "big dog");
var visualSpan = VisualSpan.CreateForSelectionPoints(VisualKind.Block, _textBuffer.GetPoint(1), _textBuffer.GetPointInLine(1, 3), _vimBuffer.LocalSettings.TabStop);
var blockSpan = new BlockSpan(_textBuffer.GetPoint(1), _vimBuffer.LocalSettings.TabStop, 2, 2);
Assert.Equal(blockSpan, visualSpan.AsBlock().BlockSpan);
}
}
public sealed class CharacterTest : CreateForSelectionPointsTest
{
/// <summary>
/// Ensure creating a VisualSpan for an empty points results in an empty selection
/// </summary>
[WpfFact]
public void Empty()
{
Create("dog cat");
var point = _textBuffer.GetPoint(2);
var visualSpan = VisualSpan.CreateForSelectionPoints(VisualKind.Character, point, point, _vimBuffer.LocalSettings.TabStop);
Assert.Equal(point, visualSpan.AsCharacter().CharacterSpan.Start);
Assert.Equal(0, visualSpan.AsCharacter().CharacterSpan.Length);
}
/// <summary>
/// A virtual span doesn't depend on the contents of the line
/// </summary>
/// <param name="line1"></param>
[WpfTheory]
[InlineData("")]
[InlineData("a")]
[InlineData("ab")]
[InlineData("abc")]
[InlineData("abcd")]
[InlineData("abcde")]
public void Virtual(string line1)
{
Create(line1, "");
var point1 = _textBuffer.GetVirtualPointInLine(0, 0);
var point2 = _textBuffer.GetVirtualPointInLine(0, 4);
var span = new VirtualSnapshotSpan(point1, point2);
var visualSpan = VisualSpan.CreateForVirtualSelectionPoints(VisualKind.Character, point1, point2, _vimBuffer.LocalSettings.TabStop, true);
Assert.Equal(point1, visualSpan.AsCharacter().CharacterSpan.VirtualStart);
Assert.Equal(point2, visualSpan.AsCharacter().CharacterSpan.VirtualEnd);
Assert.Equal(span.Length, visualSpan.AsCharacter().CharacterSpan.VirtualLength);
}
}
public sealed class LineTest : CreateForSelectionPointsTest
{
/// <summary>
/// Ensure we handle the case where the start and end point are the same point at the
/// start of the line. The code should return the single line range for the line
/// containing the points
/// </summary>
[WpfFact]
public void SamePoint()
{
Create("cat", "dog", "tree");
var point = _textBuffer.GetLine(1).Start;
var visualSpan = VisualSpan.CreateForSelectionPoints(VisualKind.Line, point, point, _vimBuffer.LocalSettings.TabStop);
Assert.Equal(_textBuffer.GetLineRange(1), visualSpan.AsLine().LineRange);
}
/// <summary>
/// Make sure the code handles the case where the caret is positioned at the end of the
/// ITextSnapshot. Should return the last line
/// </summary>
[WpfFact]
public void EndOfSnapshot()
{
Create("cat", "dog");
var point = new SnapshotPoint(_textBuffer.CurrentSnapshot, _textBuffer.CurrentSnapshot.Length);
var visualSpan = VisualSpan.CreateForSelectionPoints(VisualKind.Line, point, point, _vimBuffer.LocalSettings.TabStop);
Assert.Equal(1, visualSpan.AsLine().LineRange.LastLineNumber);
}
}
}
public abstract class SelectTest : VisualSpanTest
{
/// <summary>
/// When there are unexpanded tabs in the ITextView the block selection needs to treat
/// the tabs as the equivalent number of spaces.
/// </summary>
public sealed class BlockWithTabTest : SelectTest
{
protected override void Create(params string[] lines)
{
Create(2, lines);
}
private void Create(int tabStop, params string[] lines)
{
base.Create();
UpdateTabStop(_vimBuffer, tabStop);
_vimBuffer.TextView.SetText(lines);
}
/// <summary>
/// In this scenario the caret has moved past the tab and onto the start of the next
/// letter. The selection will encompass the tab and the letter
/// trucker
/// cat
/// </summary>
[WpfFact]
public void SimpleCaretPastTab()
{
Create("trucker", "\tcat");
var blockSpan = new BlockSpan(_textBuffer.GetPoint(1), tabStop: 2, spaces: 2, height: 2);
var visualSpan = VisualSpan.NewBlock(blockSpan);
visualSpan.Select(_textView, SearchPath.Forward);
DoEvents();
+#if VS_SPECIFIC_2022
+ var spans = new[]
+ {
+ _textBuffer.GetLineSpan(0, 1, 4),
+ _textBuffer.GetLineSpan(1, 0, 2)
+ };
+#else
// It may seem odd for the second span to start on column 1 since the tab is partially
// included in the line. However Visual Studio has this behavior. It won't select a
// character at the start / end of a selection unless it's completely included
- Assert.Equal(
- new[]
- {
- _textBuffer.GetLineSpan(0, 1, 2),
- _textBuffer.GetLineSpan(1, 1, 1)
- },
- _textView.Selection.SelectedSpans);
+ var spans = new[]
+ {
+ _textBuffer.GetLineSpan(0, 1, 2),
+ _textBuffer.GetLineSpan(1, 1, 1)
+ };
+#endif
+ Assert.Equal(spans, _textView.Selection.SelectedSpans);
}
[WpfFact]
public void SimpleCaretPastTab2()
{
Create("trucker", "\tcat");
var blockSpan = new BlockSpan(_textBuffer.GetPoint(1), tabStop: 2, spaces: 3, height: 2);
var visualSpan = VisualSpan.NewBlock(blockSpan);
visualSpan.Select(_textView, SearchPath.Forward);
DoEvents();
- Assert.Equal(
- new[]
- {
- _textBuffer.GetLineSpan(0, 1, 3),
- _textBuffer.GetLineSpan(1, 1, 2)
- },
- _textView.Selection.SelectedSpans);
+#if VS_SPECIFIC_2022
+ var spans = new[]
+ {
+ _textBuffer.GetLineSpan(0, 1, 5),
+ _textBuffer.GetLineSpan(1, 0, 3)
+ };
+#else
+ var spans = new[]
+ {
+ _textBuffer.GetLineSpan(0, 1, 3),
+ _textBuffer.GetLineSpan(1, 1, 2)
+ };
+#endif
+ Assert.Equal(spans, _textView.Selection.SelectedSpans);
}
/// <summary>
/// When the caret is in in the tab and the anchor is visually above the tab. Then the
/// anchor is visually moved to encompass the entire tab
/// </summary>
[WpfFact]
public void CaretInTabAnchorAboveTab()
{
Create(4, "trucker", "\tcat");
var blockSpan = new BlockSpan(_textBuffer.GetPoint(1), tabStop: 4, spaces: 1, height: 2);
var visualSpan = VisualSpan.NewBlock(blockSpan);
visualSpan.Select(_textView, SearchPath.Forward);
DoEvents();
Assert.Equal(
new[]
{
_textBuffer.GetLineSpan(0, 0, 4),
_textBuffer.GetLineSpan(1, 0, 1)
},
_textView.Selection.SelectedSpans);
}
}
public sealed class CharacterTest : SelectTest
{
/// <summary>
/// The selection of a reverse character span should cause a reversed selection
/// </summary>
[WpfFact]
public void Backward()
{
Create("big dog", "big cat", "big tree", "big fish");
var characterSpan = new CharacterSpan(_textBuffer.GetSpan(1, 3));
var visualSpan = VisualSpan.NewCharacter(characterSpan);
visualSpan.Select(_textView, SearchPath.Backward);
DoEvents();
Assert.True(_textView.Selection.IsReversed);
Assert.Equal(characterSpan.Span, _textView.GetSelectionSpan());
}
[WpfFact]
public void BackwardIntoLineBreak()
{
Create("cat", "dog");
var characterSpan = new CharacterSpan(_textBuffer.GetSpan(0, 4));
var visualSpan = VisualSpan.NewCharacter(characterSpan);
visualSpan.Select(_textView, SearchPath.Backward);
DoEvents();
Assert.Equal(4, _textView.Selection.StreamSelectionSpan.Length);
Assert.True(_textView.Selection.IsReversed);
}
/// <summary>
/// The selection of a forward character span should cause a forward selection
/// </summary>
[WpfFact]
public void Forward()
{
Create("big dog", "big cat", "big tree", "big fish");
var characterSpan = new CharacterSpan(_textBuffer.GetSpan(1, 3));
var visualSpan = VisualSpan.NewCharacter(characterSpan);
visualSpan.Select(_textView, SearchPath.Forward);
DoEvents();
Assert.False(_textView.Selection.IsReversed);
Assert.Equal(characterSpan.Span, _textView.GetSelectionSpan());
}
[WpfFact]
public void ForwardIntoLineBreak()
{
Create("cat", "dog");
var characterSpan = new CharacterSpan(_textBuffer.GetSpan(0, 4));
var visualSpan = VisualSpan.NewCharacter(characterSpan);
visualSpan.Select(_textView, SearchPath.Forward);
DoEvents();
Assert.Equal(4, _textView.Selection.StreamSelectionSpan.Length);
Assert.False(_textView.Selection.IsReversed);
}
/// <summary>
/// Selection of a virtual span doesn't depend on the contents of the line
/// </summary>
/// <param name="line1"></param>
[WpfTheory]
[InlineData("")]
[InlineData("a")]
[InlineData("ab")]
[InlineData("abc")]
[InlineData("abcd")]
[InlineData("abcde")]
public void Virtual(string line1)
{
Create(line1, "");
var point1 = _textBuffer.GetVirtualPointInLine(0, 0);
var point2 = _textBuffer.GetVirtualPointInLine(0, 4);
var span = new VirtualSnapshotSpan(point1, point2);
var characterSpan = new CharacterSpan(span, true);
var visualSpan = VisualSpan.NewCharacter(characterSpan);
visualSpan.Select(_textView, SearchPath.Forward);
DoEvents();
Assert.Equal(point1, _textView.Selection.Start);
Assert.Equal(point2, _textView.Selection.End);
}
}
public sealed class LineTest : SelectTest
{
/// <summary>
/// The selection of a reverse line span should cause a reversed selection
/// </summary>
[WpfFact]
public void Backwards()
{
Create("big dog", "big cat", "big tree", "big fish");
var lineRange = _textBuffer.GetLineRange(1);
var visualSpan = VisualSpan.NewLine(lineRange);
visualSpan.Select(_textView, SearchPath.Backward);
DoEvents();
Assert.True(_textView.Selection.IsReversed);
Assert.Equal(lineRange.ExtentIncludingLineBreak, _textView.GetSelectionSpan());
}
/// <summary>
/// The selection of a forward line span should cause a forward selection
/// </summary>
[WpfFact]
public void Forward()
{
Create("big dog", "big cat", "big tree", "big fish");
var lineRange = _textBuffer.GetLineRange(1);
var visualSpan = VisualSpan.NewLine(lineRange);
visualSpan.Select(_textView, SearchPath.Forward);
DoEvents();
Assert.False(_textView.Selection.IsReversed);
Assert.Equal(lineRange.ExtentIncludingLineBreak, _textView.GetSelectionSpan());
}
}
public sealed class BlockTest : SelectTest
{
/// <summary>
/// Simple selection of a block
/// </summary>
[WpfFact]
public void Simple()
{
Create("big dog", "big cat", "big tree", "big fish");
var blockSpan = _vimBuffer.GetBlockSpan(1, 2, 0, 2);
var visualSpan = VisualSpan.NewBlock(blockSpan);
visualSpan.Select(_textView, SearchPath.Forward);
DoEvents();
Assert.Equal(blockSpan, _vimBuffer.GetSelectionBlockSpan());
Assert.Equal(TextSelectionMode.Box, _textView.Selection.Mode);
}
}
public sealed class BlockOverlapTest : SelectTest
{
/// <summary>
/// Overlap of simple selection of a block with plain (non wide) characters should be 0
/// </summary>
[WpfFact]
public void Simple()
{
Create("big dog", "big cat", "big tree", "big fish");
var blockSpan = _textBuffer.GetBlockSpan(1, _vimBuffer.LocalSettings.TabStop, 0, 2);
foreach (var spanWithOverlap in blockSpan.BlockOverlapColumnSpans)
{
Assert.Equal(0, spanWithOverlap.Start.SpacesAfter);
Assert.Equal(0, spanWithOverlap.End.SpacesBefore);
}
}
/// <summary>
/// Block selection can completely overlaps wide characters
/// </summary>
[WpfFact]
public void Full()
{
Create("big dog", "b\u3042 cat", "b\u3044 tree", "b\u3046 fish");
var blockSpan = _textBuffer.GetBlockSpan(column: 1, length: 2, startLine: 0, lineCount: 2, tabStop: _vimBuffer.LocalSettings.TabStop);
var spans = blockSpan.BlockOverlapColumnSpans;
foreach (var spanWithOverlap in spans)
{
Assert.Equal(0, spanWithOverlap.Start.SpacesBefore);
Assert.Equal(0, spanWithOverlap.End.SpacesAfter);
}
var col = spans.ToReadOnlyCollection();
Assert.Equal("ig", col[0].GetText());
Assert.Equal("\u3042", col[1].GetText());
}
/// <summary>
/// Block selection can partly overlaps wide characters
/// </summary>
[WpfFact]
public void Partial()
{
Create("aiueo", "\u3042\u3044\u3046\u3048\u304A");
var blockSpan = _textBuffer.GetBlockSpan(column: 1, length: 2, startLine: 0, lineCount: 2, tabStop: _vimBuffer.LocalSettings.TabStop);
var col = blockSpan.BlockOverlapColumnSpans.ToReadOnlyCollection();
Assert.False(col[0].HasOverlap);
Assert.Equal("iu", col[0].InnerSpan.GetText());
Assert.True(col[1].HasOverlap);
Assert.Equal(1, col[1].Start.SpacesBefore);
Assert.Equal(0, col[1].End.SpacesAfter);
Assert.Equal(1, col[1].End.SpacesBefore);
Assert.Equal("\u3042\u3044", col[1].OverarchingSpan.GetText());
}
/// <summary>
/// Block selection should include all non spacing characters
/// </summary>
[WpfFact]
public void NonSpacing()
{
string[] lines = new string[] { "hello", "h\u0327e\u0301\u200bllo\u030a\u0305" };
Create(lines);
var blockSpan = _textBuffer.GetBlockSpan(0, length: 6, startLine: 0, lineCount: 2, tabStop: _vimBuffer.LocalSettings.TabStop);
var expected = new List<Tuple<int, int>> {
Tuple.Create(0, 0),
Tuple.Create(0, _vimBuffer.LocalSettings.TabStop - 1) };
var actual = blockSpan.BlockOverlapColumnSpans;
Assert.Equal(lines[1], actual.Rest.Head.InnerSpan.GetText());
}
/// <summary>
/// Overlap of simple selection of a block that partly overlaps a tab character
/// </summary>
[WpfFact]
public void VeryWideCharacter()
{
Create("aiueo", "\t");
var blockSpan = _textBuffer.GetBlockSpan(0, 1, 0, 2, tabStop: _vimBuffer.LocalSettings.TabStop);
var expected = new List<Tuple<int, int>> {
Tuple.Create(0, 0),
Tuple.Create(0, _vimBuffer.LocalSettings.TabStop - 1) };
var col = blockSpan.BlockOverlapColumnSpans.ToReadOnlyCollection();
Assert.False(col[0].HasOverlap);
Assert.Equal(0, col[1].Start.SpacesBefore);
Assert.Equal(1, col[1].End.SpacesBefore);
}
}
}
}
}
|
VsVim/VsVim
|
090e673b6cc92ba841ab390a421881e76caf2526
|
Upgrade to VS 2022 Preview 7
|
diff --git a/Directory.Build.targets b/Directory.Build.targets
index daf7116..14628ef 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,26 +1,25 @@
<Project>
<PropertyGroup>
<!-- Disable the preview warning when building -->
<_NETCoreSdkIsPreview>false</_NETCoreSdkIsPreview>
<LangVersion Condition="'$(Language)' == 'C#'">Latest</LangVersion>
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.0.2155-preview2" Condition="'$(VsVimProjectType)' == 'Vsix'" />
+ <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.0.5232" Condition="'$(VsVimProjectType)' == 'Vsix'" />
</ItemGroup>
-
<Import
Project="$(MSBuildThisFileDirectory)References\Vs2017\Vs2017.Build.targets"
Condition="'$(VsVimVisualStudioTargetVersion)' == '15.0' AND '$(VsVimProjectType)' != ''" />
<Import
Project="$(MSBuildThisFileDirectory)References\Vs2019\Vs2019.Build.targets"
Condition="'$(VsVimVisualStudioTargetVersion)' == '16.0' AND '$(VsVimProjectType)' != ''" />
<Import
Project="$(MSBuildThisFileDirectory)References\Vs2022\Vs2022.Build.targets"
Condition="'$(VsVimVisualStudioTargetVersion)' == '17.0' AND '$(VsVimProjectType)' != ''" />
</Project>
diff --git a/References/Vs2022/Microsoft.VisualStudio.Diagnostics.Assert.dll b/References/Vs2022/Microsoft.VisualStudio.Diagnostics.Assert.dll
index 24765c7..0741fca 100644
Binary files a/References/Vs2022/Microsoft.VisualStudio.Diagnostics.Assert.dll and b/References/Vs2022/Microsoft.VisualStudio.Diagnostics.Assert.dll differ
diff --git a/References/Vs2022/Microsoft.VisualStudio.Platform.VSEditor.dll b/References/Vs2022/Microsoft.VisualStudio.Platform.VSEditor.dll
index 4c96fdb..c104dd3 100644
Binary files a/References/Vs2022/Microsoft.VisualStudio.Platform.VSEditor.dll and b/References/Vs2022/Microsoft.VisualStudio.Platform.VSEditor.dll differ
diff --git a/References/Vs2022/Microsoft.VisualStudio.Platform.WindowManagement.dll b/References/Vs2022/Microsoft.VisualStudio.Platform.WindowManagement.dll
index 499583e..7ba6da7 100644
Binary files a/References/Vs2022/Microsoft.VisualStudio.Platform.WindowManagement.dll and b/References/Vs2022/Microsoft.VisualStudio.Platform.WindowManagement.dll differ
diff --git a/References/Vs2022/Microsoft.VisualStudio.Shell.ViewManager.dll b/References/Vs2022/Microsoft.VisualStudio.Shell.ViewManager.dll
index 14cd99b..e3bfade 100644
Binary files a/References/Vs2022/Microsoft.VisualStudio.Shell.ViewManager.dll and b/References/Vs2022/Microsoft.VisualStudio.Shell.ViewManager.dll differ
diff --git a/References/Vs2022/Microsoft.VisualStudio.Text.Internal.dll b/References/Vs2022/Microsoft.VisualStudio.Text.Internal.dll
index 36a838d..d729dce 100644
Binary files a/References/Vs2022/Microsoft.VisualStudio.Text.Internal.dll and b/References/Vs2022/Microsoft.VisualStudio.Text.Internal.dll differ
diff --git a/References/Vs2022/Vs2022.Build.targets b/References/Vs2022/Vs2022.Build.targets
index 72c1469..30b0d33 100644
--- a/References/Vs2022/Vs2022.Build.targets
+++ b/References/Vs2022/Vs2022.Build.targets
@@ -1,35 +1,35 @@
<Project>
<Import Project="$(MSBuildThisFileDirectory)..\..\Src\VimEditorHost\VimEditorHost.projitems" Label="Shared" Condition="'$(VsVimProjectType)' == 'EditorHost'" />
<PropertyGroup>
<DefineConstants>$(DefineConstants);VS_SPECIFIC_2022</DefineConstants>
<DefineConstants Condition="'$(VsVimProjectType)' == 'EditorHost'">$(DefineConstants);VIM_SPECIFIC_TEST_HOST</DefineConstants>
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.VisualStudio.Sdk" Version="17.0.0-previews-2-31512-422" />
+ <PackageReference Include="Microsoft.VisualStudio.Sdk" Version="17.0.31827.390" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.0.0-1.final" />
<!--
These are private assemblies and not typically considered as a part of the official VS SDK. But
they are needed for some of the window / tab management code hence are used here -->
<Reference Include="Microsoft.VisualStudio.Platform.WindowManagement, Version=17.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.Shell.ViewManager, Version=17.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.Diagnostics.Assert, Version=17.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
</ItemGroup>
<ItemGroup Condition="'$(VsVimProjectType)' == 'EditorHost'">
<Reference Include="Microsoft.VisualStudio.Setup.Configuration.Interop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.VisualStudio.Platform.VSEditor, Version=17.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.Text.Internal, Version=17.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<None Include="$(MSBuildThisFileDirectory)App.config">
<Link>app.config</Link>
</None>
</ItemGroup>
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VsVimProjectType)' == 'Vsix' AND '$(VSToolsPath)' != ''" />
</Project>
diff --git a/Scripts/Build.ps1 b/Scripts/Build.ps1
index 4a99170..4395848 100644
--- a/Scripts/Build.ps1
+++ b/Scripts/Build.ps1
@@ -1,349 +1,349 @@
param (
# Actions
[switch]$build = $false,
[switch]$test = $false,
[switch]$testExtra = $false,
[switch]$updateVsixVersion = $false,
[switch]$uploadVsix = $false,
[switch]$help = $false,
# Settings
[switch]$ci = $false,
[string]$config = "Debug",
[parameter(ValueFromRemainingArguments=$true)][string[]]$properties)
Set-StrictMode -version 2.0
$ErrorActionPreference="Stop"
[string]$rootDir = Split-Path -parent $MyInvocation.MyCommand.Definition
[string]$rootDir = Resolve-Path (Join-Path $rootDir "..")
[string]$binariesDir = Join-Path $rootDir "Binaries"
[string]$configDir = Join-Path $binariesDir $config
[string]$deployDir = Join-Path $binariesDir "Deploy"
[string]$logsDir = Join-Path $binariesDir "Logs"
[string]$toolsDir = Join-Path $rootDir "Tools"
[string[]]$vsVersions = @("2017", "2019", "2022")
function Print-Usage() {
Write-Host "Actions:"
Write-Host " -build Build VsVim"
Write-Host " -test Run unit tests"
Write-Host " -testExtra Run extra verification"
Write-Host " -updateVsixVersion Update the VSIX manifest version"
Write-Host " -uploadVsix Upload the VSIX to the Open Gallery"
Write-Host ""
Write-Host "Settings:"
Write-Host " -ci True when running in CI"
Write-Host " -config <value> Build configuration: 'Debug' or 'Release'"
}
# Toggle between human readable messages and Azure Pipelines messages based on
# our current environment.
# https://docs.microsoft.com/en-us/azure/devops/pipelines/scripts/logging-commands?view=azure-devops&tabs=powershell
function Write-TaskError([string]$message) {
if ($ci) {
Write-Host "##vso[task.logissue type=error]$message"
}
else {
Write-Host $message
}
}
# Meant to mimic the OpenVsix Gallery script for changing the VSIX version based
# on the Azure DevOps build environment
function Update-VsixVersion() {
if ($env:BUILD_BUILDID -eq $null) {
throw "The environment variable %BUILD_BUILDID% is not set"
}
Write-Host "Updating VSIX version to include $($env:BUILD_BUILDID)"
foreach ($vsVersion in $vsVersions) {
Write-Host "Updating $vsVersion"
$vsixManifest = Join-Path $rootDir "Src/VsVim$($vsVersion)/source.extension.vsixmanifest"
[xml]$vsixXml = Get-Content $vsixManifest
$ns = New-Object System.Xml.XmlNamespaceManager $vsixXml.NameTable
$ns.AddNamespace("ns", $vsixXml.DocumentElement.NamespaceURI) | Out-Null
$attrVersion = $vsixXml.SelectSingleNode("//ns:Identity", $ns).Attributes["Version"]
[Version]$version = $attrVersion.Value
$version = New-Object Version ([int]$version.Major),([int]$version.Minor),$env:BUILD_BUILDID
$attrVersion.InnerText = $version
$vsixXml.Save($vsixManifest) | Out-Null
}
}
# Meant to mimic the OpenVsix Gallery script for uploading the VSIX
function Upload-Vsix() {
if ($env:BUILD_BUILDID -eq $null) {
throw "This is only meant to run in Azure DevOps"
}
Write-Host "Uploading VSIX to the Open Gallery"
foreach ($vsVersion in $vsVersions) {
Write-Host "Uploading $vsVersion"
$vsixFile = Join-Path $deployDir $vsVersion
$vsixFile = Join-Path $vsixFile "VsVim.vsix"
$vsixUploadEndpoint = "http://vsixgallery.com/api/upload"
$repoUrl = "https://github.com/VsVim/VsVim/"
[Reflection.Assembly]::LoadWithPartialName("System.Web") | Out-Null
$repo = [System.Web.HttpUtility]::UrlEncode($repoUrl)
$issueTracker = [System.Web.HttpUtility]::UrlEncode(($repoUrl + "issues/"))
[string]$url = ($vsixUploadEndpoint + "?repo=" + $repo + "&issuetracker=" + $issueTracker)
[byte[]]$bytes = [System.IO.File]::ReadAllBytes($vsixFile)
try {
$response = Invoke-WebRequest $url -Method Post -Body $bytes -UseBasicParsing
'OK' | Write-Host -ForegroundColor Green
}
catch{
'FAIL' | Write-TaskError
$_.Exception.Response.Headers["x-error"] | Write-TaskError
}
}
}
function Get-PackagesDir() {
$d = $null
if ($env:NUGET_PACKAGES -ne $null) {
$d = $env:NUGET_PACKAGES
}
else {
$d = Join-Path $env:UserProfile ".nuget\packages\"
}
Create-Directory $d
return $d
}
function Get-MSBuildPath() {
$vsWhere = Join-Path $toolsDir "vswhere.exe"
$vsInfo = Exec-Command $vsWhere "-latest -format json -requires Microsoft.Component.MSBuild" | Out-String | ConvertFrom-Json
# use first matching instance
$vsInfo = $vsInfo[0]
$vsInstallDir = $vsInfo.installationPath
$vsMajorVersion = $vsInfo.installationVersion.Split('.')[0]
$msbuildVersionDir = if ([int]$vsMajorVersion -lt 16) { "$vsMajorVersion.0" } else { "Current" }
return Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin\msbuild.exe"
}
# Test the contents of the Vsix to make sure it has all of the appropriate
# files
function Test-VsixContents() {
Write-Host "Verifying the Vsix Contents"
foreach ($vsVersion in $vsVersions) {
- Write-Host "Verifying $vsVersion"
+ Write-Host "`tVerifying $vsVersion"
$vsixPath = Join-Path $deployDir $vsVersion
$vsixPath = Join-Path $vsixPath "VsVim.vsix"
if (-not (Test-Path $vsixPath)) {
throw "Vsix doesn't exist"
}
$expectedFiles = @(
"Colors.pkgdef",
"extension.vsixmanifest",
"License.txt",
"Vim.Core.dll",
"VsVim.dll",
"VsVim.pkgdef",
"VsVim_large.png",
"VsVim_small.png",
"VsVim_full.pdf",
"catalog.json",
"manifest.json",
"[Content_Types].xml")
# Make a folder to hold the foundFiles
$target = Join-Path ([IO.Path]::GetTempPath()) ([IO.Path]::GetRandomFileName())
Create-Directory $target
$zipUtil = Join-Path $rootDir "Tools\7za920\7za.exe"
Exec-Command $zipUtil "x -o$target $vsixPath" | Out-Null
$foundFiles = Get-ChildItem $target | %{ $_.Name }
if ($foundFiles.Count -ne $expectedFiles.Count) {
Write-TaskError "Found $($foundFiles.Count) but expected $($expectedFiles.Count)"
Write-TaskError "Wrong number of foundFiles in VSIX."
Write-TaskError "Extra foundFiles"
foreach ($file in $foundFiles) {
if (-not $expectedFiles.Contains($file)) {
Write-TaskError "`t$file"
}
}
Write-Host "Missing foundFiles"
foreach ($file in $expectedFiles) {
if (-not $foundFiles.Contains($file)) {
Write-TaskError "`t$file"
}
}
Write-TaskError "Location: $target"
}
}
foreach ($item in $expectedFiles) {
# Look for dummy foundFiles that made it into the VSIX instead of the
# actual DLL
$itemPath = Join-Path $target $item
if ($item.EndsWith("dll") -and ((get-item $itemPath).Length -lt 5kb)) {
throw "Small file detected $item in the zip file ($target)"
}
}
}
# Make sure that the version number is the same in all locations.
function Test-Version() {
Write-Host "Testing Version Numbers"
$version = $null;
foreach ($line in Get-Content "Src\VimCore\Constants.fs") {
if ($line -match 'let VersionNumber = "([\d.]*)"') {
$version = $matches[1]
break
}
}
if ($version -eq $null) {
throw "Couldn't determine the version from Constants.fs"
}
$foundPackageVersion = $false
foreach ($line in Get-Content "Src\VsVimShared\VsVimPackage.cs") {
if ($line -match 'productId: VimConstants.VersionNumber') {
$foundPackageVersion = $true
break
}
}
if (-not $foundPackageVersion) {
throw "Could not verify the version of VsVimPackage.cs"
}
foreach ($vsVersion in $vsVersions) {
$data = [xml](Get-Content "Src\VsVim$($vsVersion)\source.extension.vsixmanifest")
$manifestVersion = $data.PackageManifest.Metadata.Identity.Version
if ($manifestVersion -ne $version) {
throw "The version $version doesn't match up with the manifest version of $manifestVersion"
}
}
}
function Test-UnitTests() {
Write-Host "Running unit tests"
foreach ($vsVersion in $vsVersions) {
Write-Host "Running $vsVersion"
$resultsDir = Join-Path $binariesDir "xunitResults"
Create-Directory $resultsDir
$all = @(
"VimCoreTest$($vsVersion)\net472\Vim.Core.$($vsVersion).UnitTest.dll",
"VsVimTest$($vsVersion)\net472\Vim.VisualStudio.Shared.$($vsVersion).UnitTest.dll")
$xunit = Join-Path (Get-PackagesDir) "xunit.runner.console\2.4.1\tools\net472\xunit.console.x86.exe"
$anyFailed = $false
foreach ($filePath in $all) {
$filePath = Join-Path $configDir $filePath
$fileName = [IO.Path]::GetFileNameWithoutExtension($filePath)
$logFilePath = Join-Path $resultsDir "$($fileName).xml"
$arg = "$filePath -xml $logFilePath"
try {
Exec-Console $xunit $arg
}
catch {
$anyFailed = $true
}
}
}
if ($anyFailed) {
throw "Unit tests failed"
}
}
function Build-Solution(){
$msbuild = Get-MSBuildPath
Write-Host "Using MSBuild from $msbuild"
Write-Host "Building VsVim"
$binlogFilePath = Join-Path $logsDir "msbuild.binlog"
$args = "/nologo /restore /v:m /m /bl:$binlogFilePath /p:Configuration=$config VsVim.sln"
if ($ci) {
$args += " /p:DeployExtension=false"
}
Exec-Console $msbuild $args
Write-Host "Cleaning Vsix"
Create-Directory $deployDir
Push-Location $deployDir
try {
Remove-Item -re -fo "$deployDir\*"
foreach ($vsVersion in $vsVersions) {
- Write-Host "Cleaning $vsVersion"
+ Write-Host "`tCleaning $vsVersion"
$vsVersionDir = Join-Path $deployDir $vsVersion
Create-Directory $vsVersionDir
Set-Location $vsVersionDir
$sourcePath = Join-Path $configDir "VsVim$($vsVersion)\net472\VsVim.vsix"
Copy-Item $sourcePath "VsVim.orig.vsix"
Copy-Item $sourcePath "VsVim.vsix"
# Due to the way we build the VSIX there are many files included that we don't actually
# want to deploy. Here we will clear out those files and rebuild the VSIX without
# them
$cleanUtil = Join-Path $configDir "CleanVsix\net472\CleanVsix.exe"
Exec-Console $cleanUtil (Join-Path $vsVersionDir "VsVim.vsix")
Copy-Item "VsVim.vsix" "VsVim.zip"
Set-Location ..
}
}
finally {
Pop-Location
}
}
Push-Location $rootDir
try {
. "Scripts\Common-Utils.ps1"
if ($help -or ($properties -ne $null)) {
Print-Usage
exit 0
}
if ($updateVsixVersion) {
Update-VsixVersion
}
if ($build) {
Build-Solution
}
if ($test) {
Test-UnitTests
}
if ($testExtra) {
Test-VsixContents
Test-Version
}
if ($uploadVsix) {
Upload-Vsix
}
}
catch {
Write-TaskError "Error: $($_.Exception.Message)"
Write-TaskError $_.ScriptStackTrace
exit 1
}
finally {
Pop-Location
}
diff --git a/Src/VimCore/Constants.fs b/Src/VimCore/Constants.fs
index fc69fec..5f64c6f 100644
--- a/Src/VimCore/Constants.fs
+++ b/Src/VimCore/Constants.fs
@@ -1,47 +1,47 @@
#light
namespace Vim
module VimConstants =
/// Content type which Vim hosts should create an IVimBuffer for
[<Literal>]
let ContentType = "text"
/// The decision of the content types on which an IVimBuffer should be created is a decision
/// which is left up to the host. The core Vim services such as tagging need to apply to any
/// situation in which an IVimBuffer is created. Hence they must apply to the most general
/// content type which is "any". The value "text" is insufficient in those circumstances because
/// it won't apply to projection buffers
[<Literal>]
let AnyContentType = "any"
[<Literal>]
let DefaultHistoryLength = 20
/// The default text width that FormatTextLines will use if the 'textwidth'
/// setting is zero (see vim ':help gq')
[<Literal>]
let DefaultFormatTextWidth = 79
[<Literal>]
let IncrementalSearchTagName = "vsvim_incrementalsearch"
[<Literal>]
let HighlightIncrementalSearchTagName = "vsvim_highlightsearch"
/// <summary>
/// Name of the main Key Processor
/// </summary>
[<Literal>]
let MainKeyProcessorName = "VsVim";
#if DEBUG
[<Literal>]
let VersionNumber = "2.10.99.99 Debug"
#else
[<Literal>]
- let VersionNumber = "2.10.0.1"
+ let VersionNumber = "2.10.0.2"
#endif
diff --git a/Src/VsVim2017/source.extension.vsixmanifest b/Src/VsVim2017/source.extension.vsixmanifest
index 53b9117..0f52431 100644
--- a/Src/VsVim2017/source.extension.vsixmanifest
+++ b/Src/VsVim2017/source.extension.vsixmanifest
@@ -1,28 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
<Metadata>
- <Identity Publisher="Jared Parsons" Version="2.10.0.1" Id="VsVim.Microsoft.ce6b18b9-bd0d-4da0-a312-250beeacdb54" Language="en-US" />
- <DisplayName>VsVim for 2017</DisplayName>
+ <Identity Publisher="Jared Parsons" Version="2.10.0.2" Id="VsVim.Microsoft.ce6b18b9-bd0d-4da0-a312-250beeacdb54" Language="en-US" />
+ <DisplayName>VsVim 2017</DisplayName>
<Description>VIM emulation layer for Visual Studio</Description>
<MoreInfo>https://github.com/VsVim/VsVim</MoreInfo>
<License>License.txt</License>
<Icon>VsVim_large.png</Icon>
<PreviewImage>VsVim_small.png</PreviewImage>
<Tags>vsvim</Tags>
</Metadata>
<Installation>
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[15.0,16.0)" />
<InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.IntegratedShell" />
<InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.Pro" />
<InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.Enterprise" />
</Installation>
<Assets>
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="VimCore" Path="|VimCore|" />
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="File" Path="Colors.pkgdef" />
</Assets>
<Prerequisites>
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
</Prerequisites>
</PackageManifest>
diff --git a/Src/VsVim2019/source.extension.vsixmanifest b/Src/VsVim2019/source.extension.vsixmanifest
index f990305..0b31994 100644
--- a/Src/VsVim2019/source.extension.vsixmanifest
+++ b/Src/VsVim2019/source.extension.vsixmanifest
@@ -1,28 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
<Metadata>
- <Identity Publisher="Jared Parsons" Version="2.10.0.1" Id="VsVim.Microsoft.e214908b-0458-4ae2-a583-4310f29687c3" Language="en-US" />
+ <Identity Publisher="Jared Parsons" Version="2.10.0.2" Id="VsVim.Microsoft.e214908b-0458-4ae2-a583-4310f29687c3" Language="en-US" />
<DisplayName>VsVim</DisplayName>
<Description>VIM emulation layer for Visual Studio</Description>
<MoreInfo>https://github.com/VsVim/VsVim</MoreInfo>
<License>License.txt</License>
<Icon>VsVim_large.png</Icon>
<PreviewImage>VsVim_small.png</PreviewImage>
<Tags>vsvim</Tags>
</Metadata>
<Installation>
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[16.0,17.0)" />
<InstallationTarget Version="[16.0,17.0)" Id="Microsoft.VisualStudio.IntegratedShell" />
<InstallationTarget Version="[16.0,17.0)" Id="Microsoft.VisualStudio.Pro" />
<InstallationTarget Version="[16.0,17.0)" Id="Microsoft.VisualStudio.Enterprise" />
</Installation>
<Assets>
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="VimCore" Path="|VimCore|" />
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="File" Path="Colors.pkgdef" />
</Assets>
<Prerequisites>
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[16.0,17.0)" DisplayName="Visual Studio core editor" />
</Prerequisites>
</PackageManifest>
diff --git a/Src/VsVim2022/source.extension.vsixmanifest b/Src/VsVim2022/source.extension.vsixmanifest
index 31d00f0..59e0a95 100644
--- a/Src/VsVim2022/source.extension.vsixmanifest
+++ b/Src/VsVim2022/source.extension.vsixmanifest
@@ -1,37 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
<Metadata>
<!-- DEV17_TODO -->
- <Identity Publisher="Jared Parsons" Version="2.10.0.1" Id="VsVim.Microsoft.e97cd707-324b-4e35-a669-eef8dae4b8cf" Language="en-US" />
- <DisplayName>VsVim 2022 Preview</DisplayName>
+ <Identity Publisher="Jared Parsons" Version="2.10.0.2" Id="VsVim.Microsoft.e97cd707-324b-4e35-a669-eef8dae4b8cf" Language="en-US" />
+ <DisplayName>VsVim 2022</DisplayName>
<Description>VIM emulation layer for Visual Studio</Description>
<MoreInfo>https://github.com/VsVim/VsVim</MoreInfo>
<License>License.txt</License>
<Icon>VsVim_large.png</Icon>
<PreviewImage>VsVim_small.png</PreviewImage>
<Tags>vsvim</Tags>
</Metadata>
<Installation>
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0,18.0)">
<ProductArchitecture>amd64</ProductArchitecture>
</InstallationTarget>
<InstallationTarget Version="[17.0,18.0)" Id="Microsoft.VisualStudio.IntegratedShell">
<ProductArchitecture>amd64</ProductArchitecture>
</InstallationTarget>
<InstallationTarget Version="[17.0,18.0)" Id="Microsoft.VisualStudio.Pro">
<ProductArchitecture>amd64</ProductArchitecture>
</InstallationTarget>
<InstallationTarget Version="[17.0,18.0)" Id="Microsoft.VisualStudio.Enterprise">
<ProductArchitecture>amd64</ProductArchitecture>
</InstallationTarget>
</Installation>
<Assets>
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="VimCore" Path="|VimCore|" />
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="File" Path="Colors.pkgdef" />
</Assets>
<Prerequisites>
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[17.0,18.0)" DisplayName="Visual Studio core editor" />
</Prerequisites>
</PackageManifest>
diff --git a/nuget.config b/nuget.config
new file mode 100644
index 0000000..f3a6fd3
--- /dev/null
+++ b/nuget.config
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <packageSources>
+ <clear />
+ <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+ <add key="vssdk" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json" />
+ </packageSources>
+</configuration>
|
VsVim/VsVim
|
663a3dbb5915b84d89fc01e3c1567694d0a3d0fc
|
doc: mention VS 2022 in README.md
|
diff --git a/README.md b/README.md
index 3c083e1..3967d70 100644
--- a/README.md
+++ b/README.md
@@ -1,25 +1,25 @@
VsVim
===
-VsVim is a free vim emulator for Visual Studio 2017 through to 2019.
+VsVim is a free vim emulator for Visual Studio 2017 through to 2022.
[](https://dev.azure.com/VsVim/VsVim/_build/latest?definitionId=1&branchName=master)
## Developing
VsVim can be developed using Visual Studio 2017 or 2019. The details of the
development process can be found in
[Developing.md](https://github.com/VsVim/VsVim/blob/master/Documentation/Developing.md)
When developing please follow the
[coding guidelines](https://github.com/VsVim/VsVim/blob/master/Documentation/CodingGuidelines.md)
## License
All code in this project is covered under the Apache 2 license a copy of which
is available in the same directory under the name License.txt.
## Latest Builds
The build representing the latest source code can be downloaded from the
[Open Vsix Gallery](http://vsixgallery.com/extension/VsVim.Microsoft.e214908b-0458-4ae2-a583-4310f29687c3/).
For Chinese Version: [ä¸æçæ¬](README.ch.md)
|
VsVim/VsVim
|
c75baf40944469a85a86ac93c9e25abcf81941a5
|
bump version to 2.8.0.14
|
diff --git a/Src/VimMac/Properties/AddinInfo.cs b/Src/VimMac/Properties/AddinInfo.cs
index 6ed0fc4..48ac478 100644
--- a/Src/VimMac/Properties/AddinInfo.cs
+++ b/Src/VimMac/Properties/AddinInfo.cs
@@ -1,15 +1,15 @@
using System;
using Mono.Addins;
using Mono.Addins.Description;
[assembly: Addin(
"VsVim",
Namespace = "Vim.Mac",
- Version = "2.8.0.13"
+ Version = "2.8.0.14"
)]
[assembly: AddinName("VsVim")]
[assembly: AddinCategory("IDE extensions")]
[assembly: AddinUrl("https://github.com/VsVim/VsVim")]
[assembly: AddinDescription("VIM emulation layer for Visual Studio")]
[assembly: AddinAuthor("Jared Parsons")]
|
VsVim/VsVim
|
94d081eb2dc5f955924feb838511c068d2714025
|
Allow automated keypresses with shift modifier to work in VSVim
|
diff --git a/Src/VimMac/AlternateKeyUtil.cs b/Src/VimMac/AlternateKeyUtil.cs
index 33a9fce..c26cef8 100644
--- a/Src/VimMac/AlternateKeyUtil.cs
+++ b/Src/VimMac/AlternateKeyUtil.cs
@@ -1,255 +1,251 @@
using System.Collections.Generic;
using System.ComponentModel.Composition;
using AppKit;
namespace Vim.UI.Cocoa.Implementation.Misc
{
[Export(typeof(IKeyUtil))]
internal sealed class AlternateKeyUtil : IKeyUtil
{
private static readonly Dictionary<NSKey, KeyInput> s_CocoaKeyToKeyInputMap;
private static readonly Dictionary<NSKey, KeyInput> s_CocoaControlKeyToKeyInputMap;
private static readonly Dictionary<VimKey, NSKey> s_vimKeyToCocoaKeyMap;
private static readonly Dictionary<KeyInput, NSKey> s_keyInputToCocoaKeyMap;
private readonly byte[] _keyboardState = new byte[256];
static AlternateKeyUtil()
{
s_vimKeyToCocoaKeyMap = BuildVimKeyToCocoaKeyMap();
s_keyInputToCocoaKeyMap = BuildKeyInputToCocoaKeyMap(s_vimKeyToCocoaKeyMap);
s_CocoaKeyToKeyInputMap = new Dictionary<NSKey, KeyInput>();
foreach (var pair in s_keyInputToCocoaKeyMap)
{
s_CocoaKeyToKeyInputMap[pair.Value] = pair.Key;
}
s_CocoaControlKeyToKeyInputMap = BuildCocoaControlKeyToKeyInputMap();
}
private static Dictionary<NSKey, KeyInput> BuildCocoaControlKeyToKeyInputMap()
{
var map = new Dictionary<NSKey, KeyInput>
{
[NSKey.D2] = KeyInputUtil.VimKeyToKeyInput(VimKey.Null), // <C-@>
[NSKey.D6] = KeyInputUtil.CharToKeyInput((char)0x1E), // <C-^>
[NSKey.Minus] = KeyInputUtil.CharToKeyInput((char)0x1F), // <C-_>
//[NSKey.Question] = KeyInputUtil.CharToKeyInput((char)0x7F), // <C-?>
};
return map;
}
internal static Dictionary<VimKey, NSKey> BuildVimKeyToCocoaKeyMap()
{
var map = new Dictionary<VimKey, NSKey>
{
[VimKey.Enter] = NSKey.Return,
[VimKey.Escape] = NSKey.Escape,
[VimKey.Back] = NSKey.Delete,
//[VimKey.Delete] = NSKey.Delete,
[VimKey.Left] = NSKey.LeftArrow,
[VimKey.Up] = NSKey.UpArrow,
[VimKey.Right] = NSKey.RightArrow,
[VimKey.Down] = NSKey.DownArrow,
[VimKey.Help] = NSKey.Help,
//[VimKey.Insert] = NSKey.Insert,
[VimKey.Home] = NSKey.Home,
[VimKey.End] = NSKey.End,
[VimKey.PageUp] = NSKey.PageUp,
[VimKey.PageDown] = NSKey.PageDown,
[VimKey.Tab] = NSKey.Tab,
[VimKey.F1] = NSKey.F1,
[VimKey.F2] = NSKey.F2,
[VimKey.F3] = NSKey.F3,
[VimKey.F4] = NSKey.F4,
[VimKey.F5] = NSKey.F5,
[VimKey.F6] = NSKey.F6,
[VimKey.F7] = NSKey.F7,
[VimKey.F8] = NSKey.F8,
[VimKey.F9] = NSKey.F9,
[VimKey.F10] = NSKey.F10,
[VimKey.F11] = NSKey.F11,
[VimKey.F12] = NSKey.F12,
[VimKey.KeypadMultiply] = NSKey.KeypadMultiply,
[VimKey.KeypadPlus] = NSKey.KeypadPlus,
[VimKey.KeypadMinus] = NSKey.KeypadMinus,
[VimKey.KeypadDecimal] = NSKey.KeypadDecimal,
[VimKey.KeypadDivide] = NSKey.KeypadDivide,
[VimKey.KeypadEnter] = NSKey.KeypadEnter,
[VimKey.Keypad0] = NSKey.Keypad0,
[VimKey.Keypad1] = NSKey.Keypad1,
[VimKey.Keypad2] = NSKey.Keypad2,
[VimKey.Keypad3] = NSKey.Keypad3,
[VimKey.Keypad4] = NSKey.Keypad4,
[VimKey.Keypad5] = NSKey.Keypad5,
[VimKey.Keypad6] = NSKey.Keypad6,
[VimKey.Keypad7] = NSKey.Keypad7,
[VimKey.Keypad8] = NSKey.Keypad8,
[VimKey.Keypad9] = NSKey.Keypad9
};
return map;
}
internal static Dictionary<KeyInput, NSKey> BuildKeyInputToCocoaKeyMap(Dictionary<VimKey, NSKey> vimKeyToCocoaKeyMap)
{
var map = new Dictionary<KeyInput, NSKey>();
foreach (var pair in vimKeyToCocoaKeyMap)
{
var keyInput = KeyInputUtil.VimKeyToKeyInput(pair.Key);
map[keyInput] = pair.Value;
}
map[KeyInputUtil.CharToKeyInput(' ')] = NSKey.Space;
map[KeyInputUtil.CharToKeyInput('\t')] = NSKey.Tab;
return map;
}
internal static bool TrySpecialVimKeyToKey(VimKey vimKey, out NSKey key)
{
return s_vimKeyToCocoaKeyMap.TryGetValue(vimKey, out key);
}
internal static VimKeyModifiers ConvertToKeyModifiers(NSEventModifierMask keys)
{
var res = VimKeyModifiers.None;
if (keys.HasFlag(NSEventModifierMask.ShiftKeyMask))
{
res |= VimKeyModifiers.Shift;
}
if (keys.HasFlag(NSEventModifierMask.AlternateKeyMask))
{
res |= VimKeyModifiers.Alt;
}
if (keys.HasFlag(NSEventModifierMask.ControlKeyMask))
{
res |= VimKeyModifiers.Control;
}
if (keys.HasFlag(NSEventModifierMask.CommandKeyMask))
{
res |= VimKeyModifiers.Command;
}
return res;
}
internal static NSEventModifierMask ConvertToModifierKeys(VimKeyModifiers keys)
{
NSEventModifierMask res = 0;
if (keys.HasFlag(VimKeyModifiers.Shift))
{
res |= NSEventModifierMask.ShiftKeyMask;
}
if (keys.HasFlag(VimKeyModifiers.Alt))
{
res |= NSEventModifierMask.AlternateKeyMask;
}
if (keys.HasFlag(VimKeyModifiers.Control))
{
res |= NSEventModifierMask.ControlKeyMask;
}
if (keys.HasFlag(VimKeyModifiers.Command))
{
res |= NSEventModifierMask.CommandKeyMask;
}
return res;
}
internal static bool IsAltGr(NSEventModifierMask modifierKeys)
{
var altGr = NSEventModifierMask.ControlKeyMask | NSEventModifierMask.AlternateKeyMask;
return (modifierKeys & altGr) == altGr;
}
#region IKeyUtil
bool IKeyUtil.IsAltGr(NSEventModifierMask modifierKeys)
{
return IsAltGr(modifierKeys);
}
VimKeyModifiers IKeyUtil.GetKeyModifiers(NSEventModifierMask modifierKeys)
{
return ConvertToKeyModifiers(modifierKeys);
}
bool IKeyUtil.TryConvertSpecialToKeyInput(NSEvent theEvent, out KeyInput keyInput)
{
var key = (NSKey)theEvent.KeyCode;
NSEventModifierMask modifierKeys = theEvent.ModifierFlags;
if (s_CocoaKeyToKeyInputMap.TryGetValue(key, out keyInput))
{
- var keyModifiers = ConvertToKeyModifiers(modifierKeys);
+ var keyModifiers = ConvertToKeyModifiers(modifierKeys);
keyInput = KeyInputUtil.ApplyKeyModifiers(keyInput, keyModifiers);
return true;
}
// Vim allows certain "lazy" control keys, such as <C-6> for <C-^>.
if ((modifierKeys == NSEventModifierMask.ControlKeyMask ||
modifierKeys == (NSEventModifierMask.ControlKeyMask | NSEventModifierMask.ShiftKeyMask)) &&
s_CocoaControlKeyToKeyInputMap.TryGetValue(key, out keyInput))
{
return true;
}
- // If the key is not a pure alt or shift key combination and doesn't
- // correspond to an ASCII control key (like <C-^>), we need to convert it here.
+ // If the key doesn't correspond to an ASCII control key (like <C-^>), we need to convert it here.
// This is needed because key combinations like <C-;> won't be passed to
// TextInput, because they can't be represented as system or control text.
// We just have to be careful not to shadow any keys that produce text when
// combined with the AltGr key.
- if (modifierKeys != NSEventModifierMask.AlternateKeyMask
- && modifierKeys != NSEventModifierMask.ShiftKeyMask)
- {
- switch (key)
- {
- case NSKey.Option:
- case NSKey.RightOption:
- case NSKey.Control:
- case NSKey.RightControl:
- case NSKey.Shift:
- case NSKey.RightShift:
- case NSKey.Command:
- // Avoid work for common cases.
- break;
-
- default:
- VimTrace.TraceInfo("AlternateKeyUtil::TryConvertSpecialKeyToKeyInput {0} {1}",
- key, modifierKeys);
- if (GetKeyInputFromKey(theEvent, modifierKeys, out keyInput))
- {
- // Only produce a key input here if the key input we
- // found is *not* an ASCII control character.
- // Control characters will be handled by TextInput
- // as control text.
-
-
- // Commented out because we are not using TextInput
- //if (!System.Char.IsControl(keyInput.Char))
- {
- return true;
- }
- }
- break;
- }
+
+ switch (key)
+ {
+ case NSKey.Option:
+ case NSKey.RightOption:
+ case NSKey.Control:
+ case NSKey.RightControl:
+ case NSKey.Shift:
+ case NSKey.RightShift:
+ case NSKey.Command:
+ // Avoid work for common cases.
+ break;
+
+ default:
+ VimTrace.TraceInfo("AlternateKeyUtil::TryConvertSpecialKeyToKeyInput {0} {1}",
+ key, modifierKeys);
+ if (GetKeyInputFromKey(theEvent, modifierKeys, out keyInput))
+ {
+ // Only produce a key input here if the key input we
+ // found is *not* an ASCII control character.
+ // Control characters will be handled by TextInput
+ // as control text.
+
+
+ // Commented out because we are not using TextInput
+ //if (!System.Char.IsControl(keyInput.Char))
+ {
+ return true;
+ }
+ }
+ break;
}
keyInput = null;
return false;
}
private bool GetKeyInputFromKey(NSEvent theEvent, NSEventModifierMask modifierKeys, out KeyInput keyInput)
{
if(!string.IsNullOrEmpty(theEvent.CharactersIgnoringModifiers))
{
var keyModifiers = ConvertToKeyModifiers(modifierKeys);
keyInput = KeyInputUtil.ApplyKeyModifiersToChar(theEvent.CharactersIgnoringModifiers[0], keyModifiers);
return true;
}
keyInput = null;
return false;
}
#endregion
}
}
|
VsVim/VsVim
|
109e8cf6f5111f70ed35312292444bfbd85633e2
|
Don't render relative line number margin in F# Interactive window
|
diff --git a/Src/VimMac/RelativeLineNumbers/RelativeLineNumbersMarginFactory.cs b/Src/VimMac/RelativeLineNumbers/RelativeLineNumbersMarginFactory.cs
index 2ab2099..727a381 100644
--- a/Src/VimMac/RelativeLineNumbers/RelativeLineNumbersMarginFactory.cs
+++ b/Src/VimMac/RelativeLineNumbers/RelativeLineNumbersMarginFactory.cs
@@ -1,57 +1,57 @@
using System;
using System.ComponentModel.Composition;
using Microsoft.VisualStudio.Text.Classification;
using Microsoft.VisualStudio.Text.Editor;
using Microsoft.VisualStudio.Utilities;
namespace Vim.UI.Cocoa.Implementation.RelativeLineNumbers
{
[Name(RelativeLineNumbersMarginFactory.LineNumbersMarginName)]
[Export(typeof(ICocoaTextViewMarginProvider))]
[Order(Before = PredefinedMarginNames.LineNumber)]
[MarginContainer(PredefinedMarginNames.LeftSelection)]
[ContentType("text")]
- [TextViewRole(PredefinedTextViewRoles.Document)]
+ [TextViewRole(PredefinedTextViewRoles.PrimaryDocument)]
internal sealed class RelativeLineNumbersMarginFactory : ICocoaTextViewMarginProvider
{
private readonly ICocoaClassificationFormatMapService _formatMapService;
private readonly IClassificationTypeRegistryService _typeRegistryService;
private readonly IVim _vim;
public const string LineNumbersMarginName = "vsvim_linenumbers";
[ImportingConstructor]
internal RelativeLineNumbersMarginFactory(
ICocoaClassificationFormatMapService formatMapService,
IClassificationTypeRegistryService typeRegistryService,
IVim vim)
{
_formatMapService = formatMapService
?? throw new ArgumentNullException(nameof(formatMapService));
_typeRegistryService = typeRegistryService
?? throw new ArgumentNullException(nameof(typeRegistryService));
_vim = vim
?? throw new ArgumentNullException(nameof(vim));
}
public ICocoaTextViewMargin CreateMargin(
ICocoaTextViewHost wpfTextViewHost,
ICocoaTextViewMargin marginContainer)
{
var textView = wpfTextViewHost?.TextView
?? throw new ArgumentNullException(nameof(wpfTextViewHost));
var vimBuffer = _vim.GetOrCreateVimBuffer(textView);
var formatMap = _formatMapService.GetClassificationFormatMap(textView);
return new RelativeLineNumbersMargin(
textView,
formatMap,
_typeRegistryService,
vimBuffer.LocalSettings);
}
}
}
|
VsVim/VsVim
|
5128351c208439bebbc311ec8dfe0642287922af
|
Fix up version numbers
|
diff --git a/Src/VimCore/Constants.fs b/Src/VimCore/Constants.fs
index 4f358a7..fc69fec 100644
--- a/Src/VimCore/Constants.fs
+++ b/Src/VimCore/Constants.fs
@@ -1,47 +1,47 @@
#light
namespace Vim
module VimConstants =
/// Content type which Vim hosts should create an IVimBuffer for
[<Literal>]
let ContentType = "text"
/// The decision of the content types on which an IVimBuffer should be created is a decision
/// which is left up to the host. The core Vim services such as tagging need to apply to any
/// situation in which an IVimBuffer is created. Hence they must apply to the most general
/// content type which is "any". The value "text" is insufficient in those circumstances because
/// it won't apply to projection buffers
[<Literal>]
let AnyContentType = "any"
[<Literal>]
let DefaultHistoryLength = 20
/// The default text width that FormatTextLines will use if the 'textwidth'
/// setting is zero (see vim ':help gq')
[<Literal>]
let DefaultFormatTextWidth = 79
[<Literal>]
let IncrementalSearchTagName = "vsvim_incrementalsearch"
[<Literal>]
let HighlightIncrementalSearchTagName = "vsvim_highlightsearch"
/// <summary>
/// Name of the main Key Processor
/// </summary>
[<Literal>]
let MainKeyProcessorName = "VsVim";
#if DEBUG
[<Literal>]
- let VersionNumber = "2.9.99.99 Debug"
+ let VersionNumber = "2.10.99.99 Debug"
#else
[<Literal>]
- let VersionNumber = "2.9.0.0"
+ let VersionNumber = "2.10.0.1"
#endif
diff --git a/Src/VsVim2017/source.extension.vsixmanifest b/Src/VsVim2017/source.extension.vsixmanifest
index c2729bf..53b9117 100644
--- a/Src/VsVim2017/source.extension.vsixmanifest
+++ b/Src/VsVim2017/source.extension.vsixmanifest
@@ -1,28 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
<Metadata>
- <Identity Publisher="Jared Parsons" Version="2.9.0.0" Id="VsVim.Microsoft.ce6b18b9-bd0d-4da0-a312-250beeacdb54" Language="en-US" />
+ <Identity Publisher="Jared Parsons" Version="2.10.0.1" Id="VsVim.Microsoft.ce6b18b9-bd0d-4da0-a312-250beeacdb54" Language="en-US" />
<DisplayName>VsVim for 2017</DisplayName>
<Description>VIM emulation layer for Visual Studio</Description>
<MoreInfo>https://github.com/VsVim/VsVim</MoreInfo>
<License>License.txt</License>
<Icon>VsVim_large.png</Icon>
<PreviewImage>VsVim_small.png</PreviewImage>
<Tags>vsvim</Tags>
</Metadata>
<Installation>
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[15.0,16.0)" />
<InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.IntegratedShell" />
<InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.Pro" />
<InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.Enterprise" />
</Installation>
<Assets>
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="VimCore" Path="|VimCore|" />
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="File" Path="Colors.pkgdef" />
</Assets>
<Prerequisites>
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
</Prerequisites>
</PackageManifest>
diff --git a/Src/VsVim2019/source.extension.vsixmanifest b/Src/VsVim2019/source.extension.vsixmanifest
index d98a665..f990305 100644
--- a/Src/VsVim2019/source.extension.vsixmanifest
+++ b/Src/VsVim2019/source.extension.vsixmanifest
@@ -1,28 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
<Metadata>
- <Identity Publisher="Jared Parsons" Version="2.9.0.0" Id="VsVim.Microsoft.e214908b-0458-4ae2-a583-4310f29687c3" Language="en-US" />
+ <Identity Publisher="Jared Parsons" Version="2.10.0.1" Id="VsVim.Microsoft.e214908b-0458-4ae2-a583-4310f29687c3" Language="en-US" />
<DisplayName>VsVim</DisplayName>
<Description>VIM emulation layer for Visual Studio</Description>
<MoreInfo>https://github.com/VsVim/VsVim</MoreInfo>
<License>License.txt</License>
<Icon>VsVim_large.png</Icon>
<PreviewImage>VsVim_small.png</PreviewImage>
<Tags>vsvim</Tags>
</Metadata>
<Installation>
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[16.0,17.0)" />
<InstallationTarget Version="[16.0,17.0)" Id="Microsoft.VisualStudio.IntegratedShell" />
<InstallationTarget Version="[16.0,17.0)" Id="Microsoft.VisualStudio.Pro" />
<InstallationTarget Version="[16.0,17.0)" Id="Microsoft.VisualStudio.Enterprise" />
</Installation>
<Assets>
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="VimCore" Path="|VimCore|" />
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="File" Path="Colors.pkgdef" />
</Assets>
<Prerequisites>
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[16.0,17.0)" DisplayName="Visual Studio core editor" />
</Prerequisites>
</PackageManifest>
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.