Skip to content

Commit 70ac80b

Browse files
gojimmypigojimmypi
authored
Merge pull request #1 from gojimmypi/development
Development merge to Master; v0.1.3 working VS2015
2 parents c4eb8fa + ae6ae38 commit 70ac80b

18 files changed

+426
-106
lines changed

‎.gitignore‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,11 @@
77
/.vs
88
/packages
99
/bin/Release
10+
/Gcode15/Gcode15/bin/Debug
11+
/Gcode15/Gcode15/obj/Debug
12+
/Gcode15/packages
13+
/Gcode15/.vs/Gcode15
14+
/Gcode15/Gcode15/save
15+
/Backup
16+
/Gcode15/Backup2
17+
/UpgradeLog.htm

‎Gcode15/Gcode15.sln‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 14
4+
VisualStudioVersion = 14.0.25420.1
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gcode15", "Gcode15\Gcode15.csproj", "{BE0B2E2F-67A7-400D-98B8-B3FD34132E30}"
7+
EndProject
8+
Global
9+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10+
Debug|Any CPU = Debug|Any CPU
11+
Release|Any CPU = Release|Any CPU
12+
EndGlobalSection
13+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14+
{BE0B2E2F-67A7-400D-98B8-B3FD34132E30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15+
{BE0B2E2F-67A7-400D-98B8-B3FD34132E30}.Debug|Any CPU.Build.0 = Debug|Any CPU
16+
{BE0B2E2F-67A7-400D-98B8-B3FD34132E30}.Release|Any CPU.ActiveCfg = Release|Any CPU
17+
{BE0B2E2F-67A7-400D-98B8-B3FD34132E30}.Release|Any CPU.Build.0 = Release|Any CPU
18+
EndGlobalSection
19+
GlobalSection(SolutionProperties) = preSolution
20+
HideSolutionNode = FALSE
21+
EndGlobalSection
22+
EndGlobal

‎Gcode15/Gcode15/Gcode15.csproj‎

Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\packages\Microsoft.VSSDK.BuildTools.14.3.25407\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.14.3.25407\build\Microsoft.VSSDK.BuildTools.props')" />
4+
<PropertyGroup>
5+
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
6+
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
7+
<NuGetPackageImportStamp>
8+
</NuGetPackageImportStamp>
9+
</PropertyGroup>
10+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
11+
<PropertyGroup>
12+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
13+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
14+
<SchemaVersion>2.0</SchemaVersion>
15+
<ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
16+
<ProjectGuid>{BE0B2E2F-67A7-400D-98B8-B3FD34132E30}</ProjectGuid>
17+
<OutputType>Library</OutputType>
18+
<AppDesignerFolder>Properties</AppDesignerFolder>
19+
<RootNamespace>Gcode15</RootNamespace>
20+
<AssemblyName>Gcode15</AssemblyName>
21+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
22+
<GeneratePkgDefFile>false</GeneratePkgDefFile>
23+
<IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
24+
<IncludeDebugSymbolsInVSIXContainer>true</IncludeDebugSymbolsInVSIXContainer>
25+
<IncludeDebugSymbolsInLocalVSIXDeployment>true</IncludeDebugSymbolsInLocalVSIXDeployment>
26+
<CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
27+
<CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
28+
</PropertyGroup>
29+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
30+
<DebugSymbols>true</DebugSymbols>
31+
<DebugType>full</DebugType>
32+
<Optimize>false</Optimize>
33+
<OutputPath>bin\Debug\</OutputPath>
34+
<DefineConstants>DEBUG;TRACE</DefineConstants>
35+
<ErrorReport>prompt</ErrorReport>
36+
<WarningLevel>4</WarningLevel>
37+
</PropertyGroup>
38+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
39+
<DebugType>pdbonly</DebugType>
40+
<Optimize>true</Optimize>
41+
<OutputPath>bin\Release\</OutputPath>
42+
<DefineConstants>TRACE</DefineConstants>
43+
<ErrorReport>prompt</ErrorReport>
44+
<WarningLevel>4</WarningLevel>
45+
</PropertyGroup>
46+
<ItemGroup>
47+
<Compile Include="..\..\GcodeClassifier.cs" />
48+
<Compile Include="..\..\GcodeClassifierClassificationDefinition.cs" />
49+
<Compile Include="..\..\GcodeClassifierFormat.cs" />
50+
<Compile Include="..\..\GcodeClassifierProvider.cs" />
51+
<Compile Include="..\..\GcodeHelper\GcodeHelper.cs" />
52+
<Compile Include="..\..\GcodeLanguagePackage.cs" />
53+
<Compile Include="..\..\GcodeTokenTag.cs" />
54+
<Compile Include="..\..\GcodeTokenTypes.cs" />
55+
<Compile Include="Properties\AssemblyInfo.cs" />
56+
</ItemGroup>
57+
<ItemGroup>
58+
<None Include="packages.config" />
59+
<None Include="source.extension.vsixmanifest">
60+
<SubType>Designer</SubType>
61+
</None>
62+
</ItemGroup>
63+
<ItemGroup>
64+
<Reference Include="Microsoft.Build.Framework" />
65+
<Reference Include="Microsoft.CSharp" />
66+
<Reference Include="Microsoft.VisualStudio.CoreUtility, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
67+
<HintPath>..\packages\Microsoft.VisualStudio.CoreUtility.14.3.25407\lib\net45\Microsoft.VisualStudio.CoreUtility.dll</HintPath>
68+
<Private>True</Private>
69+
</Reference>
70+
<Reference Include="Microsoft.VisualStudio.Shell.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
71+
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
72+
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
73+
<Reference Include="Microsoft.VisualStudio.Text.Data, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
74+
<HintPath>..\packages\Microsoft.VisualStudio.Text.Data.14.3.25407\lib\net45\Microsoft.VisualStudio.Text.Data.dll</HintPath>
75+
<Private>True</Private>
76+
</Reference>
77+
<Reference Include="Microsoft.VisualStudio.Text.Logic, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
78+
<HintPath>..\packages\Microsoft.VisualStudio.Text.Logic.14.3.25407\lib\net45\Microsoft.VisualStudio.Text.Logic.dll</HintPath>
79+
<Private>True</Private>
80+
</Reference>
81+
<Reference Include="Microsoft.VisualStudio.Text.UI, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
82+
<HintPath>..\packages\Microsoft.VisualStudio.Text.UI.14.3.25407\lib\net45\Microsoft.VisualStudio.Text.UI.dll</HintPath>
83+
<Private>True</Private>
84+
</Reference>
85+
<Reference Include="Microsoft.VisualStudio.Text.UI.Wpf, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
86+
<HintPath>..\packages\Microsoft.VisualStudio.Text.UI.Wpf.14.3.25407\lib\net45\Microsoft.VisualStudio.Text.UI.Wpf.dll</HintPath>
87+
<Private>True</Private>
88+
</Reference>
89+
<Reference Include="Microsoft.VisualStudio.Threading, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
90+
<Reference Include="PresentationCore" />
91+
<Reference Include="PresentationFramework" />
92+
<Reference Include="System" />
93+
<Reference Include="System.ComponentModel.Composition" />
94+
<Reference Include="System.Data" />
95+
<Reference Include="System.Data.DataSetExtensions" />
96+
<Reference Include="System.Xaml" />
97+
<Reference Include="System.XML" />
98+
<Reference Include="WindowsBase" />
99+
</ItemGroup>
100+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
101+
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
102+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
103+
<PropertyGroup>
104+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
105+
</PropertyGroup>
106+
<Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.14.3.25407\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.14.3.25407\build\Microsoft.VSSDK.BuildTools.props'))" />
107+
<Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.14.3.25407\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.14.3.25407\build\Microsoft.VSSDK.BuildTools.targets'))" />
108+
</Target>
109+
<Import Project="..\packages\Microsoft.VSSDK.BuildTools.14.3.25407\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.14.3.25407\build\Microsoft.VSSDK.BuildTools.targets')" />
110+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
111+
Other similar extension points exist, see Microsoft.Common.targets.
112+
<Target Name="BeforeBuild">
113+
</Target>
114+
<Target Name="AfterBuild">
115+
</Target>
116+
-->
117+
</Project>

‎Gcode15/Gcode15/Gcode15.csproj.user‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
4+
<StartAction>Program</StartAction>
5+
<StartProgram>C:\Program Files %28x86%29\Microsoft Visual Studio 14.0\Common7\IDE\devenv.exe</StartProgram>
6+
<StartArguments>/rootsuffix Exp</StartArguments>
7+
</PropertyGroup>
8+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
9+
<StartAction>Program</StartAction>
10+
<StartProgram>C:\Program Files %28x86%29\Microsoft Visual Studio 14.0\Common7\IDE\devenv.exe</StartProgram>
11+
<StartArguments>/rootsuffix Exp</StartArguments>
12+
</PropertyGroup>
13+
<PropertyGroup>
14+
<ProjectView>ShowAllFiles</ProjectView>
15+
</PropertyGroup>
16+
</Project>

‎Gcode15/Gcode15/Properties/AssemblyInfo.cs‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
using System.Reflection;
2+
using System.Runtime.CompilerServices;
3+
using System.Runtime.InteropServices;
4+
5+
// General Information about an assembly is controlled through the following
6+
// set of attributes. Change these attribute values to modify the information
7+
// associated with an assembly.
8+
[assembly: AssemblyTitle("Gcode15")]
9+
[assembly: AssemblyDescription("")]
10+
[assembly: AssemblyConfiguration("")]
11+
[assembly: AssemblyCompany("")]
12+
[assembly: AssemblyProduct("Gcode15")]
13+
[assembly: AssemblyCopyright("")]
14+
[assembly: AssemblyTrademark("")]
15+
[assembly: AssemblyCulture("")]
16+
17+
// Setting ComVisible to false makes the types in this assembly not visible
18+
// to COM components. If you need to access a type in this assembly from
19+
// COM, set the ComVisible attribute to true on that type.
20+
[assembly: ComVisible(false)]
21+
22+
// Version information for an assembly consists of the following four values:
23+
//
24+
// Major Version
25+
// Minor Version
26+
// Build Number
27+
// Revision
28+
//
29+
// You can specify all the values or you can default the Build and Revision Numbers
30+
// by using the '*' as shown below:
31+
// [assembly: AssemblyVersion("1.0.*")]
32+
[assembly: AssemblyVersion("1.0.0.0")]
33+
[assembly: AssemblyFileVersion("1.0.0.0")]

‎Gcode15/Gcode15/packages.config‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="Microsoft.VisualStudio.CoreUtility" version="14.3.25407" targetFramework="net452" />
4+
<package id="Microsoft.VisualStudio.Text.Data" version="14.3.25407" targetFramework="net452" />
5+
<package id="Microsoft.VisualStudio.Text.Logic" version="14.3.25407" targetFramework="net452" />
6+
<package id="Microsoft.VisualStudio.Text.UI" version="14.3.25407" targetFramework="net452" />
7+
<package id="Microsoft.VisualStudio.Text.UI.Wpf" version="14.3.25407" targetFramework="net452" />
8+
<package id="Microsoft.VSSDK.BuildTools" version="14.3.25407" targetFramework="net452" developmentDependency="true" />
9+
</packages>

‎Gcode15/Gcode15/source.extension.vsixmanifest‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<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">
3+
<Metadata>
4+
<Identity Id="c679c547-9163-41b5-a462-4fb8f308206a" Version="1.0" Language="en-US" Publisher="gojimmypi" />
5+
<DisplayName>Gcode15</DisplayName>
6+
<Description>Empty VSIX Project.</Description>
7+
</Metadata>
8+
<Installation>
9+
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[14.0]" />
10+
</Installation>
11+
<Dependencies>
12+
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
13+
</Dependencies>
14+
<Assets>
15+
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
16+
</Assets>
17+
</PackageManifest>

‎Gcode15/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
This is the Visual Studio 2015 Version of the project.

‎GcodeClassifier.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ internal GcodeClassifier(ITextBuffer buffer,
125125

126126
_GcodeTypes[GcodeTokenTypes.Gcode_Comment] = typeService.GetClassificationType("Gcode_Comment");
127127

128-
_GcodeTypes[GcodeTokenTypes.Gcode_ocode] = typeService.GetClassificationType("ocode");
128+
_GcodeTypes[GcodeTokenTypes.Gcode_ocode] = typeService.GetClassificationType("Gcode_ocode");
129129

130130
// if typeService.GetClassificationType returns Null, check GcodeClassifierClassificationDefinition
131131
// o-codes

‎GcodeClassifierFormat.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -958,7 +958,7 @@ public Gcode_9()
958958
#endregion
959959

960960

961-
#region Gcode Comment
961+
#region Comment
962962
/// <summary>
963963
/// Defines the editor format for the Verilog_always classification type. Text is colored BlueViolet
964964
/// </summary>
@@ -982,23 +982,23 @@ public Gcode_Comment()
982982
}
983983
#endregion
984984

985-
#region ocode Comment
985+
#region ocode
986986
/// <summary>
987987
/// Defines the editor format for the Verilog_always classification type. Text is colored BlueViolet
988988
/// </summary>
989989
[Export(typeof(EditorFormatDefinition))]
990-
[ClassificationType(ClassificationTypeNames = "g_ocode")]
991-
[Name("g_ocode")]
990+
[ClassificationType(ClassificationTypeNames = "CTN_Gcode_ocode")]
991+
[Name("Gcode_ocode")]
992992
//this should be visible to the end user
993993
[UserVisible(true)] // sets this editor format definition visible for the user (in Tools>Options>Environment>Fonts and Colors>Text Editor
994994
//set the priority to be after the default classifiers
995995
[Order(Before = Priority.Default)]
996-
internal sealed class ocode : ClassificationFormatDefinition
996+
internal sealed class Gcode_ocode : ClassificationFormatDefinition
997997
{
998998
/// <summary>
999999
/// Defines the visual format for the gcode 9 classification type
10001000
/// </summary>
1001-
public ocode()
1001+
public Gcode_ocode()
10021002
{
10031003
DisplayName = "Gcode - ocode"; //human readable version of the name (in Tools>Options>Environment>Fonts and Colors>Text Editor
10041004
ForegroundColor = Colors.DarkOrange;

0 commit comments

Comments
 (0)