Skip to content
This repository has been archived by the owner on Oct 16, 2020. It is now read-only.

Merged all other pull requests #796

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
Open

Merged all other pull requests #796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
cecb4c9
Implement basic font rendering tuning for code editor. (1/2: Main+Add…
13-beta2 Jan 10, 2016
91774d3
Iniciando (depurando) aplicação com argumentos
Feb 10, 2016
048718b
Bugfix for #748
Aug 6, 2016
0f54492
Rectified subheading typos
NikhilMTomy Apr 19, 2017
4632888
Fix Japanese Resource
matarillo Jul 21, 2017
7125095
Replace unescaped '&' with '&'
matarillo Jul 22, 2017
c5ad75a
fixed things for dotnet 46
Xelwon Jul 25, 2017
0e12ef5
Merge pull request #1 from rhafizov/master
Xelwon Jul 25, 2017
bde6068
Merge pull request #2 from NikhilMTomy/master
Xelwon Jul 25, 2017
00e5da0
Merge pull request #3 from marcioalthmann/master
Xelwon Jul 25, 2017
fe01628
Merge pull request #4 from 13-beta2/master
Xelwon Jul 25, 2017
44bf758
added manually pr # 5 (Fixed bug #674 #5)
Xelwon Jul 25, 2017
a078d36
Merge pull request #6 from matarillo/master
Xelwon Jul 25, 2017
affaa60
changed projects to can compile with vs2015 (14.0)
D1egoC Jul 27, 2017
4cf8199
bug fixed in dotnet4.6 target support.
Xelwon Jul 31, 2017
9740a32
Merge branch 'master' of https://github.com/Xelwon/SharpDevelop
Xelwon Jul 31, 2017
3f19751
Merge remote-tracking branch 'refs/remotes/icsharpcode/master'
Xelwon Dec 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions clean.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@if not exist "src\Libraries\AvalonEdit\ICSharpCode.AvalonEdit.sln" (
git submodule update --init || exit /b 1
)
"%PROGFILES%\MSBuild\12.0\Bin\msbuild" /m SharpDevelop.sln /t:clean "/p:Platform=Any CPU" /p:Configuration=Debug
"%PROGFILES%\MSBuild\14.0\Bin\msbuild" /m SharpDevelop.sln /t:clean "/p:Platform=Any CPU" /p:Configuration=Debug
@IF %ERRORLEVEL% NEQ 0 PAUSE
"%PROGFILES%\MSBuild\12.0\Bin\msbuild" /m SharpDevelop.sln /t:clean "/p:Platform=Any CPU" /p:Configuration=Release
"%PROGFILES%\MSBuild\14.0\Bin\msbuild" /m SharpDevelop.sln /t:clean "/p:Platform=Any CPU" /p:Configuration=Release
@IF %ERRORLEVEL% NEQ 0 PAUSE
5,679 changes: 4,320 additions & 1,359 deletions data/resources/StringResources.jp.resx
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions data/resources/StringResources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8445,5 +8445,11 @@ Press Esc to cancel this operation.</value>
</data>
<data name="ICSharpCode.WpfDesign.AddIn.Options.EnableAppXamlParsing" xml:space="preserve">
<value>Enable App.xaml parsing</value>
</data>
<data name="Dialog.Options.IDEOptions.TextEditor.General.EnableTextAntialiasing" xml:space="preserve">
<value>Enable anti-aliasing</value>
</data>
<data name="Dialog.Options.IDEOptions.TextEditor.General.EnableTextHinting" xml:space="preserve">
<value>Enable hinting</value>
</data>
</root>
2 changes: 1 addition & 1 deletion debugbuild.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@if not exist "src\Libraries\AvalonEdit\ICSharpCode.AvalonEdit.sln" (
git submodule update --init || exit /b 1
)
"%PROGFILES%\MSBuild\12.0\Bin\msbuild" /m SharpDevelop.sln /p:Configuration=Debug "/p:Platform=Any CPU" %*
"%PROGFILES%\MSBuild\14.0\Bin\msbuild" /m SharpDevelop.sln /p:Configuration=Debug "/p:Platform=Any CPU" %*
@IF %ERRORLEVEL% NEQ 0 GOTO err
@exit /B 0
:err
Expand Down
2 changes: 1 addition & 1 deletion releasebuild.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@if not exist "src\Libraries\AvalonEdit\ICSharpCode.AvalonEdit.sln" (
git submodule update --init || exit /b 1
)
"%PROGFILES%\MSBuild\12.0\Bin\msbuild" /m SharpDevelop.sln /p:Configuration=Release "/p:Platform=Any CPU" %*
"%PROGFILES%\MSBuild\14.0\Bin\msbuild" /m SharpDevelop.sln /p:Configuration=Release "/p:Platform=Any CPU" %*
@IF %ERRORLEVEL% NEQ 0 GOTO err
@exit /B 0
:err
Expand Down
6 changes: 3 additions & 3 deletions src/AddIns/BackendBindings/CSharpBinding/Project/Src/Parser/Parser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,19 +101,19 @@ void AddCommentTags(SyntaxTree cu, IList<TagComment> tagComments, ITextSource fi
int endOffset;
int searchOffset = 0;
// HACK: workaround for parser bug: uses \n instead of \r\n in comment.Content
string commentContent = document.GetText(commentStartOffset, Math.Min(commentEndOffset - commentStartOffset + 1, commentEndOffset - commentStartOffset));
string commentContent = document.GetText(commentStartOffset, Math.Abs(Math.Min(commentEndOffset - commentStartOffset + 1, commentEndOffset - commentStartOffset)));
do {
int start = commentStartOffset + searchOffset;
int absoluteOffset = document.IndexOf(match, start, document.TextLength - start, StringComparison.Ordinal);
var startLocation = document.GetLocation(absoluteOffset);
endOffset = Math.Min(document.GetLineByNumber(startLocation.Line).EndOffset, commentEndOffset);
string content = document.GetText(absoluteOffset, endOffset - absoluteOffset);
string content = document.GetText(absoluteOffset, Math.Abs(endOffset - absoluteOffset));
if (content.Length < match.Length) {
// HACK: workaround parser bug with multi-line documentation comments
break;
}
tagComments.Add(new TagComment(content.Substring(0, match.Length), new DomRegion(cu.FileName, startLocation.Line, startLocation.Column), content.Substring(match.Length)));
searchOffset = endOffset - commentStartOffset;
searchOffset = Math.Abs(endOffset - commentStartOffset);
} while (commentContent.ContainsAny(TaskListTokens, searchOffset, out match));
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/AddIns/Debugger/Debugger.Core/Interop/CorDebugExtensionMethods.generated.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ public static ICorDebugProcess CreateProcess(this ICorDebug instance, string lpA
uint lpProcessInformation, CorDebugCreateProcessFlags debuggingFlags)
{
ICorDebugProcess ppProcess;
instance.__CreateProcess(lpApplicationName, lpCommandLine, ref lpProcessAttributes, ref lpThreadAttributes, bInheritHandles, dwCreationFlags, lpEnvironment, lpCurrentDirectory, lpStartupInfo, lpProcessInformation,
instance.__CreateProcess(lpApplicationName, lpApplicationName + lpCommandLine, ref lpProcessAttributes, ref lpThreadAttributes, bInheritHandles, dwCreationFlags, lpEnvironment, lpCurrentDirectory, lpStartupInfo, lpProcessInformation,
debuggingFlags, out ppProcess);
ProcessOutParameter(lpProcessAttributes);
ProcessOutParameter(lpThreadAttributes);
Expand Down
10 changes: 9 additions & 1 deletion src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/GeneralEditorOptions.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,15 @@
<StackPanel>
<GroupBox
Header="{core:Localize Dialog.Options.IDEOptions.TextEditor.General.FontGroupBox}">
<gui:FontSelector x:Name="fontSelectionPanel" />
<widgets:StackPanelWithSpacing SpaceBetweenItems="5">
<gui:FontSelector x:Name="fontSelectionPanel" />
<CheckBox
IsChecked="{core:OptionBinding local:CodeEditorOptions.EnableTextAntialiasing}"
Content="{core:Localize Dialog.Options.IDEOptions.TextEditor.General.EnableTextAntialiasing}" />
<CheckBox
IsChecked="{core:OptionBinding local:CodeEditorOptions.EnableTextHinting}"
Content="{core:Localize Dialog.Options.IDEOptions.TextEditor.General.EnableTextHinting}" />
</widgets:StackPanelWithSpacing>
</GroupBox>
<GroupBox
Header="{core:Localize Dialog.Options.IDEOptions.TextEditor.General.GeneralOptionsGroupBox}">
Expand Down
Loading