Browse Source

Add <inheritdoc/> to XML doc completion, add MIT/X11 license template.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@3562 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 17 years ago
parent
commit
d8da3abb1e
  1. 19
      data/options/TextLib/Licenses.xml
  2. 1
      src/Libraries/ICSharpCode.TextEditor/Project/Resources/CSharp-Mode.xshd
  3. 1
      src/Main/Base/Project/Src/TextEditor/Gui/Editor/CompletionWindow/CommentCompletionDataProvider.cs

19
data/options/TextLib/Licenses.xml

@ -227,6 +227,24 @@ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVI @@ -227,6 +227,24 @@ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVI
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."/>
<Text display = "MIT (X11)" value = 'Copyright (c) &lt;year&gt; &lt;copyright holders&gt;
Permission is hereby granted, free of charge, to any person obtaining a copy of this
software and associated documentation files (the "Software"), to deal in the Software
without restriction, including without limitation the rights to use, copy, modify, merge,
publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
to whom the Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all copies or
substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
'/>
<Text display = "GPL header" value = "// one line to give the program's name and an idea of what it does.
// Copyright (C) yyyy name of author
//
@ -244,7 +262,6 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." @@ -244,7 +262,6 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
"/>
<Text display = "LGPL header" value = "// one line to give the library's name and an idea of what it does.
// Copyright (C) year name of author
//

1
src/Libraries/ICSharpCode.TextEditor/Project/Resources/CSharp-Mode.xshd

@ -323,6 +323,7 @@ @@ -323,6 +323,7 @@
<Key word = "seealso" />
<Key word = "summary" />
<Key word = "value" />
<Key word = "inheritdoc" />
<Key word = "type" />
<Key word = "name" />

1
src/Main/Base/Project/Src/TextEditor/Gui/Editor/CompletionWindow/CommentCompletionDataProvider.cs

@ -30,6 +30,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor @@ -30,6 +30,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor
new string[] {"list type=\"\"", "A list"},
new string[] {"listheader", "The header from the list"},
new string[] {"item", "A list item"},
new string[] {"inheritdoc/", "Inherit documentation from base class"},
new string[] {"term", "A term in a list"},
new string[] {"description", "A description to a term in a list"},
new string[] {"para", "A text paragraph"},

Loading…
Cancel
Save